actionpack 1.8.1 → 1.9.0

data/CHANGELOG

@@ -1,3 +1,296 @@
+*1.9.0* (6 July, 2005)
+
+* Added logging of the request URI in the benchmark statement (makes it easy to grep for slow actions)
+
+* 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]
+
+* 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]
+
+* Fixed that hashes was not working properly when passed by GET to lighttpd #849 [Nicholas Seckar]
+
+* Fixed assert_template nil will be true when no template was rendered #1565 [maceywj@telus.net]
+
+* Added :prompt option to FormOptions#select (and the users of it, like FormOptions#select_country etc) to create "Please select" style descriptors #1181 [Michael Schuerig]
+
+* Added JavascriptHelper#update_element_function, which returns a Javascript function (or expression) that'll update a DOM element according to the options passed #933 [mortonda@dgrmm.net]. Examples:
+
+    <%= update_element_function("products", :action => :insert, :position => :bottom, :content => "<p>New product!</p>") %>
+
+    <% update_element_function("products", :action => :replace, :binding => binding) do %>
+      <p>Product 1</p>
+      <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 JavascriptHelper#draggable_element and JavascriptHelper#drop_receiving_element to facilitate easy dragging and dropping through the script.aculo.us libraries #1578 [Thomas Fuchs]
+
+* Added that UrlHelper#mail_to will now also encode the default link title #749 [f.svehla@gmail.com]
+
+* Removed the default option of wrap=virtual on FormHelper#text_area to ensure XHTML compatibility #1300 [thomas@columbus.rr.com]
+
+* Adds the ability to include XML CDATA tags using Builder #1563 [Josh Knowles]. Example:
+
+    xml.cdata! "some text" # => <![CDATA[some text]]>
+
+* Added evaluation of <SCRIPT> blocks in content returned to Ajax calls #1577 [Thomas Fuchs/court3nay/Sean Treadway]
+
+* Directly generate paths with a leading slash instead of tacking it on later.  #1543 [Nicholas Seckar]
+
+* Fixed errant parameter modification in functional tests.  #1542 [Nicholas Seckar]
+
+* Routes fail with leading slash #1540 [Nicholas Seckar]
+
+* Added support for graceful error handling of Ajax calls #1217 [Jamis Buck/Thomas Fuchs]. Example:
+
+    link_to_remote(
+      "test", 
+      :url => { :action => "faulty" }, 
+      :update => { :success => "good", :failure => "bad" },
+      403 => "alert('Forbidden- got ya!')",
+      404 => "alert('Nothing there...?')", 
+      :failure => "alert('Unkown error ' + request.status)")
+  
+* Attempt to explicitly flush the output at the end of CgiProcess#out
+
+* Fixed assert_redirected_to to handle absolute controller paths properly #1472 [Rick Olson/Nicholas Seckar]
+
+* Added event-based observations when frequency is not set on observe_field/form #1474 [flash@vanklinkenbergsoftware.nl]
+
+* Added script.aculo.us Javascripts (controls.js, dragdrop.js, effects.js) (NEEDS MORE DESCRIPTION) #1509 [Thomas Fuchs]
+
+* Fixed prototype to consider all fields it doesn't know as text (such as Safari's search) just like the browser in its serialization #1497 [Sean Treadway]
+
+* Improved performance of Routes generation by a factor of 5 #1434 [Nicholas Seckar] 
+
+* Added named routes (NEEDS BETTER DESCRIPTION) #1434 [Nicholas Seckar]
+
+* Improved AbstractRequest documentation #1483 [court3nay@gmail.com]
+
+* 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.
+
+* Added TextHelper#word_wrap(text, line_length = 80) #1449 [tuxie@dekadance.se]
+
+* Added a fall-through action for form_remote_tag that'll be used in case Javascript is unavailable #1459 [Scott Barron]. Example:
+
+    form_remote_tag :html => { :action => url_for(:controller => "some", :action => "place") }
+
+* 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 option to pass in parameters to CaptureHelper#capture, so you can create more advanced view helper methods #1466 [duane.johnson@gmail.com]. Example:
+
+    <% show_calendar(:year => 2005, :month => 6) do |day, options| %>
+      <% options[:bgcolor] = '#dfd' if 10..15.include? day %>
+      [<%= day %>]
+    <% end %>
+
+* Changed the default name of the input tag generated by FormTagHelper#submit_tag from "submit" to "commit" so it doesn't clash with form.submit() calls in Javascript #1271
+
+* Fixed relative urls support for lighttpd #1048 [Nicholas Seckar/maznawak@nerim.net]
+
+* Correct distance_of_time_in_words for integer arguments and make the second arg optional, treating the first arg as a duration in seconds.  #1458 [madrobby <thomas@fesch.at>]
+
+* Fixed query parser to deal gracefully with equal signs inside keys and values #1345 [gorou]. 
+  Example: /?sig=abcdef=:foobar=&x=y will pass now. 
+
+* Added Cuba to country list #1351 [todd]
+
+* Fixed radio_button to work with numeric values #1352 [demetrius]
+
+* Added :extension option to NumberHelper#number_to_phone #1361 [delynnb]
+
+* 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]
+
+* 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 TagHelper such that :name and 'name' keys in the options doesn't result in two attributes #1455 [take_tk]
+
+* Ensure that helpers are only available to the controllers where they are defined and their subclasses.  #1394 [kdole@tamu.edu]
+
+* render("foo/bar") works with a layout again 
+
+* Fixed double-singularization on scaffolded pagination call (Address would be turned into Addres) #1216, #1404 [nilsga]
+
+* Removed the require hack used by functional testing to work around an earlier bug in rake.
+
+* 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]
+
+* 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.
+
+* Changed test requests to come from 0.0.0.0 instead of 127.0.0.1 such that they don't trigger debugging screens on exceptions, but instead call rescue_action_in_public
+
+* Modernize scaffolding to match the generator: use the new render method and change style from the warty @params["id"] to the sleek params[:id].  #1367
+
+* Include :id in the action generated by the form helper method.  Then, for example, the controller can do Model.find(params[:id]) for both edit and update actions.  Updated scaffolding to take advantage.  #1367
+
+* Add assertions with friendly messages to TestCase#process to ensure that @controller, @request, and @response are set.  #1367
+
+* Arrays, hashes sent via multipart posts are converted to strings #1032 [dj@omelia.org, me@julik.nl]
+
+* render(:layout => true) is a synonym for render(:layout => nil)
+
+* Make sure the benchmarking render method always returns the output of the render.
+
+* render(:action), render(:template) and render() are the only three calls that default to using a layout. All other render calls assume :layout => false. This also fixes send_file, which was applying a layout if one existed for the current action.
+
+* verify with :redirect_to won't redirect if a redirect or render has already been performed #1350
+
+* render(:partial => true) is identical to the behavior of the deprecated render_partial()
+
+* Fixed render(:partial => "...") to use an empty Hash for the local assigns #1365
+
+* Fixed Caching::Fragments::FileStore.delete to not raise an exception if the delete fails.
+
+* Deprecated all render_* methods in favor of consolidating all rendering behavior in Base#render(options). This enables more natural use of combining options, such as layouts. Examples:
+
+    +---------------------------------------------------------------+-------------------------------------------------------+
+    | BEFORE                                                        | AFTER                                                 |
+    +---------------------------------------------------------------+-------------------------------------------------------+
+    | render_with_layout "weblog/show", "200 OK", "layouts/dialog"  | render :action => "show", :layout => "dialog"         |
+    | render_without_layout "weblog/show"                           | render :action => "show", :layout => false            |
+    | render_action "error", "404 Not Found"                        | render :action => "error", :status => "404 Not Found" |
+    | render_template "xml.div('stuff')", "200 OK", :rxml           | render :inline => "xml.div('stuff')", :type => :rxml  |
+    | render_text "hello world!"                                    | render :text => "hello world!"                        |
+    | render_partial_collection "person", @people, nil, :a => 1     | render :partial => "person", :collection => @people,  |
+    |                                                               |        :locals => { :a => 1 }                         |
+    +---------------------------------------------------------------+-------------------------------------------------------+      
+
+* Deprecated redirect_to_path and redirect_to_url in favor of letting redirect_to do the right thing when passed either a path or url.
+
+* Fixed use of an integer as return code for renders, so render_text "hello world", 404 now works #1327
+
+* Fixed assert_redirect_to to work with redirect_to_path #869 [Nicholas Seckar]
+
+* Fixed escaping of :method option in remote_form_tag #1218 [Rick Olson]
+
+* Added Serbia and Montenegro to the country_select #1239 [todd@robotcoop.com]
+
+* Fixed Request#remote_ip in testing #1251 [Jeremy Kemper]
+
+* Fixed that compute_public_path should recognize external URLs, so image_tag("http://www.example.com/images/icon.gif") is not prefixed with the relative url path #1254 [victor-ronr-trac@carotena.net]
+
+* Added support for descending year values in DateHelper#select_year, like select_year(Date.today, :start_year => 2005, :end_year => 1900), which would count down from 2005 to 1900 instead of the other way #1274 [nwoods@mail.com]
+
+* Fixed that FormHelper#checkbox should return a checked checkbox if the value is the same as checked_value #1286 [Florian Weber]
+
+* Fixed Form.disable in Prototype #1317 [Wintermute]
+
+* Added accessors to logger, params, response, session, flash, and headers from the view, so you can write <% logger.info "stuff" %> instead of <% @logger.info "others" %> -- more consistent with the preferred way of accessing these attributes and collections from the controller
+
+* Added support for POST data in form of YAML or XML, which is controller through the Content-Type header. Example request:
+
+    Content-Type: application/xml
+    <request><item><content>HelloWorld</content></item></request>
+  
+  ...is the same as:
+
+    Content-Type: application/x-yaml
+    ---
+    item:
+      content: HelloWorld
+
+  ...is the same as:
+  
+    item[content]=HelloWorld
+  
+  Which in the end turns into { "item" => { "content" => "HelloWorld" } }. This makes it a lot easier to publish REST web services on top of your regular actions (as they won't care).
+  
+  Example Curl call:
+
+    curl -H 'Content-Type: application/xml' -d '<request><item><content>KillMeMore</content></item></request>' http://www.example.com/service
+
+  You can query to find out whether a given request came through as one of these types with:
+    - request.post_format? (:url_encoded, :xml or :yaml)
+    - request.formatted_post? (for either xml or yaml)
+    - request.xml_post?
+    - request.yaml_post?
+
+* Added bundling of XmlSimple by Maik Schmidt
+
+* Fixed that render_partial_collection should always return a string (and not sometimes an array, despite <%= %> not caring)
+
+* Added TextHelper#sanitize that can will remove any Javascript handlers, blocks, and forms from an input of HTML.  This allows for use of HTML on public sites, but still be free of XSS issues. #1277 [Jamis Buck]
+
+* Fixed the HTML scanner used by assert_tag where a infinite loop could be caused by a stray less-than sign in the input #1270 [Jamis Buck]
+
+* Added functionality to assert_tag, so you can now do tests on the siblings of a node, to assert that some element comes before or after the element in question, or just to assert that some element exists as a sibling #1226 [Jamis Buck]
+
+* Added better error handling for regexp caching expiration
+
+* Fixed handling of requests coming from unknown HTTP methods not to kill the server
+
+* Added that both AssetHelper#stylesheet_link_tag and AssetHelper#javascript_include_tag now accept an option hash as the last parameter, so you can do stuff like: stylesheet_link_tag "style", :media => "all"
+
+* Added FormTagHelper#image_submit_tag for making submit buttons that uses images
+
+* Added ActionController::Base.asset_host that will then be used by all the asset helpers. This enables you to easily offload static content like javascripts and images to a separate server tuned just for that.
+
+* Fixed action/fragment caching using the filestore when a directory and a file wanted to 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 assert_redirected_to to work with :only_path => false #1204 [Alisdair McDiarmid]
+
+* Fixed render_partial_collection to output an empty string instead of nil when handed an empty array #1202 [Ryan Carver]
+
+* Improved the speed of regular expression expirations for caching by a factor of 10 #1221 [Jamis Buck]
+
+* Removed dumping of template assigns on the rescue page as it would very easily include a ton of data making page loads take seconds (and the information was rarely helpful) #1222
+
+* Added BenchmarkHelper that can measure the execution time of a block in a template and reports the result to the log. Example:
+  
+    <% benchmark "Notes section" do %>
+      <%= expensive_notes_operation %>
+    <% end %>
+  
+   Will add something like "Notes section (0.345234)" to the log.
+
+* Added ActionController::Caching::Sweeper as an improved an easier to use sweeper. The new sweepers work on a single-step approach instead of two-steps like the old ones. Before
+
+    def after_save(record)
+      @list = record.is_a?(List) ? record : record.list
+    end
+    
+    def filter(controller)
+      controller.expire_page(:controller => "lists", :action => %w( show public feed ), :id => @list.id)
+      controller.expire_action(:controller => "lists", :action => "all")
+      @list.shares.each { |share| controller.expire_page(:controller => "lists", :action => "show", :id => share.url_key) }
+    end
+
+  ..after:
+
+    def after_save(record)
+      list = record.is_a?(List) ? record : record.list
+      expire_page(:controller => "lists", :action => %w( show public feed ), :id => list.id)
+      expire_action(:controller => "lists", :action => "all")
+      list.shares.each { |share| expire_page(:controller => "lists", :action => "show", :id => share.url_key) }
+    end
+
+  The new sweepers can also observe on the actions themselves by implementing methods according to (before|after)_$controller_$action. Example of a callback that'll be called after PagesController#update_title has been performed:
+  
+      def after_pages_update_title
+        expire_fragment(%r{pages/#{controller.assigns["page"].id}/.*})
+      end
+
+  Note that missing_method is delegated to the controller instance, which is assigned in a before filter. This means that you can call expire_fragment instead of @controller.expire_fragment.
+
+* Added that Fragments#expire_fragment now accepts as a regular expression as the name thereby deprecating expire_matched_fragments
+
+* Fixed that fragments shouldn't use the current host and the path as part of the key like pages does
+
+* Added conditions to around_filters just like before_filter and after_filter
+
+
 *1.8.1* (20th April, 2005)
 
 * Added xml_http_request/xhr method for simulating XMLHttpRequest in functional tests #1151 [Sam Stephenson]. Example:
@@ -107,7 +400,7 @@
 
 * Added pagination for scaffolding (10 items per page) #964 [mortonda@dgrmm.net]
 
-* Added assert_no_cookie and fixed assert_cookie_equal to deal with non-existing cookies #979 [bitsweat]
+* Added assert_no_cookie and fixed assert_cookie_equal to deal with non-existing cookies #979 [Jeremy Kemper]
 
 * Fixed :overwrite_param so it doesn't delete but reject elements from @request.parameters #982 [raphinou@yahoo.com]
 
@@ -234,7 +527,7 @@
 
 * Removed the reliance on PATH_INFO as it was causing problems for caching and inhibited the new non-vhost support #822 [Nicholas Seckar]
 
-* Added assigns shortcut for @response.template.assigns to controller test cases [bitsweat]. Example:
+* Added assigns shortcut for @response.template.assigns to controller test cases [Jeremy Kemper]. Example:
 
   Before:
 
@@ -273,7 +566,7 @@
 
 * Removed the default border on link_image_to (it broke xhtml strict) -- can be specified with :border => 0 #517 [?/caleb]
 
-* Fixed that form helpers would treat string and symbol keys differently in html_options (and possibly create duplicate entries) #112 [bitsweat]
+* Fixed that form helpers would treat string and symbol keys differently in html_options (and possibly create duplicate entries) #112 [Jeremy Kemper]
 
 * Fixed that broken pipe errors (clients disconnecting in mid-request) could bring down a fcgi process
 
@@ -319,7 +612,7 @@
 
 * Added FormTagHelper that provides a number of methods for creating form tags that doesn't rely on conventions with an object assigned to the template like FormHelper does. With the FormTagHelper, you provide the names and values yourself.
 
-* Added Afghanistan, Iran, and Irak to the countries list used by FormOptions#country_select and FormOptions#country_options_for_select
+* Added Afghanistan, Iran, and Iraq to the countries list used by FormOptions#country_select and FormOptions#country_options_for_select
 
 * Renamed link_to_image to link_image_to (since thats what it actually does) -- kept alias for the old method name
 
@@ -390,7 +683,7 @@
 
 * Added TestResponse#binary_content that'll return as a string the data sent through send_data/send_file for testing #500 [Alexey]
 
-* Added @request.env['RAW_POST_DATA'] for people who need access to the data before Ruby's CGI has parsed it #505 [bitsweat]
+* Added @request.env['RAW_POST_DATA'] for people who need access to the data before Ruby's CGI has parsed it #505 [Jeremy Kemper]
 
 * Fixed that a default fragment store wan't being set to MemoryStore as intended.
 
@@ -450,7 +743,7 @@
 
 * Fixed that controller tests can now assert on the use of cookies #466 [Alexey]
 
-* Fixed that send_file would "remember" all the files sent by adding to the headers again and again #458 [bitsweat]
+* Fixed that send_file would "remember" all the files sent by adding to the headers again and again #458 [Jeremy Kemper]
 
 * Fixed url rewriter confusion when the controller or action name was a substring of the controller_prefix or action_prefix
 
@@ -620,7 +913,7 @@
   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]
 
-* Fixed CgiRequest#out to fall back to #write if $stdout doesn't have #syswrite [bitsweat]
+* 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]
 
@@ -670,7 +963,7 @@
 
 * Added options to tailor header tag, div id, and div class on ActiveRecordHelper#error_messages_for [josh]
 
-* Added graceful handling of non-alphanumeric names and misplaced brackets in input parameters [bitsweat]
+* Added graceful handling of non-alphanumeric names and misplaced brackets in input parameters [Jeremy Kemper]
 
 * Added a new container for cookies that makes them more intuative to use. The old methods of cookie and @cookies have been deprecated.
 
@@ -694,7 +987,7 @@
 
 * Added Request#ssl? which is shorthand for @request.protocol == "https://"
 
-* Added the choice to call form_tag with no arguments (resulting in a form posting to current action) [bitsweat]
+* Added the choice to call form_tag with no arguments (resulting in a form posting to current action) [Jeremy Kemper]
 
 * Upgraded to Builder 1.2.1
 
@@ -743,7 +1036,7 @@
 
 *0.9.5* (28)
 
-* Added helper_method to designate that a given private or protected method you should available as a helper in the view. [bitsweat]
+* Added helper_method to designate that a given private or protected method you should available as a helper in the view. [Jeremy Kemper]
 
 * Fixed assert_rendered_file so it actually verifies if that was the rendered file [htonl]
 
@@ -751,19 +1044,19 @@
 
 * Fixed that Russia was named twice in country_select [alexey]
 
-* Fixed request_origin to use remote_ip instead of remote_addr [bitsweat]
+* Fixed request_origin to use remote_ip instead of remote_addr [Jeremy Kemper]
 
 * Fixed link_to breakage when nil was passed for html_options [alexey]
 
 * Fixed redirect_to on a virtual server setup with apache with a port other than the default where it would forget the port number [seanohalpin]
 
-* Fixed that auto-loading webrick on Windows would cause file uploads to fail [bitsweat]
+* Fixed that auto-loading webrick on Windows would cause file uploads to fail [Jeremy Kemper]
 
-* Fixed issues with sending files on WEBrick by setting the proper binmode [bitsweat]
+* Fixed issues with sending files on WEBrick by setting the proper binmode [Jeremy Kemper]
 
-* Added send_data as an alternative to send_file when the stream is not read off the filesystem but from a database or generated live [bitsweat]
+* Added send_data as an alternative to send_file when the stream is not read off the filesystem but from a database or generated live [Jeremy Kemper]
 
-* Added a new way to include helpers that doesn't require the include hack and can go without the explicit require. [bitsweat]
+* Added a new way to include helpers that doesn't require the include hack and can go without the explicit require. [Jeremy Kemper]
 
   Before:
 
@@ -1432,4 +1725,4 @@
 
 *0.7.5*
 
-* First public release
+* First public release

data/README

@@ -43,7 +43,7 @@ A short rundown of the major features:
         @customer.attributes = @params["customer"]
         @customer.save ? 
           redirect_to(:action => "display") : 
-          render("customer/edit")
+          render(:action => "edit")
       end
       
       private

data/lib/action_controller.rb

@@ -32,6 +32,7 @@ rescue LoadError
 end
 
 require 'action_controller/base'
+require 'action_controller/deprecated_renders_and_redirects'
 require 'action_controller/rescue'
 require 'action_controller/benchmarking'
 require 'action_controller/filters'
@@ -47,6 +48,8 @@ require 'action_controller/cgi_process'
 require 'action_controller/caching'
 require 'action_controller/components'
 require 'action_controller/verification'
+require 'action_controller/streaming'
+require 'action_controller/auto_complete'
 
 require 'action_view'
 ActionController::Base.template_class = ActionView::Base
@@ -66,4 +69,6 @@ ActionController::Base.class_eval do
   include ActionController::Caching
   include ActionController::Components
   include ActionController::Verification
+  include ActionController::Streaming
+  include ActionController::AutoComplete
 end

data/lib/action_controller/assertions.rb

@@ -26,6 +26,25 @@ module Test #:nodoc:
     #
     # For redirects within the same controller, you can even call follow_redirect and the redirect will be follow 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 happen. But
+    # some times you also want to manipulate these collections in the request coming in. 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:
       # 
@@ -49,15 +68,32 @@ module Test #:nodoc:
       # such at 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)
-        assert_redirect(message)
+        assert_response(:redirect, message)
 
-        msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is <?>)", @response.redirected_to)
-        assert_block(msg) do
-          if options.is_a?(Symbol)
-            @response.redirected_to == options
-          else
-            options.keys.all? do |k| 
-              options[k] == (@response.redirected_to[k].respond_to?(:to_param) ? @response.redirected_to[k].to_param : @response.redirected_to[k] if @response.redirected_to[k])
+        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
+
+          if eurl && url then assert_equal(eurl, url, msg)
+          else assert_equal(epath, path, msg)
+          end
+        else
+          msg = build_message(message, "response is not a redirection to all of the options supplied (redirection is <?>)",
+                              @response.redirected_to || @response.redirect_url)
+
+          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
@@ -69,7 +105,7 @@ module Test #:nodoc:
         msg = build_message(message, "expecting <?> but rendering with <?>", expected, rendered)
         assert_block(msg) do
           if expected.nil?
-            @response.rendered_with_file?
+            !@response.rendered_with_file?
           else
             expected == rendered
           end
@@ -78,6 +114,7 @@ module Test #:nodoc:
 
       # Asserts that the routing of the given path is handled correctly and that the parsed options match.
       def assert_recognizes(expected_options, path, extras={}, message=nil)
+        path = "/#{path}" unless path[0..0] == '/'
         # Load routes.rb if it hasn't been loaded.
         ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty? 
       
@@ -89,6 +126,7 @@ module Test #:nodoc:
         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 }
@@ -96,6 +134,7 @@ module Test #:nodoc:
 
       # Asserts that the provided options can be used to generate the provided path.
       def assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)
+        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? 
       
@@ -105,7 +144,6 @@ module Test #:nodoc:
         request.path_parameters[:controller] ||= options[:controller]
       
         generated_path, found_extras = ActionController::Routing::Routes.generate(options, request)
-        generated_path = generated_path.join('/')
         msg = build_message(message, "found extras <?>, not <?>", found_extras, extras)
         assert_block(msg) { found_extras == extras }
       
@@ -136,6 +174,12 @@ module Test #:nodoc:
       #   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
@@ -147,8 +191,9 @@ module Test #:nodoc:
       #   * <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>: (text nodes only). The content of the node must
-      #   match the given value.
+      # * <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:
       #