actionpack 1.13.6 → 2.0.0

data/lib/action_view/helpers/atom_feed_helper.rb

@@ -0,0 +1,111 @@
+# Adds easy defaults to writing Atom feeds with the Builder template engine (this does not work on ERb or any other
+# template languages).
+module ActionView
+  module Helpers #:nodoc:
+    module AtomFeedHelper
+      # Full usage example:
+      #
+      #   config/routes.rb:
+      #     ActionController::Routing::Routes.draw do |map|
+      #       map.resources :posts
+      #       map.root :controller => "posts"
+      #     end
+      #
+      #   app/controllers/posts_controller.rb:
+      #     class PostsController < ApplicationController::Base
+      #       # GET /posts.html
+      #       # GET /posts.atom
+      #       def index
+      #         @posts = Post.find(:all)
+      #         
+      #         respond_to do |format|
+      #           format.html
+      #           format.atom
+      #         end
+      #       end
+      #     end
+      #
+      #   app/views/posts/index.atom.builder:
+      #     atom_feed do |feed|
+      #       feed.title("My great blog!")
+      #       feed.updated((@posts.first.created_at))
+      #     
+      #       for post in @posts
+      #         feed.entry(post) do |entry|
+      #           entry.title(post.title)
+      #           entry.content(post.body, :type => 'html')
+      #     
+      #           entry.author do |author|
+      #             author.name("DHH")
+      #           end
+      #         end
+      #       end
+      #     end
+      #
+      # The options are for atom_feed are:
+      #
+      # * <tt>:language</tt>: Defaults to "en-US".
+      # * <tt>:root_url</tt>: The HTML alternative that this feed is doubling for. Defaults to / on the current host.
+      # * <tt>:url</tt>: The URL for this feed. Defaults to the current URL.
+      #
+      # atom_feed yields a AtomFeedBuilder instance.
+      def atom_feed(options = {}, &block)
+        xml = options[:xml] || eval("xml", block.binding)
+        xml.instruct!
+
+        xml.feed "xml:lang" => options[:language] || "en-US", "xmlns" => 'http://www.w3.org/2005/Atom' do
+          xml.id("tag:#{request.host}:#{request.request_uri.split(".")[0].gsub("/", "")}")      
+          xml.link(:rel => 'alternate', :type => 'text/html', :href => options[:root_url] || (request.protocol + request.host_with_port))
+
+          if options[:url]
+            xml.link(:rel => 'self', :type => 'application/atom+xml', :href => options[:url] || request.url)
+          end
+
+          yield AtomFeedBuilder.new(xml, self)
+        end
+      end
+
+
+      class AtomFeedBuilder
+        def initialize(xml, view)
+          @xml, @view = xml, view
+        end
+        
+        # Accepts a Date or Time object and inserts it in the proper format. If nil is passed, current time in UTC is used.
+        def updated(date_or_time = nil)
+          @xml.updated((date_or_time || Time.now.utc).xmlschema)
+        end
+
+        # Creates an entry tag for a specific record and prefills the id using class and id.
+        #
+        # Options:
+        #
+        # * <tt>:updated</tt>: Time of update. Defaults to the created_at attribute on the record if one such exists.
+        # * <tt>:published</tt>: Time first published. Defaults to the updated_at attribute on the record if one such exists.
+        # * <tt>:url</tt>: The URL for this entry. Defaults to the polymorphic_url for the record.
+        def entry(record, options = {})
+          @xml.entry do 
+            @xml.id("tag:#{@view.request.host_with_port}:#{record.class}#{record.id}")
+
+            if options[:published] || (record.respond_to?(:created_at) && record.created_at)
+              @xml.published((options[:published] || record.created_at).xmlschema)
+            end
+
+            if options[:updated] || (record.respond_to?(:updated_at) && record.updated_at)
+              @xml.updated((options[:updated] || record.updated_at).xmlschema)
+            end
+
+            @xml.link(:rel => 'alternate', :type => 'text/html', :href => options[:url] || @view.polymorphic_url(record))
+
+            yield @xml
+          end
+        end
+
+        private
+          def method_missing(method, *arguments)
+            @xml.__send__(method, *arguments)
+          end
+      end
+    end
+  end
+end

data/lib/action_view/helpers/benchmark_helper.rb

@@ -2,17 +2,24 @@ require 'benchmark'
 
 module ActionView
   module Helpers
+    # This helper offers a method to measure the execution time of a block 
+    # in a template.
     module BenchmarkHelper
-      # Measures the execution time of a block in a template and reports the result to the log. Example:
+      # Allows you to measure the execution time of a block 
+      # in a template and records the result to the log. Wrap this block around
+      # expensive operations or possible bottlenecks to get a time reading
+      # for the operation.  For example, let's say you thought your file 
+      # processing method was taking too long; you could wrap it in a benchmark block.
       #
-      #  <% benchmark "Notes section" do %>
-      #    <%= expensive_notes_operation %>
+      #  <% benchmark "Process data files" do %>
+      #    <%= expensive_files_operation %>
       #  <% end %>
       #
-      # Will add something like "Notes section (0.34523)" to the log.
+      # That would add something like "Process data files (0.34523)" 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
-      # (:debug, :info, :warn, :error).  The default is :info.
+      # (:debug, :info, :warn, :error); the default value is :info.
       def benchmark(message = "Benchmarking", level = :info)
         if @logger
           real = Benchmark.realtime { yield }

data/lib/action_view/helpers/cache_helper.rb

@@ -1,7 +1,36 @@
 module ActionView
   module Helpers
+    # This helper to exposes a method for caching of view fragments.
     # See ActionController::Caching::Fragments for usage instructions.
     module CacheHelper
+      # A method for caching fragments of a view rather than an entire
+      # action or page.  This technique is useful caching pieces like
+      # menus, lists of news topics, static HTML fragments, and so on.
+      # This method takes a block that contains the content you wish
+      # to cache.  See ActionController::Caching::Fragments for more
+      # information.
+      #
+      # ==== Examples
+      # If you wanted to cache a navigation menu, you could do the
+      # following.
+      #
+      #   <% cache do %>
+      #     <%= render :partial => "menu" %>
+      #   <% end %>
+      #
+      # You can also cache static content...
+      #
+      #   <% cache do %>
+      #      <p>Hello users!  Welcome to our website!</p>
+      #   <% end %>
+      #
+      # ...and static content mixed with RHTML content.
+      #
+      #    <% cache do %>
+      #      Topics:
+      #      <%= render :partial => "topics", :collection => @topic_list %>
+      #      <i>Topics listed alphabetically</i>
+      #    <% end %>
       def cache(name = {}, &block)
         @controller.cache_erb_fragment(block, name)
       end

data/lib/action_view/helpers/capture_helper.rb

@@ -1,96 +1,130 @@
 module ActionView
   module Helpers
-    # Capture lets you extract parts of code which
-    # can be used in other points of the template or even layout file.
-    #
-    # == Capturing a block into an instance variable
-    #
-    #   <% @script = capture do %>
-    #     [some html...]
-    #   <% end %>
-    #
-    # == Add javascript to header using content_for
-    #
-    # content_for("name") is a wrapper for capture which will 
-    # make the fragment available by name to a yielding layout or template.
-    #
-    # layout.rhtml:
-    #
-    #   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-    #   <head>
-    #	    <title>layout with js</title>
-    #	    <script type="text/javascript">
-    #	      <%= yield :script %>
-    #     </script>
-    #   </head>
-    #   <body>
-    #     <%= yield %>
-    #   </body>
-    #   </html>
-    #
-    # view.rhtml
-    #   
-    #   This page shows an alert box!
-    #
-    #   <% content_for("script") do %>
-    #     alert('hello world')
-    #   <% end %>
-    #
-    #   Normal view text
+    # CaptureHelper exposes methods to let you extract generated markup which
+    # can be used in other parts of a template or layout file.
+    # It provides a method to capture blocks into variables through capture and 
+    # a way to capture a block of markup for use in a layout through content_for.
     module CaptureHelper
-      # Capture allows you to extract a part of the template into an 
-      # instance variable. You can use this instance variable anywhere
-      # in your templates and even in your layout. 
+      # The capture method allows you to extract part of a template into a 
+      # variable. You can then use this variable anywhere in your templates or layout. 
       # 
-      # Example of capture being used in a .rhtml page:
+      # ==== Examples
+      # The capture method can be used in ERb templates...
       # 
       #   <% @greeting = capture do %>
-      #     Welcome To my shiny new web page!
+      #     Welcome to my shiny new web page!  The date and time is
+      #     <%= Time.now %>
       #   <% end %>
       #
-      # Example of capture being used in a .rxml page:
+      # ...and Builder (RXML) templates.
       # 
-      #   @greeting = capture do
-      #     'Welcome To my shiny new web page!'
+      #   @timestamp = capture do
+      #     "The current timestamp is #{Time.now}."
       #   end
+      #
+      # You can then use that variable anywhere else.  For example:
+      #
+      #   <html>
+      #   <head><title><%= @greeting %></title></head>
+      #   <body>
+      #   <b><%= @greeting %></b>
+      #   </body></html>
+      #
       def capture(*args, &block)
         # execute the block
         begin
-          buffer = eval("_erbout", block.binding)
+          buffer = eval(ActionView::Base.erb_variable, block.binding)
         rescue
           buffer = nil
         end
         
         if buffer.nil?
-          capture_block(*args, &block)
+          capture_block(*args, &block).to_s
         else
-          capture_erb_with_buffer(buffer, *args, &block)
+          capture_erb_with_buffer(buffer, *args, &block).to_s
         end
       end
       
-      # Calling content_for stores the block of markup for later use.
-      # Subsequently, you can make calls to it by name with <tt>yield</tt>
-      # in another template or in the layout. 
+      # Calling content_for stores a block of markup in an identifier for later use.
+      # You can make subsequent calls to the stored content in other templates or the layout
+      # by passing the identifier as an argument to <tt>yield</tt>.
       # 
-      # Example:
+      # ==== Examples
       # 
-      #   <% content_for("header") do %>
-      #     alert('hello world')
+      #   <% content_for :not_authorized do %>
+      #     alert('You are not authorized to do that!')
       #   <% end %>
       #
-      # You can use yield :header anywhere in your templates.
+      # You can then use <tt>yield :not_authorized</tt> anywhere in your templates.
+      #
+      #   <%= yield :not_authorized if current_user.nil? %>
+      #
+      # You can also use this syntax alongside an existing call to <tt>yield</tt> in a layout.  For example:
+      #
+      #   <%# This is the layout %>
+      #   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+      #   <head>
+      #	    <title>My Website</title>
+      #	    <%= yield :script %>
+      #   </head>
+      #   <body>
+      #     <%= yield %>
+      #   </body>
+      #   </html>
+      #
+      # And now, we'll create a view that has a content_for call that
+      # creates the <tt>script</tt> identifier.
+      #
+      #   <%# This is our view %>
+      #   Please login!
+      #
+      #   <% content_for :script do %>
+      #     <script type="text/javascript">alert('You are not authorized to view this page!')</script>
+      #   <% end %>
+      #
+      # Then, in another view, you could to do something like this:
+      #
+      #   <%= link_to_remote 'Logout', :action => 'logout' %>
+      #
+      #   <% content_for :script do %>
+      #     <%= javascript_include_tag :defaults %>
+      #   <% end %>
+      #
+      # That will place <script> tags for Prototype, Scriptaculous, and application.js (if it exists)
+      # on the page; this technique is useful if you'll only be using these scripts in a few views.
+      #
+      # Note that content_for concatenates the blocks it is given for a particular
+      # identifier in order. For example:
+      #
+      #   <% content_for :navigation do %>
+      #     <li><%= link_to 'Home', :action => 'index' %></li>
+      #   <% end %>
+      #
+      #   <%#  Add some other content, or use a different template: %>
+      # 
+      #   <% content_for :navigation do %>
+      #     <li><%= link_to 'Login', :action => 'login' %></li>
+      #   <% end %>
+      #
+      # Then, in another template or layout, this code would render both links in order:
+      #
+      #   <ul><%= yield :navigation %></ul>
+      #
+      # Lastly, simple content can be passed as a parameter:
       #
-      #   <%= yield :header %>
+      #   <% content_for :script, javascript_include_tag(:defaults) %>
       #
-      # NOTE: Beware that content_for is ignored in caches. So you shouldn't use it
-      # for elements that are going to be fragment cached.
+      # WARNING: content_for is ignored in caches. So you shouldn't use it
+      # for elements that will be fragment cached.
       #
-      # The deprecated way of accessing a content_for block was to use a instance variable
-      # named @@content_for_#{name_of_the_content_block}@. So <tt><%= content_for('footer') %></tt>
-      # would be avaiable as <tt><%= @content_for_footer %></tt>. The preferred notation now is
+      # The deprecated way of accessing a content_for block is to use an instance variable
+      # named <tt>@content_for_#{name_of_the_content_block}</tt>. So <tt><%= content_for :footer %></tt>
+      # would be available as <tt><%= @content_for_footer %></tt>. The preferred usage is now
       # <tt><%= yield :footer %></tt>.
       def content_for(name, content = nil, &block)
-        eval "@content_for_#{name} = (@content_for_#{name} || '') + capture(&block)"
+        existing_content_for = instance_variable_get("@content_for_#{name}").to_s
+        new_content_for      = existing_content_for + (block_given? ? capture(&block) : content)
+        instance_variable_set("@content_for_#{name}", new_content_for)
       end
 
       private
@@ -99,7 +133,7 @@ module ActionView
         end
       
         def capture_erb(*args, &block)
-          buffer = eval("_erbout", block.binding)
+          buffer = eval(ActionView::Base.erb_variable, block.binding)
           capture_erb_with_buffer(buffer, *args, &block)
         end
       

data/lib/action_view/helpers/date_helper.rb

@@ -25,9 +25,9 @@ module ActionView
       # 23 hrs, 59 mins, 29 secs <-> 47 hrs, 59 mins, 29 secs                     # => 1 day
       # 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 31 secs                  # => [2..12] months
-      # 1 yr minus 30 secs <-> 2 yrs minus 31 secs                                # => about 1 year
-      # 2 yrs minus 30 secs <-> max time or date                                  # => over [2..X] years
+      # 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
       #
       # With include_seconds = true and the difference < 1 minute 29 seconds
       # 0-4   secs      # => less than 5 seconds
@@ -37,14 +37,25 @@ module ActionView
       # 40-59 secs      # => less than a minute
       # 60-89 secs      # => 1 minute
       #
-      # Examples:
-      #
+      # ==== Examples
       #   from_time = Time.now
-      #   distance_of_time_in_words(from_time, from_time + 50.minutes) # => 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, from_time + 50.minutes)        # => about 1 hour
+      #   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, 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 + 15.days + 30.minutes + 5.seconds) # => over 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(Time.now, Time.now)           # => less than a minute
       #
-      # Note: Rails calculates one year as 365.25 days.
       def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)
         from_time = from_time.to_time if from_time.respond_to?(:to_time)
         to_time = to_time.to_time if to_time.respond_to?(:to_time)
@@ -69,13 +80,20 @@ module ActionView
           when 1440..2879      then '1 day'
           when 2880..43199     then "#{(distance_in_minutes / 1440).round} days"
           when 43200..86399    then 'about 1 month'
-          when 86400..525959   then "#{(distance_in_minutes / 43200).round} months"
-          when 525960..1051919 then 'about 1 year'
-          else                      "over #{(distance_in_minutes / 525960).round} years"
+          when 86400..525599   then "#{(distance_in_minutes / 43200).round} months"
+          when 525600..1051199 then 'about 1 year'
+          else                      "over #{(distance_in_minutes / 525600).round} years"
         end
       end
 
       # Like distance_of_time_in_words, but where <tt>to_time</tt> is fixed to <tt>Time.now</tt>.
+      #
+      # ==== Examples
+      #   time_ago_in_words(3.minutes.from_now)       # => 3 minutes
+      #   time_ago_in_words(Time.now - 15.hours)      # => 15 hours
+      #   time_ago_in_words(Time.now)                 # => less than a minute
+      #
+      #   from_time = Time.now - 3.days - 14.minutes - 25.seconds     # => 3 days
       def time_ago_in_words(from_time, include_seconds = false)
         distance_of_time_in_words(from_time, Time.now, include_seconds)
       end
@@ -90,20 +108,46 @@ module ActionView
       # set the order of the tags using the <tt>:order</tt> option with an array of symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in
       # the desired order. Symbols may be omitted and the respective select is not included.
       #
+      # Pass the <tt>:default</tt> option to set the default date. Use a Time object or a Hash of :year, :month, :day, :hour, :minute, and :second.
+      #
       # Passing :disabled => true as part of the +options+ will make elements inaccessible for change.
       #
       # NOTE: Discarded selects will default to 1. So if no month select is available, January will be assumed.
       #
-      # Examples:
-      #
+      # ==== Examples
+      #   # Generates a date select that when POSTed is stored in the post variable, in the written_on attribute
       #   date_select("post", "written_on")
+      #
+      #   # Generates a date select that when POSTed is stored in the post variable, in the written_on attribute,
+      #   # with the year in the year drop down box starting at 1995.
       #   date_select("post", "written_on", :start_year => 1995)
+      #
+      #   # Generates a date select that when POSTed is stored in the post variable, in the written_on attribute,
+      #   # with the year in the year drop down box starting at 1995, numbers used for months instead of words,
+      #   # and without a day select box. 
       #   date_select("post", "written_on", :start_year => 1995, :use_month_numbers => true,
       #                                     :discard_day => true, :include_blank => true)
+      #
+      #   # Generates a date select that when POSTed is stored in the post variable, in the written_on attribute
+      #   # with the fields ordered as day, month, year rather than month, day, year.
       #   date_select("post", "written_on", :order => [:day, :month, :year])
-      #   date_select("user", "birthday",   :order => [:month, :day])
+      #
+      #   # Generates a date select that when POSTed is stored in the user variable, in the birthday attribute
+      #   # lacking a year field.
+      #   date_select("user", "birthday", :order => [:month, :day])
+      #
+      #   # Generates a date select that when POSTed is stored in the user variable, in the birthday attribute
+      #   # which is initially set to the date 3 days from the current date
+      #   date_select("post", "written_on", :default => 3.days.from_now)
+      #
+      #   # Generates a date select that when POSTed is stored in the credit_card variable, in the bill_due attribute
+      #   # that will have a default day of 20.
+      #   date_select("credit_card", "bill_due", :default => { :day => 20 })
       #
       # 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 all month
+      # choices are valid.
       def date_select(object_name, method, options = {})
         InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_date_select_tag(options)
       end
@@ -111,12 +155,32 @@ module ActionView
       # Returns a set of select tags (one for hour, minute and optionally second) pre-selected for accessing a specified
       # time-based attribute (identified by +method+) on an object assigned to the template (identified by +object+).
       # You can include the seconds with <tt>:include_seconds</tt>.
-      # Examples:
-      #
+      # 
+      # ==== Examples
+      #   # Creates a time select tag that, when POSTed, will be stored in the post variable in the sunrise attribute
       #   time_select("post", "sunrise")
+      #
+      #   # Creates a time select tag that, when POSTed, will be stored in the order variable in the submitted attribute
+      #   time_select("order", "submitted")
+      #
+      #   # Creates a time select tag that, when POSTed, will be stored in the mail variable in the sent_at attribute
+      #   time_select("mail", "sent_at")
+      #
+      #   # Creates a time select tag with a seconds field that, when POSTed, will be stored in the post variables in 
+      #   # the sunrise attribute. 
       #   time_select("post", "start_time", :include_seconds => true)
       #
+      #   # Creates a time select tag with a seconds field that, when POSTed, will be stored in the entry variables in 
+      #   # the submission_time attribute. 
+      #   time_select("entry", "submission_time", :include_seconds => true)
+      #
+      #   # 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}
+      #
       # 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 all month
+      # choices are valid.
       def time_select(object_name, method, options = {})
         InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_time_select_tag(options)
       end
@@ -124,9 +188,22 @@ module ActionView
       # Returns a set of select tags (one for year, month, day, hour, and minute) pre-selected for accessing a specified datetime-based
       # attribute (identified by +method+) on an object assigned to the template (identified by +object+). Examples:
       #
+      # ==== Examples
+      #   # Generates a datetime select that, when POSTed, will be stored in the post variable in the written_on attribute
       #   datetime_select("post", "written_on")
+      #
+      #   # Generates a datetime select with a year select that starts at 1995 that, when POSTed, will be stored in the 
+      #   # post variable in the written_on attribute.
       #   datetime_select("post", "written_on", :start_year => 1995)
       #
+      #   # Generates a datetime select with a default value of 3 days from the current time that, when POSTed, will be stored in the 
+      #   # trip variable in the departing attribute.
+      #   datetime_select("trip", "departing", :default => 3.days.from_now)
+      #
+      #   # Generates a datetime select that discards the type that, when POSTed, will be stored in the post variable as the written_on
+      #   # attribute.
+      #   datetime_select("post", "written_on", :discard_type => true)
+      #
       # The selects are prepared for multi-parameter assignment to an Active Record object.
       def datetime_select(object_name, method, options = {})
         InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_datetime_select_tag(options)
@@ -135,9 +212,35 @@ module ActionView
       # Returns a set of html select-tags (one for year, month, day, hour, and minute) pre-selected with the +datetime+.
       # It's also possible to explicitly set the order of the tags using the <tt>:order</tt> option with an array of
       # symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in the desired order. If you do not supply a Symbol, it
-      # will be appened onto the <tt>:order</tt> passed in. You can also add <tt>:date_separator</tt> and <tt>:time_separator</tt>
+      # will be appended onto the <tt>:order</tt> passed in. You can also add <tt>:date_separator</tt> and <tt>:time_separator</tt>
       # keys to the +options+ to control visual display of the elements.
-       def select_datetime(datetime = Time.now, options = {})
+      #
+      # ==== Examples
+      #   my_date_time = Time.now + 4.days
+      #
+      #   # Generates a datetime select that defaults to the datetime in my_date_time (four days after today)
+      #   select_datetime(my_date_time)
+      #
+      #   # Generates a datetime select that defaults to today (no specified datetime)
+      #   select_datetime()
+      #
+      #   # Generates a datetime select that defaults to the datetime in my_date_time (four days after today)
+      #   # with the fields ordered year, month, day rather than month, day, year.
+      #   select_datetime(my_date_time, :order => [:year, :month, :day])
+      #
+      #   # Generates a datetime select that defaults to the datetime in my_date_time (four days after today)
+      #   # with a '/' between each date field.
+      #   select_datetime(my_date_time, :date_separator => '/')
+      #
+      #   # Generates a datetime select that discards the type of the field and defaults to the datetime in 
+      #   # my_date_time (four days after today)
+      #   select_datetime(my_date_time, :discard_type => true)
+      #
+      #   # Generates a datetime select that defaults to the datetime in my_date_time (four days after today)
+      #   # prefixed with 'payday' rather than 'date'
+      #   select_datetime(my_date_time, :prefix => 'payday')
+      #
+      def select_datetime(datetime = Time.now, options = {})
         separator = options[:datetime_separator] || ''
         select_date(datetime, options) + separator + select_time(datetime, options)
        end
@@ -145,7 +248,29 @@ module ActionView
       # Returns a set of html select-tags (one for year, month, and day) pre-selected with the +date+.
       # It's possible to explicitly set the order of the tags using the <tt>:order</tt> option with an array of
       # symbols <tt>:year</tt>, <tt>:month</tt> and <tt>:day</tt> in the desired order. If you do not supply a Symbol, it
-      # will be appened onto the <tt>:order</tt> passed in.
+      # will be appended onto the <tt>:order</tt> passed in.
+      #
+      # ==== Examples
+      #   my_date = Time.today + 6.days
+      #
+      #   # Generates a date select that defaults to the date in my_date (six days after today)
+      #   select_date(my_date)
+      #
+      #   # Generates a date select that defaults to today (no specified date)
+      #   select_date()
+      #
+      #   # Generates a date select that defaults to the date in my_date (six days after today)
+      #   # with the fields ordered year, month, day rather than month, day, year.
+      #   select_date(my_date, :order => [:year, :month, :day])
+      #
+      #   # Generates a date select that discards the type of the field and defaults to the date in 
+      #   # my_date (six days after today)
+      #   select_datetime(my_date_time, :discard_type => true)
+      #
+      #   # Generates a date select that defaults to the datetime in my_date (six days after today)
+      #   # prefixed with 'payday' rather than 'date'
+      #   select_datetime(my_date_time, :prefix => 'payday')
+      #
       def select_date(date = Date.today, options = {})
         options[:order] ||= []
         [:year, :month, :day].each { |o| options[:order].push(o) unless options[:order].include?(o) }
@@ -158,7 +283,30 @@ module ActionView
       end
 
       # Returns a set of html select-tags (one for hour and minute)
-      # You can set <tt>:add_separator</tt> key to format the output.
+      # You can set <tt>:time_separator</tt> key to format the output, and 
+      # the <tt>:include_seconds</tt> option to include an input for seconds.
+      #
+      # ==== Examples
+      #   my_time = Time.now + 5.days + 7.hours + 3.minutes + 14.seconds
+      #
+      #   # Generates a time select that defaults to the time in my_time
+      #   select_time(my_time)
+      #
+      #   # Generates a time select that defaults to the current time (no specified time)
+      #   select_time()
+      #
+      #   # Generates a time select that defaults to the time in my_time,
+      #   # which has fields separated by ':' 
+      #   select_time(my_time, :time_separator => ':')
+      #
+      #   # Generates a time select that defaults to the time in my_time,
+      #   # that also includes an input for seconds
+      #   select_time(my_time, :include_seconds => true)
+      #
+      #   # Generates a time select that defaults to the time in my_time, that has fields
+      #   # separated by ':' and includes an input for seconds
+      #   select_time(my_time, :time_separator => ':', :include_seconds => true)
+      #
       def select_time(datetime = Time.now, options = {})
         separator = options[:time_separator] || ''
         select_hour(datetime, options) + separator + select_minute(datetime, options) + (options[:include_seconds] ? separator + select_second(datetime, options) : '')
@@ -167,6 +315,20 @@ module ActionView
       # Returns a select tag with options for each of the seconds 0 through 59 with the current second selected.
       # The <tt>second</tt> can also be substituted for a second number.
       # Override the field name using the <tt>:field_name</tt> option, 'second' by default.
+      #
+      # ==== Examples
+      #   my_time = Time.now + 16.minutes
+      #
+      #   # Generates a select field for seconds that defaults to the seconds for the time in my_time
+      #   select_second(my_time)
+      #
+      #   # Generates a select field for seconds that defaults to the number given
+      #   select_second(33)
+      # 
+      #   # Generates a select field for seconds that defaults to the seconds for the time in my_time
+      #   # that is named 'interval' rather than 'second'
+      #   select_second(my_time, :field_name => 'interval')
+      #
       def select_second(datetime, options = {})
         val = datetime ? (datetime.kind_of?(Fixnum) ? datetime : datetime.sec) : ''
         if options[:use_hidden]
@@ -187,6 +349,20 @@ module ActionView
       # Also can return a select tag with options by <tt>minute_step</tt> from 0 through 59 with the 00 minute selected
       # The <tt>minute</tt> can also be substituted for a minute number.
       # Override the field name using the <tt>:field_name</tt> option, 'minute' by default.
+      #
+      # ==== Examples
+      #   my_time = Time.now + 6.hours
+      #
+      #   # Generates a select field for minutes that defaults to the minutes for the time in my_time
+      #   select_minute(my_time)
+      #
+      #   # Generates a select field for minutes that defaults to the number given
+      #   select_minute(14)
+      # 
+      #   # Generates a select field for minutes that defaults to the minutes for the time in my_time
+      #   # that is named 'stride' rather than 'second'
+      #   select_minute(my_time, :field_name => 'stride')
+      #
       def select_minute(datetime, options = {})
         val = datetime ? (datetime.kind_of?(Fixnum) ? datetime : datetime.min) : ''
         if options[:use_hidden]
@@ -206,6 +382,20 @@ module ActionView
       # Returns a select tag with options for each of the hours 0 through 23 with the current hour selected.
       # The <tt>hour</tt> can also be substituted for a hour number.
       # Override the field name using the <tt>:field_name</tt> option, 'hour' by default.
+      #
+      # ==== Examples
+      #   my_time = Time.now + 6.hours
+      #
+      #   # Generates a select field for minutes that defaults to the minutes for the time in my_time
+      #   select_minute(my_time)
+      #
+      #   # Generates a select field for minutes that defaults to the number given
+      #   select_minute(14)
+      # 
+      #   # Generates a select field for minutes that defaults to the minutes for the time in my_time
+      #   # that is named 'stride' rather than 'second'
+      #   select_minute(my_time, :field_name => 'stride')
+      #
       def select_hour(datetime, options = {})
         val = datetime ? (datetime.kind_of?(Fixnum) ? datetime : datetime.hour) : ''
         if options[:use_hidden]
@@ -225,6 +415,20 @@ module ActionView
       # Returns a select tag with options for each of the days 1 through 31 with the current day selected.
       # The <tt>date</tt> can also be substituted for a hour number.
       # Override the field name using the <tt>:field_name</tt> option, 'day' by default.
+      #
+      # ==== Examples
+      #   my_date = Time.today + 2.days
+      #
+      #   # Generates a select field for days that defaults to the day for the date in my_date
+      #   select_day(my_time)
+      #
+      #   # Generates a select field for days that defaults to the number given
+      #   select_day(5)
+      # 
+      #   # Generates a select field for days that defaults to the day for the date in my_date
+      #   # that is named 'due' rather than 'day'
+      #   select_day(my_time, :field_name => 'due')
+      #
       def select_day(date, options = {})
         val = date ? (date.kind_of?(Fixnum) ? date : date.day) : ''
         if options[:use_hidden]
@@ -247,17 +451,34 @@ module ActionView
       # set the <tt>:use_month_numbers</tt> key in +options+ to true for this to happen. If you want both numbers and names,
       # set the <tt>:add_month_numbers</tt> key in +options+ to true. If you would prefer to show month names as abbreviations,
       # set the <tt>:use_short_month</tt> key in +options+ to true. If you want to use your own month names, set the
-      # <tt>:use_month_names</tt> key in +options+ to an array of 12 month names.
+      # <tt>:use_month_names</tt> key in +options+ to an array of 12 month names. Override the field name using the 
+      # <tt>:field_name</tt> option, 'month' by default.
+      #
+      # ==== Examples
+      #   # Generates a select field for months that defaults to the current month that
+      #   # will use keys like "January", "March".
+      #   select_month(Date.today)
+      #
+      #   # Generates a select field for months that defaults to the current month that
+      #   # is named "start" rather than "month"
+      #   select_month(Date.today, :field_name => 'start')
       #
-      # Examples:
+      #   # Generates a select field for months that defaults to the current month that
+      #   # will use keys like "1", "3".       
+      #   select_month(Date.today, :use_month_numbers => true)
       #
-      #   select_month(Date.today)                             # Will use keys like "January", "March"
-      #   select_month(Date.today, :use_month_numbers => true) # Will use keys like "1", "3"
-      #   select_month(Date.today, :add_month_numbers => true) # Will use keys like "1 - January", "3 - March"
-      #   select_month(Date.today, :use_short_month => true)   # Will use keys like "Jan", "Mar"
-      #   select_month(Date.today, :use_month_names => %w(Januar Februar Marts ...))   # Will use keys like "Januar", "Marts"
+      #   # Generates a select field for months that defaults to the current month that
+      #   # will use keys like "1 - January", "3 - March".
+      #   select_month(Date.today, :add_month_numbers => true)
+      #
+      #   # Generates a select field for months that defaults to the current month that
+      #   # will use keys like "Jan", "Mar".
+      #   select_month(Date.today, :use_short_month => true)
+      #
+      #   # Generates a select field for months that defaults to the current month that
+      #   # will use keys like "Januar", "Marts."
+      #   select_month(Date.today, :use_month_names => %w(Januar Februar Marts ...))
       #
-      # Override the field name using the <tt>:field_name</tt> option, 'month' by default.
       def select_month(date, options = {})
         val = date ? (date.kind_of?(Fixnum) ? date : date.month) : ''
         if options[:use_hidden]
@@ -287,13 +508,25 @@ module ActionView
       # Returns a select tag with options for each of the five years on each side of the current, which is selected. The five year radius
       # can be changed using the <tt>:start_year</tt> and <tt>:end_year</tt> keys in the +options+. Both ascending and descending year
       # lists are supported by making <tt>:start_year</tt> less than or greater than <tt>:end_year</tt>. The <tt>date</tt> can also be
-      # substituted for a year given as a number. Example:
+      # substituted for a year given as a number.  Override the field name using the <tt>:field_name</tt> option, 'year' by default.
+      #
+      # ==== Examples
+      #   # Generates a select field for years that defaults to the current year that
+      #   # has ascending year values
+      #   select_year(Date.today, :start_year => 1992, :end_year => 2007)
+      #
+      #   # Generates a select field for years that defaults to the current year that
+      #   # is named 'birth' rather than 'year'
+      #   select_year(Date.today, :field_name => 'birth')
+      #
+      #   # Generates a select field for years that defaults to the current year that
+      #   # has descending year values
+      #   select_year(Date.today, :start_year => 2005, :end_year => 1900)
       #
-      #   select_year(Date.today, :start_year => 1992, :end_year => 2007)  # ascending year values
-      #   select_year(Date.today, :start_year => 2005, :end_year => 1900)  # descending year values
+      #   # Generates a select field for years that defaults to the year 2006 that
+      #   # has ascending year values
       #   select_year(2006, :start_year => 2000, :end_year => 2010)
       #
-      # Override the field name using the <tt>:field_name</tt> option, 'year' by default.
       def select_year(date, options = {})
         val = date ? (date.kind_of?(Fixnum) ? date : date.year) : ''
         if options[:use_hidden]
@@ -345,7 +578,7 @@ module ActionView
       include DateHelper
 
       def to_date_select_tag(options = {})
-        date_or_time_select options.merge(:discard_hour => true)
+        date_or_time_select(options.merge(:discard_hour => true))
       end
 
       def to_time_select_tag(options = {})
@@ -361,7 +594,7 @@ module ActionView
           defaults = { :discard_type => true }
           options  = defaults.merge(options)
           datetime = value(object)
-          datetime ||= Time.now unless options[:include_blank]
+          datetime ||= default_time_from_options(options[:default]) unless options[:include_blank]
 
           position = { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
 
@@ -376,8 +609,15 @@ module ActionView
           discard[:minute] = true if options[:discard_minute] or discard[:hour]
           discard[:second] = true unless options[:include_seconds] && !discard[:minute]
 
+          # If the day is hidden and the month is visible, the day should be set to the 1st so all month choices are valid
+          # (otherwise it could be 31 and february wouldn't be a valid date)
+          if datetime && discard[:day] && !discard[:month]
+            datetime = datetime.change(:day => 1)
+          end
+
           # Maintain valid dates by including hidden fields for discarded elements
           [:day, :month, :year].each { |o| order.unshift(o) unless order.include?(o) }
+
           # Ensure proper ordering of :hour, :minute and :second
           [:hour, :minute, :second].each { |o| order.delete(o); order.push(o) }
 
@@ -410,6 +650,26 @@ module ActionView
           end
           options.merge(:prefix => "#{prefix}[#{@method_name}(#{position}i)]")
         end
+
+        def default_time_from_options(default)
+          case default
+            when nil
+              Time.now
+            when Date, Time
+              default
+            else
+              # Rename :minute and :second to :min and :sec
+              default[:min] ||= default[:minute]
+              default[:sec] ||= default[:second]
+
+              [:year, :month, :day, :hour, :min, :sec].each do |key|
+                default[key] ||= Time.now.send(key)
+              end
+
+              Time.mktime(default[:year], default[:month], default[:day],
+                          default[:hour], default[:min],   default[:sec])
+            end
+        end
     end
 
     class FormBuilder