RubyGems - actionpack - Versions diffs - 1.12.5 → 1.13.0 - Mend

actionpack 1.12.5 → 1.13.0

Potentially problematic release.

This version of actionpack might be problematic. Click here for more details.

Files changed (179) hide show

data/CHANGELOG +517 -15
data/MIT-LICENSE +1 -1
data/README +18 -20
data/Rakefile +7 -4
data/examples/address_book_controller.rb +3 -3
data/examples/blog_controller.cgi +3 -3
data/examples/debate_controller.cgi +5 -5
data/lib/action_controller.rb +2 -2
data/lib/action_controller/assertions.rb +73 -311
data/lib/action_controller/{deprecated_assertions.rb → assertions/deprecated_assertions.rb} +32 -8
data/lib/action_controller/assertions/dom_assertions.rb +25 -0
data/lib/action_controller/assertions/model_assertions.rb +12 -0
data/lib/action_controller/assertions/response_assertions.rb +140 -0
data/lib/action_controller/assertions/routing_assertions.rb +82 -0
data/lib/action_controller/assertions/selector_assertions.rb +571 -0
data/lib/action_controller/assertions/tag_assertions.rb +117 -0
data/lib/action_controller/base.rb +334 -163
data/lib/action_controller/benchmarking.rb +3 -6
data/lib/action_controller/caching.rb +83 -22
data/lib/action_controller/cgi_ext/cgi_ext.rb +0 -7
data/lib/action_controller/cgi_ext/cgi_methods.rb +167 -173
data/lib/action_controller/cgi_ext/raw_post_data_fix.rb +43 -22
data/lib/action_controller/cgi_process.rb +50 -27
data/lib/action_controller/components.rb +21 -25
data/lib/action_controller/cookies.rb +10 -9
data/lib/action_controller/{dependencies.rb → deprecated_dependencies.rb} +9 -27
data/lib/action_controller/filters.rb +448 -225
data/lib/action_controller/flash.rb +24 -20
data/lib/action_controller/helpers.rb +2 -5
data/lib/action_controller/integration.rb +40 -16
data/lib/action_controller/layout.rb +11 -8
data/lib/action_controller/macros/auto_complete.rb +3 -2
data/lib/action_controller/macros/in_place_editing.rb +3 -2
data/lib/action_controller/mime_responds.rb +41 -29
data/lib/action_controller/mime_type.rb +68 -10
data/lib/action_controller/pagination.rb +4 -3
data/lib/action_controller/request.rb +22 -14
data/lib/action_controller/rescue.rb +25 -22
data/lib/action_controller/resources.rb +302 -0
data/lib/action_controller/response.rb +20 -2
data/lib/action_controller/response.rb.rej +17 -0
data/lib/action_controller/routing.rb +1165 -567
data/lib/action_controller/scaffolding.rb +30 -31
data/lib/action_controller/session/active_record_store.rb +2 -0
data/lib/action_controller/session/drb_store.rb +4 -0
data/lib/action_controller/session/mem_cache_store.rb +4 -0
data/lib/action_controller/session_management.rb +6 -9
data/lib/action_controller/status_codes.rb +89 -0
data/lib/action_controller/streaming.rb +6 -15
data/lib/action_controller/templates/rescues/_request_and_response.rhtml +5 -5
data/lib/action_controller/templates/rescues/diagnostics.rhtml +2 -2
data/lib/action_controller/templates/rescues/routing_error.rhtml +4 -4
data/lib/action_controller/templates/rescues/template_error.rhtml +1 -1
data/lib/action_controller/templates/scaffolds/list.rhtml +1 -1
data/lib/action_controller/test_process.rb +52 -30
data/lib/action_controller/url_rewriter.rb +63 -29
data/lib/action_controller/vendor/html-scanner/html/document.rb +1 -0
data/lib/action_controller/vendor/html-scanner/html/node.rb +3 -4
data/lib/action_controller/vendor/html-scanner/html/selector.rb +822 -0
data/lib/action_controller/verification.rb +22 -11
data/lib/action_pack.rb +1 -1
data/lib/action_pack/version.rb +2 -2
data/lib/action_view.rb +1 -1
data/lib/action_view/base.rb +46 -43
data/lib/action_view/compiled_templates.rb +1 -1
data/lib/action_view/helpers/active_record_helper.rb +54 -17
data/lib/action_view/helpers/asset_tag_helper.rb +97 -46
data/lib/action_view/helpers/capture_helper.rb +1 -1
data/lib/action_view/helpers/date_helper.rb +258 -136
data/lib/action_view/helpers/debug_helper.rb +1 -1
data/lib/action_view/helpers/deprecated_helper.rb +34 -0
data/lib/action_view/helpers/form_helper.rb +75 -35
data/lib/action_view/helpers/form_options_helper.rb +7 -5
data/lib/action_view/helpers/form_tag_helper.rb +44 -6
data/lib/action_view/helpers/java_script_macros_helper.rb +59 -46
data/lib/action_view/helpers/javascript_helper.rb +71 -10
data/lib/action_view/helpers/javascripts/controls.js +41 -23
data/lib/action_view/helpers/javascripts/dragdrop.js +105 -76
data/lib/action_view/helpers/javascripts/effects.js +293 -163
data/lib/action_view/helpers/javascripts/prototype.js +897 -389
data/lib/action_view/helpers/javascripts/prototype.js.rej +561 -0
data/lib/action_view/helpers/number_helper.rb +111 -65
data/lib/action_view/helpers/prototype_helper.rb +84 -109
data/lib/action_view/helpers/scriptaculous_helper.rb +5 -0
data/lib/action_view/helpers/tag_helper.rb +69 -16
data/lib/action_view/helpers/text_helper.rb +149 -112
data/lib/action_view/helpers/url_helper.rb +200 -107
data/lib/action_view/template_error.rb +66 -42
data/test/abstract_unit.rb +4 -2
data/test/active_record_unit.rb +84 -56
data/test/activerecord/active_record_assertions_test.rb +26 -18
data/test/activerecord/active_record_store_test.rb +4 -36
data/test/activerecord/pagination_test.rb +1 -6
data/test/controller/action_pack_assertions_test.rb +230 -113
data/test/controller/addresses_render_test.rb +2 -6
data/test/controller/assert_select_test.rb +576 -0
data/test/controller/base_test.rb +73 -3
data/test/controller/caching_test.rb +228 -0
data/test/controller/capture_test.rb +12 -10
data/test/controller/cgi_test.rb +89 -12
data/test/controller/components_test.rb +24 -2
data/test/controller/content_type_test.rb +139 -0
data/test/controller/controller_fixtures/app/controllers/admin/user_controller.rb +0 -0
data/test/controller/controller_fixtures/app/controllers/user_controller.rb +0 -0
data/test/controller/controller_fixtures/vendor/plugins/bad_plugin/lib/plugin_controller.rb +0 -0
data/test/controller/cookie_test.rb +33 -25
data/test/controller/deprecated_instance_variables_test.rb +48 -0
data/test/controller/deprecation/deprecated_base_methods_test.rb +60 -0
data/test/controller/fake_controllers.rb +0 -1
data/test/controller/filters_test.rb +301 -16
data/test/controller/flash_test.rb +19 -2
data/test/controller/helper_test.rb +2 -2
data/test/controller/integration_test.rb +154 -0
data/test/controller/layout_test.rb +115 -1
data/test/controller/mime_responds_test.rb +94 -0
data/test/controller/mime_type_test.rb +9 -0
data/test/controller/new_render_test.rb +161 -11
data/test/controller/raw_post_test.rb +52 -15
data/test/controller/redirect_test.rb +27 -14
data/test/controller/render_test.rb +76 -29
data/test/controller/request_test.rb +55 -4
data/test/controller/resources_test.rb +274 -0
data/test/controller/routing_test.rb +1533 -824
data/test/controller/selector_test.rb +628 -0
data/test/controller/send_file_test.rb +9 -1
data/test/controller/session_management_test.rb +51 -0
data/test/controller/test_test.rb +113 -29
data/test/controller/url_rewriter_test.rb +86 -17
data/test/controller/verification_test.rb +19 -17
data/test/controller/webservice_test.rb +0 -7
data/test/fixtures/content_type/render_default_content_types_for_respond_to.rhtml +1 -0
data/test/fixtures/content_type/render_default_for_rhtml.rhtml +1 -0
data/test/fixtures/content_type/render_default_for_rjs.rjs +1 -0
data/test/fixtures/content_type/render_default_for_rxml.rxml +1 -0
data/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_flash_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_flash_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_headers_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_headers_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_params_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_params_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_request_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_request_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_response_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_response_method.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_session_ivar.rhtml +1 -0
data/test/fixtures/deprecated_instance_variables/_session_method.rhtml +1 -0
data/test/fixtures/multipart/binary_file +0 -0
data/test/fixtures/public/javascripts/application.js +1 -0
data/test/fixtures/test/_hello.rxml +1 -0
data/test/fixtures/test/hello_world_container.rxml +3 -0
data/test/fixtures/topic.rb +2 -2
data/test/template/active_record_helper_test.rb +83 -12
data/test/template/asset_tag_helper_test.rb +75 -95
data/test/template/compiled_templates_test.rb +1 -0
data/test/template/date_helper_test.rb +873 -181
data/test/template/deprecated_helper_test.rb +36 -0
data/test/template/deprecated_instance_variables_test.rb +43 -0
data/test/template/form_helper_test.rb +77 -1
data/test/template/form_options_helper_test.rb +4 -0
data/test/template/form_tag_helper_test.rb +66 -2
data/test/template/java_script_macros_helper_test.rb +4 -1
data/test/template/javascript_helper_test.rb +29 -0
data/test/template/number_helper_test.rb +63 -27
data/test/template/prototype_helper_test.rb +77 -34
data/test/template/tag_helper_test.rb +34 -6
data/test/template/text_helper_test.rb +69 -34
data/test/template/url_helper_test.rb +168 -16
data/test/testing_sandbox.rb +7 -22
metadata +66 -20
data/filler.txt +0 -50
data/lib/action_controller/code_generation.rb +0 -235
data/lib/action_controller/vendor/xml_simple.rb +0 -1019
data/test/controller/caching_filestore.rb +0 -74
data/test/fixtures/application_root/app/controllers/a_class_that_contains_a_controller/poorly_placed_controller.rb +0 -7
data/test/fixtures/application_root/app/controllers/module_that_holds_controllers/nested_controller.rb +0 -3
data/test/fixtures/application_root/app/models/a_class_that_contains_a_controller.rb +0 -7
data/test/fixtures/dont_load.rb +0 -3

data/MIT-LICENSE CHANGED

@@ -1,4 +1,4 @@
-Copyright (c) 2004 David Heinemeier Hansson
+Copyright (c) 2004-2006 David Heinemeier Hansson
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README CHANGED

@@ -34,7 +34,7 @@ A short rundown of the major features:
   and can therefore share helper methods.
     BlogController < ActionController::Base
-      def display
+      def show
         @customer = find_customer
       end
@@ -100,7 +100,7 @@ A short rundown of the major features:
       after_filter { |c| c.response.body = GZip::compress(c.response.body) }
       after_filter LocalizeFilter
-      def list
+      def index
         # Before this action is run, the user will be authenticated, the cache
         # will be examined to see if a valid copy of the results already
         # exists, and the action will be logged for auditing.
@@ -139,7 +139,7 @@ A short rundown of the major features:
     end
     Layout file (called weblog_layout):
-      <html><body><%= @content_for_layout %></body></html>
+      <html><body><%= yield %></body></html>
     Template for hello_world action:
       <h1>Hello world</h1>
@@ -155,7 +155,7 @@ A short rundown of the major features:
     map.connect 'clients/:client_name/:project_name/:controller/:action'
     Accessing /clients/37signals/basecamp/project/dash calls ProjectController#dash with
-    { "client_name" => "37signals", "project_name" => "basecamp" } in @params["params"]
+    { "client_name" => "37signals", "project_name" => "basecamp" } in params[:params]
     From that URL, you can rewrite the redirect in a number of ways:
@@ -296,9 +296,8 @@ A short rundown of the major features:
   {Learn more}[link:classes/ActionController/Rescue.html]
-* Scaffolding for Action Record model objects
+* Scaffolding for Active Record model objects
-    require 'account' # must be an Active Record class
     class AccountController < ActionController::Base
       scaffold :account
     end
@@ -306,7 +305,7 @@ A short rundown of the major features:
     The AccountController now has the full CRUD range of actions and default
     templates: list, show, destroy, new, create, edit, update
-  {Learn more}link:classes/ActionController/Scaffolding/ClassMethods.html
+  {Learn more}[link:classes/ActionController/Scaffolding/ClassMethods.html]
 * Form building for Active Record model objects
@@ -338,10 +337,10 @@ A short rundown of the major features:
       <input type="submit" value="Create">
     </form>
-    This form generates a @params["post"] array that can be used directly in a save action:
+    This form generates a params[:post] array that can be used directly in a save action:
     class WeblogController < ActionController::Base
-      def save
+      def create
         post = Post.create(params[:post])
         redirect_to :action => "display", :id => post.id
       end
@@ -350,10 +349,10 @@ A short rundown of the major features:
   {Learn more}[link:classes/ActionView/Helpers/ActiveRecordHelper.html]
-* Runs on top of WEBrick, CGI, FCGI, and mod_ruby
+* Runs on top of WEBrick, Mongrel, CGI, FCGI, and mod_ruby
-== Simple example
+== Simple example (from outside of Rails)
 This example will implement a simple weblog system using inline templates and
 an Active Record model. So let's build that WeblogController with just a few
@@ -366,11 +365,11 @@ methods:
     layout "weblog/layout"
     def index
-      @posts = Post.find_all
+      @posts = Post.find(:all)
     end
     def display
-      @post = Post.find(:params[:id])
+      @post = Post.find(params[:id])
     end
     def new
@@ -394,7 +393,7 @@ And the templates look like this:
   weblog/layout.rhtml:
     <html><body>
-    <%= @content_for_layout %>
+    <%= yield %>
     </body></html>
   weblog/index.rhtml:
@@ -431,6 +430,8 @@ 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
@@ -440,7 +441,7 @@ The latest version of Action Pack can be found at
 Documentation can be found at
-* http://ap.rubyonrails.com
+* http://api.rubyonrails.com
 == Installation
@@ -459,13 +460,10 @@ Action Pack is released under the MIT license.
 == Support
-The Action Pack homepage is http://www.rubyonrails.com. You can find
+The Action Pack homepage is http://www.rubyonrails.org. You can find
 the Action Pack RubyForge page at http://rubyforge.org/projects/actionpack.
 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.
-For other information, feel free to ask on the ruby-talk mailing list (which
-is mirrored to comp.lang.ruby) or contact mailto:david@loudthinking.com.
+   new feature to be submitted in the form of new unit tests.

data/Rakefile CHANGED

@@ -22,11 +22,14 @@ task :default => [ :test ]
 # Run the unit tests
-Rake::TestTask.new { |t|
+desc "Run all unit tests"
+task :test => [:test_action_pack, :test_active_record_integration]
+Rake::TestTask.new(:test_action_pack) { |t|
   t.libs << "test"
 # make sure we include the controller tests (c*) first as on some systems
 # this will not happen automatically and the tests (as a whole) will error
-  t.test_files=Dir.glob( "test/c*/*_test.rb" ) + Dir.glob( "test/[ft]*/*_test.rb" )
+  t.test_files=Dir.glob( "test/c*/**/*_test.rb" ) + Dir.glob( "test/[ft]*/*_test.rb" )
 #  t.pattern = 'test/*/*_test.rb'
   t.verbose = true
 }
@@ -72,12 +75,12 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
-  s.add_dependency('activesupport', '= 1.3.1' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.4.0' + PKG_BUILD)
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
-  s.files = [ "Rakefile", "install.rb", "filler.txt", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE", "examples/.htaccess" ]
+  s.files = [ "Rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE", "examples/.htaccess" ]
   dist_dirs.each do |dir|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end

data/examples/address_book_controller.rb CHANGED

@@ -28,11 +28,11 @@ class AddressBookController < ActionController::Base
   end
   def person
-    @person = @address_book.find_person(@params["id"])
+    @person = @address_book.find_person(params[:id])
   end
   def create_person
-    @address_book.create_person(@params["person"])
+    @address_book.create_person(params[:person])
     redirect_to :action => "index"
   end
@@ -49,4 +49,4 @@ begin
   AddressBookController.process_cgi(CGI.new) if $0 == __FILE__
 rescue => e
   CGI.new.out { "#{e.class}: #{e.message}" }
-end
+end

data/examples/blog_controller.cgi CHANGED

@@ -14,7 +14,7 @@ class BlogController < ActionController::Base
     render_template <<-"EOF"
       <html><body>
-      <%= @flash["alert"] %>
+      <%= flash["alert"] %>
       <h1>Posts</h1>
       <% @posts.each do |post| %>
         <p><b><%= post.title %></b><br /><%= post.body %></p>
@@ -32,7 +32,7 @@ class BlogController < ActionController::Base
   end
   def create
-    @session["posts"].unshift(Post.new(@params["post"]["title"], @params["post"]["body"]))
+    @session["posts"].unshift(Post.new(params[:post][:title], params[:post][:body]))
     flash["alert"] = "New post added!"
     redirect_to :action => "index"
   end
@@ -50,4 +50,4 @@ begin
   BlogController.process_cgi(CGI.new) if $0 == __FILE__
 rescue => e
   CGI.new.out { "#{e.class}: #{e.message}" }
-end
+end

data/examples/debate_controller.cgi CHANGED

@@ -25,19 +25,19 @@ class DebateController < ActionController::Base
   end
   def topic
-    @topic = @debate.find_topic(@params["id"])
+    @topic = @debate.find_topic(params[:id])
   end
   # def new_topic() end <-- This is not needed as the template doesn't require any assigns
   def create_topic
-    @debate.create_topic(@params["topic"])
+    @debate.create_topic(params[:topic])
     redirect_to :action => "index"
   end
   def create_reply
-    @debate.create_reply(@params["reply"])
-    redirect_to :action => "topic", :path_params => { "id" => @params["reply"]["topic_id"] }
+    @debate.create_reply(params[:reply])
+    redirect_to :action => "topic", :path_params => { "id" => params[:reply][:topic_id] }
   end
   private
@@ -54,4 +54,4 @@ begin
   DebateController.process_cgi(CGI.new) if $0 == __FILE__
 rescue => e
   CGI.new.out { "#{e.class}: #{e.message}" }
-end
+end

data/lib/action_controller.rb CHANGED

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004 David Heinemeier Hansson
+# Copyright (c) 2004-2006 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -43,7 +43,7 @@ require 'action_controller/benchmarking'
 require 'action_controller/flash'
 require 'action_controller/filters'
 require 'action_controller/layout'
-require 'action_controller/dependencies'
+require 'action_controller/deprecated_dependencies'
 require 'action_controller/mime_responds'
 require 'action_controller/pagination'
 require 'action_controller/scaffolding'

data/lib/action_controller/assertions.rb CHANGED

@@ -1,320 +1,82 @@
 require 'test/unit'
 require 'test/unit/assertions'
-require 'rexml/document'
-require File.dirname(__FILE__) + "/vendor/html-scanner/html/document"
-module Test #:nodoc:
-  module Unit #: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 deviced 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
-      # Asserts that the response is one of the following types:
-      #
-      # * <tt>:success</tt>: Status code was 200
-      # * <tt>:redirect</tt>: Status code was in the 300-399 range
-      # * <tt>:missing</tt>: Status code was 404
-      # * <tt>:error</tt>:  Status code was in the 500-599 range
-      #
-      # You can also pass an explicit status code number as the type, like assert_response(501)
-      def assert_response(type, message = nil)
-        clean_backtrace do
-          if [ :success, :missing, :redirect, :error ].include?(type) && @response.send("#{type}?")
-            assert_block("") { true } # to count the assertion
-          elsif type.is_a?(Fixnum) && @response.response_code == type
-            assert_block("") { true } # to count the assertion
-          else
-            assert_block(build_message(message, "Expected response to be a <?>, but was <?>", type, @response.response_code)) { false }
-          end
-        end
-      end
-      # 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.
-      def assert_redirected_to(options = {}, message=nil)
-        clean_backtrace do
-          assert_response(:redirect, message)
-          if options.is_a?(String)
-            msg = build_message(message, "expected a redirect to <?>, found one to <?>", options, @response.redirect_url)
-            url_regexp = %r{^(\w+://.*?(/|$|\?))(.*)$}
-            eurl, epath, url, path = [options, @response.redirect_url].collect do |url|
-              u, p = (url_regexp =~ url) ? [$1, $3] : [nil, url]
-              [u, (p[0..0] == '/') ? p : '/' + p]
-            end.flatten
-            assert_equal(eurl, url, msg) if eurl && url
-            assert_equal(epath, path, msg) if epath && path
-          else
-            @response_diff = options.diff(@response.redirected_to) if options.is_a?(Hash) && @response.redirected_to.is_a?(Hash)
-            msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is <?>)#{', difference: <?>' if @response_diff}",
-                                @response.redirected_to || @response.redirect_url, @response_diff)
-            assert_block(msg) do
-              if options.is_a?(Symbol)
-                @response.redirected_to == options
-              else
-                options.keys.all? do |k|
-                  if k == :controller then options[k] == ActionController::Routing.controller_relative_to(@response.redirected_to[k], @controller.class.controller_path)
-                  else options[k] == (@response.redirected_to[k].respond_to?(:to_param) ? @response.redirected_to[k].to_param : @response.redirected_to[k] unless @response.redirected_to[k].nil?)
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-      # Asserts that the request was rendered with the appropriate template file.
-      def assert_template(expected = nil, message=nil)
-        clean_backtrace do
-          rendered = expected ? @response.rendered_file(!expected.include?('/')) : @response.rendered_file
-          msg = build_message(message, "expecting <?> but rendering with <?>", expected, rendered)
-          assert_block(msg) do
-            if expected.nil?
-              !@response.rendered_with_file?
-            else
-              expected == rendered
-            end
-          end
-        end
-      end
-      # Asserts that the routing of the given path was handled correctly and that the parsed options match.
-      def assert_recognizes(expected_options, path, extras={}, message=nil)
-        clean_backtrace do
-          path = "/#{path}" unless path[0..0] == '/'
-          # Load routes.rb if it hasn't been loaded.
-          ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
-          # Assume given controller
-          request = ActionController::TestRequest.new({}, {}, nil)
-          request.path = path
-          ActionController::Routing::Routes.recognize!(request)
-          expected_options = expected_options.clone
-          extras.each_key { |key| expected_options.delete key } unless extras.nil?
-          expected_options.stringify_keys!
-          msg = build_message(message, "The recognized options <?> did not match <?>",
-              request.path_parameters, expected_options)
-          assert_block(msg) { request.path_parameters == expected_options }
-        end
-      end
-      # Asserts that the provided options can be used to generate the provided path.
-      def assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)
-        clean_backtrace do
-          expected_path = "/#{expected_path}" unless expected_path[0] == ?/
-          # Load routes.rb if it hasn't been loaded.
-          ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
-          generated_path, extra_keys = ActionController::Routing::Routes.generate(options, extras)
-          found_extras = options.reject {|k, v| ! extra_keys.include? k}
-          msg = build_message(message, "found extras <?>, not <?>", found_extras, extras)
-          assert_block(msg) { found_extras == extras }
-          msg = build_message(message, "The generated path <?> did not match <?>", generated_path,
-              expected_path)
-          assert_block(msg) { expected_path == generated_path }
-        end
-      end
-      # Asserts that path and options match both ways; in other words, the URL generated from
-      # options is the same as path, and also that the options recognized from path are the same as options
-      def assert_routing(path, options, defaults={}, extras={}, message=nil)
-        assert_recognizes(options, path, extras, message)
-        controller, default_controller = options[:controller], defaults[:controller]
-        if controller && controller.include?(?/) && default_controller && default_controller.include?(?/)
-          options[:controller] = "/#{controller}"
-        end
-        assert_generates(path, options, defaults, extras, message)
+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 deviced 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)
+      klass.class_eval do
+        include ActionController::Assertions::ResponseAssertions
+        include ActionController::Assertions::SelectorAssertions
+        include ActionController::Assertions::RoutingAssertions
+        include ActionController::Assertions::TagAssertions
+        include ActionController::Assertions::DomAssertions
+        include ActionController::Assertions::ModelAssertions
+        include ActionController::Assertions::DeprecatedAssertions
       end
+    end
-      # Asserts that there is a tag/node/element in the body of the response
-      # that meets all of the given conditions. The +conditions+ parameter must
-      # be a hash of any of the following keys (all are optional):
-      #
-      # * <tt>:tag</tt>: the node type must match the corresponding value
-      # * <tt>:attributes</tt>: a hash. The node's attributes must match the
-      #   corresponding values in the hash.
-      # * <tt>:parent</tt>: a hash. The node's parent must match the
-      #   corresponding hash.
-      # * <tt>:child</tt>: a hash. At least one of the node's immediate children
-      #   must meet the criteria described by the hash.
-      # * <tt>:ancestor</tt>: a hash. At least one of the node's ancestors must
-      #   meet the criteria described by the hash.
-      # * <tt>:descendant</tt>: a hash. At least one of the node's descendants
-      #   must meet the criteria described by the hash.
-      # * <tt>:sibling</tt>: a hash. At least one of the node's siblings must
-      #   meet the criteria described by the hash.
-      # * <tt>:after</tt>: a hash. The node must be after any sibling meeting
-      #   the criteria described by the hash, and at least one sibling must match.
-      # * <tt>:before</tt>: a hash. The node must be before any sibling meeting
-      #   the criteria described by the hash, and at least one sibling must match.
-      # * <tt>:children</tt>: a hash, for counting children of a node. Accepts
-      #   the keys:
-      #   * <tt>:count</tt>: either a number or a range which must equal (or
-      #     include) the number of children that match.
-      #   * <tt>:less_than</tt>: the number of matching children must be less
-      #     than this number.
-      #   * <tt>:greater_than</tt>: the number of matching children must be
-      #     greater than this number.
-      #   * <tt>:only</tt>: another hash consisting of the keys to use
-      #     to match on the children, and only matching children will be
-      #     counted.
-      # * <tt>:content</tt>: the textual content of the node must match the
-      #     given value. This will not match HTML tags in the body of a
-      #     tag--only text.
-      #
-      # Conditions are matched using the following algorithm:
-      #
-      # * if the condition is a string, it must be a substring of the value.
-      # * if the condition is a regexp, it must match the value.
-      # * if the condition is a number, the value must match number.to_s.
-      # * if the condition is +true+, the value must not be +nil+.
-      # * if the condition is +false+ or +nil+, the value must be +nil+.
-      #
-      # Usage:
-      #
-      #   # assert that there is a "span" tag
-      #   assert_tag :tag => "span"
-      #
-      #   # assert that there is a "span" tag with id="x"
-      #   assert_tag :tag => "span", :attributes => { :id => "x" }
-      #
-      #   # assert that there is a "span" tag using the short-hand
-      #   assert_tag :span
-      #
-      #   # assert that there is a "span" tag with id="x" using the short-hand
-      #   assert_tag :span, :attributes => { :id => "x" }
-      #
-      #   # assert that there is a "span" inside of a "div"
-      #   assert_tag :tag => "span", :parent => { :tag => "div" }
-      #
-      #   # assert that there is a "span" somewhere inside a table
-      #   assert_tag :tag => "span", :ancestor => { :tag => "table" }
-      #
-      #   # assert that there is a "span" with at least one "em" child
-      #   assert_tag :tag => "span", :child => { :tag => "em" }
-      #
-      #   # assert that there is a "span" containing a (possibly nested)
-      #   # "strong" tag.
-      #   assert_tag :tag => "span", :descendant => { :tag => "strong" }
-      #
-      #   # assert that there is a "span" containing between 2 and 4 "em" tags
-      #   # as immediate children
-      #   assert_tag :tag => "span",
-      #              :children => { :count => 2..4, :only => { :tag => "em" } }
-      #
-      #   # get funky: assert that there is a "div", with an "ul" ancestor
-      #   # and an "li" parent (with "class" = "enum"), and containing a
-      #   # "span" descendant that contains text matching /hello world/
-      #   assert_tag :tag => "div",
-      #              :ancestor => { :tag => "ul" },
-      #              :parent => { :tag => "li",
-      #                           :attributes => { :class => "enum" } },
-      #              :descendant => { :tag => "span",
-      #                               :child => /hello world/ }
-      #
-      # <strong>Please note</strong: #assert_tag and #assert_no_tag only work
-      # with well-formed XHTML. They recognize a few tags as implicitly self-closing
-      # (like br and hr and such) but will not work correctly with tags
-      # that allow optional closing tags (p, li, td). <em>You must explicitly
-      # close all of your tags to use these assertions.</em>
-      def assert_tag(*opts)
-        clean_backtrace do
-          opts = opts.size > 1 ? opts.last.merge({ :tag => opts.first.to_s }) : opts.first
-          tag = find_tag(opts)
-          assert tag, "expected tag, but no tag found matching #{opts.inspect} in:\n#{@response.body.inspect}"
-        end
-      end
-      # Identical to #assert_tag, but asserts that a matching tag does _not_
-      # exist. (See #assert_tag for a full discussion of the syntax.)
-      def assert_no_tag(*opts)
-        clean_backtrace do
-          opts = opts.size > 1 ? opts.last.merge({ :tag => opts.first.to_s }) : opts.first
-          tag = find_tag(opts)
-          assert !tag, "expected no tag, but found tag matching #{opts.inspect} in:\n#{@response.body.inspect}"
-        end
-      end
+    def clean_backtrace(&block)
+      yield
+    rescue Test::Unit::AssertionFailedError => e
+      path = File.expand_path(__FILE__)
+      raise Test::Unit::AssertionFailedError, e.message, e.backtrace.reject { |line| File.expand_path(line) =~ /#{path}/ }
+    end
+  end
+end
-      # test 2 html strings to be equivalent, i.e. identical up to reordering of attributes
-      def assert_dom_equal(expected, actual, message="")
-        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)
-          assert_block(full_message) { expected_dom == actual_dom }
-        end
-      end
-      # negated form of +assert_dom_equivalent+
-      def assert_dom_not_equal(expected, actual, message="")
-        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)
-          assert_block(full_message) { expected_dom != actual_dom }
-        end
-      end
+require File.dirname(__FILE__) + '/assertions/response_assertions'
+require File.dirname(__FILE__) + '/assertions/selector_assertions'
+require File.dirname(__FILE__) + '/assertions/tag_assertions'
+require File.dirname(__FILE__) + '/assertions/dom_assertions'
+require File.dirname(__FILE__) + '/assertions/routing_assertions'
+require File.dirname(__FILE__) + '/assertions/model_assertions'
+require File.dirname(__FILE__) + '/assertions/deprecated_assertions'
-      # ensures that the passed record is valid by active record standards. returns the error messages if not
-      def assert_valid(record)
-        clean_backtrace do
-          assert record.valid?, record.errors.full_messages.join("\n")
-        end
-      end
-      def clean_backtrace(&block)
-        yield
-      rescue AssertionFailedError => e
-        path = File.expand_path(__FILE__)
-        raise AssertionFailedError, e.message, e.backtrace.reject { |line| File.expand_path(line) =~ /#{path}/ }
-      end
+module Test #:nodoc:
+  module Unit #:nodoc:
+    class TestCase #:nodoc:
+      include ActionController::Assertions
     end
   end
-end
+end