actionpack 1.8.1 → 1.9.0

data/lib/action_controller/verification.rb

@@ -1,37 +1,36 @@
 module ActionController #:nodoc:
-
-  # This module provides a class-level method for specifying that certain
-  # actions are guarded against being called without certain prerequisites
-  # being met. This is essentially a special kind of before_filter.
-  #
-  # An action may be guarded against being invoked without certain request
-  # parameters being set, or without certain session values existing.
-  #
-  # When a verification is violated, values may be inserted into the flash, and
-  # a specified redirection is triggered.
-  #
-  # Usage:
-  #
-  #   class GlobalController < ActionController::Base
-  #     # prevent the #update_settings action from being invoked unless
-  #     # the 'admin_privileges' request parameter exists.
-  #     verify :params => "admin_privileges", :only => :update_post,
-  #            :redirect_to => { :action => "settings" }
-  #
-  #     # disallow a post from being updated if there was no information
-  #     # submitted with the post, and if there is no active post in the
-  #     # session, and if there is no "note" key in the flash.
-  #     verify :params => "post", :session => "post", "flash" => "note",
-  #            :only => :update_post,
-  #            :add_flash => { "alert" => "Failed to create your message" },
-  #            :redirect_to => :category_url
-  #
-  module Verification
+  module Verification #:nodoc:
     def self.append_features(base) #:nodoc:
       super
       base.extend(ClassMethods)
     end
 
+    # This module provides a class-level method for specifying that certain
+    # actions are guarded against being called without certain prerequisites
+    # being met. This is essentially a special kind of before_filter.
+    #
+    # An action may be guarded against being invoked without certain request
+    # parameters being set, or without certain session values existing.
+    #
+    # When a verification is violated, values may be inserted into the flash, and
+    # a specified redirection is triggered.
+    #
+    # Usage:
+    #
+    #   class GlobalController < ActionController::Base
+    #     # prevent the #update_settings action from being invoked unless
+    #     # the 'admin_privileges' request parameter exists.
+    #     verify :params => "admin_privileges", :only => :update_post,
+    #            :redirect_to => { :action => "settings" }
+    #
+    #     # disallow a post from being updated if there was no information
+    #     # submitted with the post, and if there is no active post in the
+    #     # session, and if there is no "note" key in the flash.
+    #     verify :params => "post", :session => "post", "flash" => "note",
+    #            :only => :update_post,
+    #            :add_flash => { "alert" => "Failed to create your message" },
+    #            :redirect_to => :category_url
+    #
     module ClassMethods
       # Verify the given actions so that if certain prerequisites are not met,
       # the user is redirected to a different action. The +options+ parameter
@@ -52,6 +51,8 @@ module ActionController #:nodoc:
       #   into the session's flash if the prerequisites cannot be satisfied.
       # * <tt>:redirect_to</tt>: the redirection parameters to be used when
       #   redirecting if the prerequisites cannot be satisfied.
+      # * <tt>:render</tt>: the render parameters to be used when
+      #   the prerequisites cannot be satisfied.
       # * <tt>:only</tt>: only apply this verification to the actions specified
       #   in the associated array (may also be a single value).
       # * <tt>:except</tt>: do not apply this verification to the actions
@@ -74,10 +75,15 @@ module ActionController #:nodoc:
         prereqs_invalid ||= 
           [*options[:method]].all? { |v| @request.method != v.to_sym }
       end
-
+      
+      prereqs_invalid ||= (request.xhr? != options[:xhr]) unless options[:xhr].nil?
+      
       if prereqs_invalid
         flash.update(options[:add_flash]) if options[:add_flash]
-        redirect_to(options[:redirect_to])
+        unless performed?
+          render(options[:render]) if options[:render]
+          redirect_to(options[:redirect_to]) if options[:redirect_to]
+        end
         return false
       end
 

data/lib/action_view/base.rb

@@ -122,6 +122,8 @@ module ActionView #:nodoc:
     attr_reader   :first_render
     attr_accessor :base_path, :assigns, :template_extension
     attr_accessor :controller
+    
+    attr_reader :logger, :params, :response, :session, :headers, :flash
 
     # Turn on to cache the reading of templates from the file system. Doing so means that you have to restart the server
     # when changing templates, but that rendering will be faster.
@@ -142,16 +144,6 @@ module ActionView #:nodoc:
       end
     end
 
-    def self.controller_delegate(*methods)#:nodoc:
-      methods.flatten.each do |method|
-        class_eval <<-end_eval
-          def #{method}(*args, &block)
-            controller.send(%(#{method}), *args, &block)
-          end
-        end_eval
-      end
-    end
-
     def self.register_template_handler(extension, klass)
       @@template_handlers[extension] = klass
     end
@@ -191,8 +183,23 @@ module ActionView #:nodoc:
     
     # Renders the template present at <tt>template_path</tt> (relative to the template_root). 
     # The hash in <tt>local_assigns</tt> is made available as local variables.
-    def render(template_path, local_assigns = {})
-      render_file(template_path, true, local_assigns)
+    def render(options = {}, old_local_assigns = {})
+      if options.is_a?(String)
+        render_file(options, true, old_local_assigns)
+      elsif options.is_a?(Hash)
+        options[:locals] ||= {}
+        options[:use_full_path] = options[:use_full_path].nil? ? true : options[:use_full_path]
+        
+        if options[:file]
+          render_file(options[:file], options[:use_full_path], options[:locals])
+        elsif options[:partial] && options[:collection]
+          render_partial_collection(options[:partial], options[:collection], options[:spacer_template], options[:locals])
+        elsif options[:partial]
+          render_partial(options[:partial], options[:object], options[:locals])
+        elsif options[:inline]
+          render_template(options[:type] || :rhtml, options[:inline], options[:locals] || {})
+        end
+      end
     end
     
     # Renders the +template+ which is given as a string as either rhtml or rxml depending on <tt>template_extension</tt>.
@@ -218,7 +225,7 @@ module ActionView #:nodoc:
       if @@template_handlers[template_extension]
         "delegate_render"
       else
-        (template_extension == "rxml" ? "rxml" : "rhtml") + "_render"
+        (template_extension.to_s == "rxml" ? "rxml" : "rhtml") + "_render"
       end
     end
 
@@ -290,4 +297,4 @@ module ActionView #:nodoc:
   end
 end
 
-require 'action_view/template_error'
+require 'action_view/template_error'

data/lib/action_view/helpers/active_record_helper.rb

@@ -31,7 +31,7 @@ module ActionView
       #       </p>
       #       <p>
       #         <label for="post_body">Body</label><br />
-      #         <textarea cols="40" id="post_body" name="post[body]" rows="20" wrap="virtual">
+      #         <textarea cols="40" id="post_body" name="post[body]" rows="20">
       #           Back to the hill and over it again!
       #         </textarea>
       #       </p>
@@ -56,20 +56,22 @@ module ActionView
       #     form << content_tag("b", "Department")
       #     form << collection_select("department", "id", @departments, "id", "name")
       #   end
-      def form(record_name, options = nil)
-        options = (options || {}).symbolize_keys
-        record = instance_eval("@#{record_name}")
+      def form(record_name, options = {})
+        record = instance_variable_get("@#{record_name}")
 
+        options = options.symbolize_keys
         options[:action] ||= record.new_record? ? "create" : "update"
-        action = url_for(:action => options[:action])
+        action = url_for(:action => options[:action], :id => record)
 
         submit_value = options[:submit_value] || options[:action].gsub(/[^\w]/, '').capitalize
 
-        id_field = record.new_record? ? "" : InstanceTag.new(record_name, "id", self).to_input_field_tag("hidden")
+        contents = ''
+        contents << hidden_field(record_name, :id) unless record.new_record?
+        contents << all_input_tags(record, record_name, options)
+        yield contents if block_given?
+        contents << submit_tag(submit_value)
 
-        formtag = %(<form action="#{action}" method="post">#{id_field}) + all_input_tags(record, record_name, options)
-        yield formtag if block_given?
-        formtag +  %(<input type="submit" value="#{submit_value}" /></form>)
+        content_tag('form', contents, :action => action, :method => 'post')
       end
 
       # Returns a string containing the error message attached to the +method+ on the +object+, if one exists.
@@ -83,8 +85,8 @@ module ActionView
       #   <%= error_message_on "post", "title", "Title simply ", " (or it won't work)", "inputError" %> =>
       #     <div class="inputError">Title simply can't be empty (or it won't work)</div>
       def error_message_on(object, method, prepend_text = "", append_text = "", css_class = "formError")
-        if errors = instance_eval("@#{object}").errors.on(method)
-          "<div class=\"#{css_class}\">#{prepend_text + (errors.is_a?(Array) ? errors.first : errors) + append_text}</div>"
+        if errors = instance_variable_get("@#{object}").errors.on(method)
+          content_tag("div", "#{prepend_text}#{errors.is_a?(Array) ? errors.first : errors}#{append_text}", :class => css_class)
         end
       end
 
@@ -96,7 +98,7 @@ module ActionView
       # * <tt>class</tt> - The class of the error div (default: errorExplanation)
       def error_messages_for(object_name, options = {})
         options = options.symbolize_keys
-        object = instance_eval "@#{object_name}"
+        object = instance_variable_get("@#{object_name}")
         unless object.errors.empty?
           content_tag("div",
             content_tag(
@@ -117,7 +119,7 @@ module ActionView
         end
 
         def default_input_block
-          Proc.new { |record, column| "<p><label for=\"#{record}_#{column.name}\">#{column.human_name}</label><br />#{input(record, column.name)}</p>" }
+          Proc.new { |record, column| %(<p><label for="#{record}_#{column.name}">#{column.human_name}</label><br />#{input(record, column.name)}</p>) }
         end
     end
 

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -14,11 +14,16 @@ module ActionView
       #     <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.curenthost.com/controller/action" />
       #   auto_discovery_link_tag(:atom) # =>
       #     <link rel="alternate" type="application/atom+xml" title="ATOM" href="http://www.curenthost.com/controller/action" />
-      #   auto_discovery_link_tag(:rss, :action => "feed") # =>
-      #     <link rel="alternate" type="application/atom+xml" title="ATOM" href="http://www.curenthost.com/controller/feed" />
-      def auto_discovery_link_tag(type = :rss, options = {})
+      #   auto_discovery_link_tag(:rss, {:action => "feed"}) # =>
+      #     <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.curenthost.com/controller/feed" />
+      #   auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "My RSS"}) # =>
+      #     <link rel="alternate" type="application/rss+xml" title="My RSS" href="http://www.curenthost.com/controller/feed" />
+      def auto_discovery_link_tag(type = :rss, options = {}, tag_options = {})
         tag(
-          "link", "rel" => "alternate", "type" => "application/#{type}+xml", "title" => type.to_s.upcase,
+          "link", 
+          "rel" => tag_options[:rel] || "alternate",
+          "type" => tag_options[:type] || "application/#{type}+xml",
+          "title" => tag_options[:title] || type.to_s.upcase,
           "href" => url_for(options.merge(:only_path => false))
         )
       end
@@ -38,10 +43,18 @@ module ActionView
       #   javascript_include_tag "common.javascript", "/elsewhere/cools" # =>
       #     <script type="text/javascript" src="/javascripts/common.javascript"></script>
       #     <script type="text/javascript" src="/elsewhere/cools.js"></script>
+      #
+      #   javascript_include_tag :defaults # =>
+      #     <script type="text/javascript" src="/javascripts/prototype.js"></script>
+      #     <script type="text/javascript" src="/javascripts/effects.js"></script>
+      #     <script type="text/javascript" src="/javascripts/controls.js"></script>
+      #     <script type="text/javascript" src="/javascripts/dragdrop.js"></script>      
       def javascript_include_tag(*sources)
+        options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { }
+        sources = ['prototype', 'effects', 'controls', 'dragdrop'] if sources.first == :defaults
         sources.collect { |source|
           source = javascript_path(source)        
-          content_tag("script", "", "type" => "text/javascript", "src" => source)
+          content_tag("script", "", { "type" => "text/javascript", "src" => source }.merge(options))
         }.join("\n")
       end
 
@@ -57,13 +70,17 @@ module ActionView
       #   stylesheet_link_tag "style" # =>
       #     <link href="/stylesheets/style.css" media="screen" rel="Stylesheet" type="text/css" />
       #
+      #   stylesheet_link_tag "style", :media => "all" # =>
+      #     <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css" />
+      #
       #   stylesheet_link_tag "random.styles", "/css/stylish" # =>
       #     <link href="/stylesheets/random.styles" media="screen" rel="Stylesheet" type="text/css" />
       #     <link href="/css/stylish.css" media="screen" rel="Stylesheet" type="text/css" />
       def stylesheet_link_tag(*sources)
+        options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { }
         sources.collect { |source|
           source = stylesheet_path(source)
-          tag("link", "rel" => "Stylesheet", "type" => "text/css", "media" => "screen", "href" => source)
+          tag("link", { "rel" => "Stylesheet", "type" => "text/css", "media" => "screen", "href" => source }.merge(options))
         }.join("\n")
       end
 
@@ -90,7 +107,7 @@ module ActionView
         options.symbolize_keys
                 
         options[:src] = image_path(source)
-        options[:alt] ||= source.split("/").last.split(".").first.capitalize
+        options[:alt] ||= File.basename(options[:src], '.*').split('.').first.capitalize
         
         if options[:size]
           options[:width], options[:height] = options[:size].split("x")
@@ -104,8 +121,8 @@ module ActionView
         def compute_public_path(source, dir, ext)
           source = "/#{dir}/#{source}" unless source.include?("/")
           source = "#{source}.#{ext}" unless source.include?(".")
-          source = "#{@request.relative_url_root}#{source}" 
-          source
+          source = "#{@request.relative_url_root}#{source}" unless %r{^[-a-z]+://} =~ source
+          ActionController::Base.asset_host + source
         end
     end
   end

data/lib/action_view/helpers/benchmark_helper.rb

@@ -0,0 +1,24 @@
+require 'benchmark'
+
+module ActionView
+  module Helpers
+    module BenchmarkHelper
+      # Measures 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.34523)" to the log.
+      #
+      # You may give an optional logger level as the second argument
+      # (:debug, :info, :warn, :error).  The default is :info.
+      def benchmark(message = "Benchmarking", level = :info)
+        if @logger
+          real = Benchmark.realtime { yield }
+          @logger.send level, "#{message} (#{'%.5f' % real})"
+        end
+      end
+    end
+  end
+end

data/lib/action_view/helpers/capture_helper.rb

@@ -48,11 +48,11 @@ module ActionView
       #   <% @greeting = capture do %>
       #     Welcome To my shiny new web page!
       #   <% end %>      
-      def capture(&block)
+      def capture(*args, &block)
         # execute the block
         buffer = eval("_erbout", block.binding)
         pos = buffer.length
-        block.call
+        block.call(*args)
         
         # extract the block 
         data = buffer[pos..-1]
@@ -77,7 +77,10 @@ module ActionView
       #     alert('hello world')
       #   <% end %>
       #
-      # You can use @content_for_header anywhere in your templates
+      # You can use @content_for_header anywhere in your templates.
+      #
+      # NOTE: Beware that content_for is ignored in caches. So you shouldn't use it
+      # for elements that are going to be fragment cached. 
       def content_for(name, &block)                      
         base = controller.instance_variable_get(instance_var_name(name)) || ""
         data = capture(&block)
@@ -85,8 +88,7 @@ module ActionView
         data
       end
       
-      private
-      
+      private      
         def instance_var_name(name) #:nodoc#
           "@content_for_#{name}"
         end

data/lib/action_view/helpers/date_helper.rb

@@ -11,31 +11,38 @@ module ActionView
     # * <tt>:discard_type</tt> - set to true if you want to discard the type part of the select name. If set to true, the select_month
     #   method would use simply "date" (which can be overwritten using <tt>:prefix</tt>) instead of "date[month]".
     module DateHelper
-      DEFAULT_PREFIX = "date" unless const_defined?("DEFAULT_PREFIX")
+      DEFAULT_PREFIX = 'date' unless const_defined?('DEFAULT_PREFIX')
 
-      # Reports the approximate distance in time between to Time objects. For example, if the distance is 47 minutes, it'll return
+      # Reports the approximate distance in time between to Time objects or integers. 
+      # For example, if the distance is 47 minutes, it'll return
       # "about 1 hour". See the source for the complete wording list.
-      #Set <tt>include_seconds</tt> to true if you want more detailed approximations if distance < 1 minute
-      def distance_of_time_in_words(from_time, to_time, include_seconds = false)
-        distance_in_minutes = ((to_time - from_time) / 60).round.abs
-        distance_in_seconds = ((to_time - from_time)).round.abs
+      #
+      # Integers are interpreted as seconds. So,
+      # <tt>distance_of_time_in_words(50)</tt> returns "less than a minute".
+      #
+      # Set <tt>include_seconds</tt> to true if you want more detailed approximations if distance < 1 minute
+      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)
+        distance_in_minutes = (((to_time - from_time).abs)/60).round
+        distance_in_seconds = ((to_time - from_time).abs).round
 
         case distance_in_minutes
           when 0..1
-            return (distance_in_minutes==0) ? "less than a minute" : "1 minute" unless include_seconds
+            return (distance_in_minutes==0) ? 'less than a minute' : '1 minute' unless include_seconds
             case distance_in_seconds
-              when 0..5   then "less than 5 seconds"
-              when 6..10  then "less than 10 seconds"
-              when 11..20 then "less than 20 seconds"
-              when 21..40 then "half a minute"
-              when 41..59 then "less than a minute"
-              else             "1 minute"
+              when 0..5   then 'less than 5 seconds'
+              when 6..10  then 'less than 10 seconds'
+              when 11..20 then 'less than 20 seconds'
+              when 21..40 then 'half a minute'
+              when 41..59 then 'less than a minute'
+              else             '1 minute'
             end
                                 
           when 2..45      then "#{distance_in_minutes} minutes"
-          when 46..90     then "about 1 hour"
+          when 46..90     then 'about 1 hour'
           when 90..1440   then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
-          when 1441..2880 then "1 day"
+          when 1441..2880 then '1 day'
           else                 "#{(distance_in_minutes / 1440).round} days"
         end
       end
@@ -100,63 +107,67 @@ 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.
       def select_second(datetime, options = {})
         second_options = []
 
         0.upto(59) do |second|
           second_options << ((datetime && (datetime.kind_of?(Fixnum) ? datetime : datetime.sec) == second) ?
-            "<option value=\"#{leading_zero_on_single_digits(second)}\" selected=\"selected\">#{leading_zero_on_single_digits(second)}</option>\n" :
-            "<option value=\"#{leading_zero_on_single_digits(second)}\">#{leading_zero_on_single_digits(second)}</option>\n"
+            %(<option value="#{leading_zero_on_single_digits(second)}" selected="selected">#{leading_zero_on_single_digits(second)}</option>\n) :
+            %(<option value="#{leading_zero_on_single_digits(second)}">#{leading_zero_on_single_digits(second)}</option>\n)
           )
         end
 
-        select_html("second", second_options, options[:prefix], options[:include_blank], options[:discard_type])
+        select_html(options[:field_name] || 'second', second_options, options[:prefix], options[:include_blank], options[:discard_type])
       end
 
       # Returns a select tag with options for each of the minutes 0 through 59 with the current minute selected.
       # 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.
       def select_minute(datetime, options = {})
         minute_options = []
 
         0.step(59, options[:minute_step] || 1) do |minute|
           minute_options << ((datetime && (datetime.kind_of?(Fixnum) ? datetime : datetime.min) == minute) ?
-            "<option value=\"#{leading_zero_on_single_digits(minute)}\" selected=\"selected\">#{leading_zero_on_single_digits(minute)}</option>\n" :
-            "<option value=\"#{leading_zero_on_single_digits(minute)}\">#{leading_zero_on_single_digits(minute)}</option>\n"
+            %(<option value="#{leading_zero_on_single_digits(minute)}" selected="selected">#{leading_zero_on_single_digits(minute)}</option>\n) :
+            %(<option value="#{leading_zero_on_single_digits(minute)}">#{leading_zero_on_single_digits(minute)}</option>\n)
           )
         end
 
-        select_html("minute", minute_options, options[:prefix], options[:include_blank], options[:discard_type])
+        select_html(options[:field_name] || 'minute', minute_options, options[:prefix], options[:include_blank], options[:discard_type])
       end
 
       # 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.
       def select_hour(datetime, options = {})
         hour_options = []
 
         0.upto(23) do |hour|
           hour_options << ((datetime && (datetime.kind_of?(Fixnum) ? datetime : datetime.hour) == hour) ?
-            "<option value=\"#{leading_zero_on_single_digits(hour)}\" selected=\"selected\">#{leading_zero_on_single_digits(hour)}</option>\n" :
-            "<option value=\"#{leading_zero_on_single_digits(hour)}\">#{leading_zero_on_single_digits(hour)}</option>\n"
+            %(<option value="#{leading_zero_on_single_digits(hour)}" selected="selected">#{leading_zero_on_single_digits(hour)}</option>\n) :
+            %(<option value="#{leading_zero_on_single_digits(hour)}">#{leading_zero_on_single_digits(hour)}</option>\n)
           )
         end
 
-        select_html("hour", hour_options, options[:prefix], options[:include_blank], options[:discard_type])
+        select_html(options[:field_name] || 'hour', hour_options, options[:prefix], options[:include_blank], options[:discard_type])
       end
 
       # 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.
       def select_day(date, options = {})
         day_options = []
 
         1.upto(31) do |day|
           day_options << ((date && (date.kind_of?(Fixnum) ? date : date.day) == day) ?
-            "<option value=\"#{day}\" selected=\"selected\">#{day}</option>\n" :
-            "<option value=\"#{day}\">#{day}</option>\n"
+            %(<option value="#{day}" selected="selected">#{day}</option>\n) :
+            %(<option value="#{day}">#{day}</option>\n)
           )
         end
 
-        select_html("day", day_options, options[:prefix], options[:include_blank], options[:discard_type])
+        select_html(options[:field_name] || 'day', day_options, options[:prefix], options[:include_blank], options[:discard_type])
       end
 
       # Returns a select tag with options for each of the months January through December with the current month selected.
@@ -168,6 +179,8 @@ module ActionView
       #   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"
+      #
+      # Override the field name using the <tt>:field_name</tt> option, 'month' by default.
       def select_month(date, options = {})
         month_options = []
 
@@ -175,7 +188,7 @@ module ActionView
           month_name = if options[:use_month_numbers]
             month_number
           elsif options[:add_month_numbers]
-            month_number.to_s + " - " + Date::MONTHNAMES[month_number]
+            month_number.to_s + ' - ' + Date::MONTHNAMES[month_number]
           else
             Date::MONTHNAMES[month_number]
           end
@@ -186,27 +199,33 @@ module ActionView
           )
         end
 
-        select_html("month", month_options, options[:prefix], options[:include_blank], options[:discard_type])
+        select_html(options[:field_name] || 'month', month_options, options[:prefix], options[:include_blank], options[:discard_type])
       end
 
       # 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+. The <tt>date</tt> can also be substituted
-      # for a year given as a number. Example:
+      # 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:
       #
-      #   select_year(Date.today, :start_year => 1992, :end_year => 2007)
+      #   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
+      #
+      # Override the field name using the <tt>:field_name</tt> option, 'year' by default.
       def select_year(date, options = {})
         year_options = []
         y = date ? (date.kind_of?(Fixnum) ? (y = (date == 0) ? Date.today.year : date) : date.year) : Date.today.year
-        default_start_year, default_end_year = y-5, y+5
 
-        (options[:start_year] || default_start_year).upto(options[:end_year] || default_end_year) do |year|
+        start_year, end_year = (options[:start_year] || y-5), (options[:end_year] || y+5)
+        step_val = start_year < end_year ? 1 : -1
+
+        start_year.step(end_year, step_val) do |year|
           year_options << ((date && (date.kind_of?(Fixnum) ? date : date.year) == year) ?
-            "<option value=\"#{year}\" selected=\"selected\">#{year}</option>\n" :
-            "<option value=\"#{year}\">#{year}</option>\n"
+            %(<option value="#{year}" selected="selected">#{year}</option>\n) :
+            %(<option value="#{year}">#{year}</option>\n)
           )
         end
 
-        select_html("year", year_options, options[:prefix], options[:include_blank], options[:discard_type])
+        select_html(options[:field_name] || 'year', year_options, options[:prefix], options[:include_blank], options[:discard_type])
       end
 
       private
@@ -214,11 +233,9 @@ module ActionView
           select_html  = %(<select name="#{prefix || DEFAULT_PREFIX})
           select_html << "[#{type}]" unless discard_type
           select_html << %(">\n)
-          select_html << "<option value=\"\"></option>\n" if include_blank
+          select_html << %(<option value=""></option>\n) if include_blank
           select_html << options.to_s
           select_html << "</select>\n"
-
-          return select_html
         end
 
         def leading_zero_on_single_digits(number)
@@ -235,7 +252,7 @@ module ActionView
         options_with_prefix = Proc.new { |position| options.merge(:prefix => "#{@object_name}[#{@method_name}(#{position}i)]") }
         date     = options[:include_blank] ? (value || 0) : (value || Date.today)
 
-        date_select = ""
+        date_select = ''
         options[:order]   = [:month, :year, :day] if options[:month_before_year] # For backwards compatibility
         options[:order] ||= [:year, :month, :day]
 
@@ -250,7 +267,7 @@ module ActionView
           date_select << self.send("select_#{param}", date, options_with_prefix.call(position[param])) unless discard[param]
         end
 
-        return date_select
+        date_select
       end
 
       def to_datetime_select_tag(options = {})
@@ -262,11 +279,11 @@ module ActionView
         datetime_select  = select_year(datetime, options_with_prefix.call(1))
         datetime_select << select_month(datetime, options_with_prefix.call(2)) unless options[:discard_month]
         datetime_select << select_day(datetime, options_with_prefix.call(3)) unless options[:discard_day] || options[:discard_month]
-        datetime_select << " &mdash; " + select_hour(datetime, options_with_prefix.call(4)) unless options[:discard_hour]
-        datetime_select << " : " + select_minute(datetime, options_with_prefix.call(5)) unless options[:discard_minute] || options[:discard_hour]
+        datetime_select << ' &mdash; ' + select_hour(datetime, options_with_prefix.call(4)) unless options[:discard_hour]
+        datetime_select << ' : ' + select_minute(datetime, options_with_prefix.call(5)) unless options[:discard_minute] || options[:discard_hour]
 
-        return datetime_select
+        datetime_select
       end
     end
   end
-end
+end