actionpack 1.5.0 → 1.5.1

data/CHANGELOG

@@ -1,3 +1,38 @@
+*1.5.1* (7th March, 2005)
+
+* Fixed that the routes.rb file wouldn't be found on symlinked setups due to File.expand_path #793 [piotr@t-p-l.com]
+
+* Changed ActiveRecordStore to use Marshal instead of YAML as the latter proved troublesome in persisting circular dependencies. Updating existing applications MUST clear their existing session table from data to start using this updated store #739 [Jamis Buck]
+
+* Added shortcut :id assignment to render_component and friends (before you had to go through :params) #784 [Lucas Carlson]
+
+* Fixed that map.connect should convert arguments to strings #780 [Nicholas Seckar]
+
+* Added UrlHelper#link_to_if/link_to_unless to enable other conditions that just link_to_unless_current #757 [mindel]
+
+* Fixed that single quote was not escaped in a UrlHelper#link_to javascript confirm #549 [Scott Barron]
+
+* 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 broken pipe errors (clients disconnecting in mid-request) could bring down a fcgi process
+
+* Added the original exception message to session recall errors (so you can see which class wasnt required)
+
+* Fixed that RAILS_ROOT might not be defined when AP was loaded, so do a late initialization of the ROUTE_FILE #761 [Scott Barron]
+
+* Fix request.path_info and clear up LoadingModule behavior #754 [Nicholas Seckar]
+
+* Fixed caching to be aware of extensions (so you can cache files like api.wsdl or logo.png) #734 [Nicholas Seckar]
+
+* Fixed that Routes would raise NameErrors if a controller component contains characters that are not valid constant names #733 [Nicholas Seckar]
+
+* Added PATH_INFO access from the request that allows urls like the following to be interpreted by rails: http://www.example.com/dispatcher.cgi/controller/action -- that makes it possible to use rails as a CGI under lighttpd and would also allow (for example) Rublog to be ported to rails without breaking existing links to Rublog-powered blogs. #728 [Jamis Buck]
+
+* Fixed that caching the root would result in .html not index.html #731, #734 [alisdair/Nicholas Seckar]
+
+
 *1.5.0* (24th February, 2005)
 
 * Added Routing as a replacement for mod_rewrite pretty urls [Nicholas Seckar]. Read more in ActionController::Base.url_for and on http://manuals.rubyonrails.com/read/book/9

data/lib/action_controller.rb

@@ -22,16 +22,13 @@
 #++
 
 $:.unshift(File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
 
 begin
-  require 'active_support'
+  require 'active_support'  
 rescue LoadError
-  begin
-    require File.dirname(__FILE__) + '/../../activesupport/lib/active_support'
-  rescue LoadError
-    require 'rubygems'
-    require_gem 'activesupport'
-  end
+  require 'rubygems'
+  require_gem 'activesupport'
 end
 
 require 'action_controller/base'

data/lib/action_controller/base.rb

@@ -2,9 +2,6 @@ require 'action_controller/request'
 require 'action_controller/response'
 require 'action_controller/routing'
 require 'action_controller/url_rewriter'
-require 'active_support/class_attribute_accessors'
-require 'active_support/class_inheritable_attributes'
-require 'active_support/inflector'
 require 'drb'
 
 module ActionController #:nodoc:

data/lib/action_controller/caching.rb

@@ -90,7 +90,9 @@ module ActionController #:nodoc:
         
         private
           def page_cache_file(path)
-            (path.empty? ? "/index" : path) + ".html"
+            name = ((path.empty? || path == "/") ? "/index" : path)
+            name << '.html' unless (name.split('/').last || name).include? '.'
+            return name
           end
         
           def page_cache_path(path)

data/lib/action_controller/cgi_process.rb

@@ -86,7 +86,7 @@ module ActionController #:nodoc:
           ActionController::SessionRestoreError, 
           "Session contained objects where the class definition wasn't available. " +
           "Remember to require classes for all objects kept in the session. " +
-          "The session has been deleted."
+          "The session has been deleted. (Original exception: #{e.message} [#{e.class}])"
         )
       end
     end
@@ -120,14 +120,19 @@ module ActionController #:nodoc:
       convert_content_type!(@headers)
       $stdout.binmode if $stdout.respond_to?(:binmode)
       $stdout.sync = false
-      print @cgi.header(@headers)
+      
+      begin
+        print @cgi.header(@headers)
 
-      if @cgi.send(:env_table)['REQUEST_METHOD'] == 'HEAD'
-        return
-      elsif @body.respond_to?(:call)
-        @body.call(self)
-      else
-        print @body
+        if @cgi.send(:env_table)['REQUEST_METHOD'] == 'HEAD'
+          return
+        elsif @body.respond_to?(:call)
+          @body.call(self)
+        else
+          print @body
+        end
+      rescue Errno::EPIPE => e
+        # lost connection to the FCGI process -- ignore the output, then
       end
     end
 

data/lib/action_controller/components.rb

@@ -6,13 +6,13 @@ module ActionController #:nodoc:
   #     # Performs a method and then lets hello_world output its render
   #     def delegate_action
   #       do_other_stuff_before_hello_world
-  #       render_component :controller => "greeter",  :action => "hello_world"
+  #       render_component :controller => "greeter",  :action => "hello_world", :params => { "person" => "david" }
   #     end
   #   end
   #
   #   class GreeterController < ActionController::Base
   #     def hello_world
-  #       render_text "Hello World!"
+  #       render_text "#{@params['person']} says, Hello World!"
   #     end
   #   end
   #
@@ -54,7 +54,7 @@ module ActionController #:nodoc:
         request_for_component = @request.dup
         request_for_component.send(
           :instance_variable_set, :@parameters, 
-          (options[:params] || {}).merge({ "controller" => options[:controller], "action" => options[:action] })
+          (options[:params] || {}).merge({ "controller" => options[:controller], "action" => options[:action], "id" => options[:id] })
         )
         return request_for_component
       end

data/lib/action_controller/request.rb

@@ -77,6 +77,10 @@ module ActionController
       (%r{^\w+\://[^/]+(/.*|$)$} =~ env['REQUEST_URI']) ? $1 : env['REQUEST_URI'] # Remove domain, which webrick puts into the request_uri.
     end
 
+    def path_info
+      (/^(.*)\.html$/ =~ env['PATH_INFO']) ? $1 : env['PATH_INFO']
+    end
+
     def protocol
       env["HTTPS"] == "on" ? 'https://' : 'http://'
     end
@@ -86,7 +90,7 @@ module ActionController
     end
 
     def path
-      path = request_uri ? request_uri.split('?').first : ''
+      (path_info && !path_info.empty?) ? path_info : (request_uri ? request_uri.split('?').first : '')
     end
 
     def port

data/lib/action_controller/routing.rb

@@ -1,8 +1,6 @@
 module ActionController
   # See http://manuals.rubyonrails.com/read/chapter/65
   module Routing
-    ROUTE_FILE = defined?(RAILS_ROOT) ? File.expand_path(File.join(RAILS_ROOT, 'config', 'routes')) : nil
-  
     class Route #:nodoc:
       attr_reader :defaults # The defaults hash
       
@@ -17,7 +15,7 @@ module ActionController
             raise ArgumentError, "Regexp requirement on #{k}, but #{k} is not in this route's path!" unless @items.include? k
             @requirements[k] = v
           else
-            (@items.include?(k) ? @defaults : @requirements)[k] = v
+            (@items.include?(k) ? @defaults : @requirements)[k] = (v.nil? ? nil : v.to_s)
           end
         end
         
@@ -134,6 +132,7 @@ module ActionController
         def eat_path_to_controller(path)
           path.inject([Controllers, 1]) do |(mod, length), name|
             name = name.camelize
+            return nil, nil unless /^[A-Z][_a-zA-Z\d]*$/ =~ name
             controller_name = name + "Controller"
             return mod.const_get(controller_name), path[length..-1] if mod.const_available? controller_name
             return nil, nil unless mod.const_available? name
@@ -281,7 +280,8 @@ module ActionController
       
       def reload
         begin
-          require_dependency(ROUTE_FILE) if ROUTE_FILE
+          route_file = defined?(RAILS_ROOT) ? File.join(RAILS_ROOT, 'config', 'routes') : nil
+          require_dependency(route_file) if route_file
         rescue LoadError, ScriptError => e
           raise RoutingError, "Cannot load config/routes.rb:\n    #{e.message}"
         ensure # Ensure that there is at least one route:

data/lib/action_controller/session/active_record_store.rb

@@ -3,21 +3,25 @@ begin
 require 'active_record'
 require 'cgi'
 require 'cgi/session'
+require 'base64'
 
 # Contributed by Tim Bates
 class CGI
   class Session
-    # ActiveRecord database based session storage class.
+    # Active Record database-based session storage class.
     #
     # Implements session storage in a database using the ActiveRecord ORM library. Assumes that the database
     # has a table called +sessions+ with columns +id+ (numeric, primary key), +sessid+ and +data+ (text).
-    # The session data is stored in the +data+ column in YAML format; the user is responsible for ensuring that
-    # only data that can be YAMLized is stored in the session.
+    # The session data is stored in the +data+ column in the binary Marshal format; the user is responsible for ensuring that
+    # only data that can be Marshaled is stored in the session.
+    #
+    # Adding +created_at+ or +updated_at+ datetime columns to the sessions table will enable stamping of the data, which can
+    # be used to clear out old sessions.
+    #
+    # It's highly recommended to have an index on the sessid column to improve performance.
     class ActiveRecordStore
       # The ActiveRecord class which corresponds to the database table.
       class Session < ActiveRecord::Base
-        serialize :data
-        # Isn't this class definition beautiful?
       end
 
       # Create a new ActiveRecordStore instance. This constructor is used internally by CGI::Session.
@@ -30,8 +34,8 @@ class CGI
       # This session's ActiveRecord database row will be created if it does not exist, or opened if it does.
       def initialize(session, option=nil)
         ActiveRecord::Base.silence do
-          @session = Session.find_by_sessid(session.session_id) || Session.new("sessid" => session.session_id, "data" => {})
-          @data    = @session.data
+          @session = Session.find_by_sessid(session.session_id) || Session.new("sessid" => session.session_id, "data" => marshalize({}))
+          @data    = unmarshalize(@session.data)
         end
       end
 
@@ -52,18 +56,27 @@ class CGI
       # Restore session state from the session's ActiveRecord object.
       def restore
         return unless @session
-        @data = @session.data
+        @data = unmarshalize(@session.data)
       end
 
       # Save session state in the session's ActiveRecord object.
       def update
         return unless @session
-        ActiveRecord::Base.silence { @session.update_attribute "data", @data }
+        ActiveRecord::Base.silence { @session.update_attribute "data", marshalize(@data) }
       end
+
+      private
+        def unmarshalize(data)
+          Marshal.load(Base64.decode64(data))
+        end
+
+        def marshalize(data)
+          Base64.encode64(Marshal.dump(data))
+        end
     end #ActiveRecordStore
   end #Session
 end #CGI
 
 rescue LoadError
   # Couldn't load Active Record, so don't make this store available
-end
+end

data/lib/action_view/helpers/active_record_helper.rb

@@ -15,7 +15,7 @@ module ActionView
     module ActiveRecordHelper
       # Returns a default input tag for the type of object returned by the method. Example
       # (title is a VARCHAR column and holds "Hello World"):
-      #   input("post", "title") => 
+      #   input("post", "title") =>
       #     <input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />
       def input(record_name, method)
         InstanceTag.new(record_name, method, self).to_tag
@@ -41,7 +41,7 @@ module ActionView
       # It's possible to specialize the form builder by using a different action name and by supplying another
       # block renderer. Example (entry is a new record that has a message attribute using VARCHAR):
       #
-      #   form("entry", :action => "sign", :input_block => 
+      #   form("entry", :action => "sign", :input_block =>
       #        Proc.new { |record, column| "#{column.human_name}: #{input(record, column.name)}<br />" }) =>
       #
       #     <form action='/post/sign' method='post'>
@@ -56,16 +56,17 @@ module ActionView
       #     form << content_tag("b", "Department")
       #     form << collection_select("department", "id", @departments, "id", "name")
       #   end
-      def form(record_name, options = {})
-        record   = instance_eval("@#{record_name}")
+      def form(record_name, options = nil)
+        options = (options || {}).symbolize_keys
+        record = instance_eval("@#{record_name}")
 
         options[:action] ||= record.new_record? ? "create" : "update"
-        action   = url_for(:action => options[:action])
+        action = url_for(:action => options[:action])
 
         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")
-        
+
         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>)
@@ -73,7 +74,7 @@ module ActionView
 
       # Returns a string containing the error message attached to the +method+ on the +object+, if one exists.
       # This error message is wrapped in a DIV tag, which can be specialized to include both a +prepend_text+ and +append_text+
-      # to properly introduce the error and a +css_class+ to style it accordingly. Examples (post has an error message 
+      # to properly introduce the error and a +css_class+ to style it accordingly. Examples (post has an error message
       # "can't be empty" on the title attribute):
       #
       #   <%= error_message_on "post", "title" %> =>
@@ -86,19 +87,20 @@ module ActionView
           "<div class=\"#{css_class}\">#{prepend_text + (errors.is_a?(Array) ? errors.first : errors) + append_text}</div>"
         end
       end
-      
+
       # Returns a string with a div containing all the error messages for the object located as an instance variable by the name
       # of <tt>object_name</tt>. This div can be tailored by the following options:
       #
       # * <tt>header_tag</tt> - Used for the header of the error div (default: h2)
       # * <tt>id</tt> - The id of the error div (default: errorExplanation)
       # * <tt>class</tt> - The class of the error div (default: errorExplanation)
-      def error_messages_for(object_name, options={})
+      def error_messages_for(object_name, options = {})
+        options = options.symbolize_keys
         object = instance_eval "@#{object_name}"
         unless object.errors.empty?
           content_tag("div",
             content_tag(
-              options[:header_tag] || "h2", 
+              options[:header_tag] || "h2",
               "#{pluralize(object.errors.count, "error")} prohibited this #{object_name.gsub("_", " ")} from being saved"
             ) +
             content_tag("p", "There were problems with the following fields:") +
@@ -107,7 +109,7 @@ module ActionView
           )
         end
       end
-      
+
       private
         def all_input_tags(record, record_name, options)
           input_block = options[:input_block] || default_input_block
@@ -116,7 +118,7 @@ module ActionView
 
         def default_input_block
           Proc.new { |record, column| "<p><label for=\"#{record}_#{column.name}\">#{column.human_name}</label><br />#{input(record, column.name)}</p>" }
-        end        
+        end
     end
 
     class InstanceTag #:nodoc:

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -10,15 +10,15 @@ module ActionView
       # either be <tt>:rss</tt> (default) or <tt>:atom</tt> and the +options+ follow the url_for style of declaring a link target.
       #
       # Examples:
-      #   auto_discovery_link_tag # => 
+      #   auto_discovery_link_tag # =>
       #     <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.curenthost.com/controller/action" />
-      #   auto_discovery_link_tag(:atom) # => 
+      #   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") # => 
+      #   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 = {})
         tag(
-          "link", "rel" => "alternate", "type" => "application/#{type}+xml", "title" => type.to_s.upcase, 
+          "link", "rel" => "alternate", "type" => "application/#{type}+xml", "title" => type.to_s.upcase,
           "href" => url_for(options.merge(:only_path => false))
         )
       end
@@ -38,7 +38,7 @@ module ActionView
           content_tag("script", "", "language" => "JavaScript", "type" => "text/javascript", "src" => source)
         }.join("\n")
       end
-    
+
       # Returns a css link tag per source given as argument. Examples:
       #
       #   stylesheet_link_tag "style" # =>
@@ -48,7 +48,7 @@ module ActionView
       #     <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)
-        sources.collect { |source| 
+        sources.collect { |source|
           source = "/stylesheets/#{source}" unless source.include?("/")
           source = "#{source}.css" unless source.include?(".")
           tag("link", "rel" => "Stylesheet", "type" => "text/css", "media" => "screen", "href" => source)

data/lib/action_view/helpers/date_helper.rb

@@ -5,7 +5,7 @@ module ActionView
     # The Date Helper primarily creates select/option tags for different kinds of dates and date elements. All of the select-type methods
     # share a number of common options that are as follows:
     #
-    # * <tt>:prefix</tt> - overwrites the default prefix of "date" used for the select names. So specifying "birthday" would give 
+    # * <tt>:prefix</tt> - overwrites the default prefix of "date" used for the select names. So specifying "birthday" would give
     #   birthday[month] instead of date[month] if passed to the select_month method.
     # * <tt>:include_blank</tt> - set to true if it should be possible to set an empty date.
     # * <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
@@ -13,11 +13,11 @@ module ActionView
     module DateHelper
       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. For example, if the distance is 47 minutes, it'll return
       # "about 1 hour". See the source for the complete wording list.
       def distance_of_time_in_words(from_time, to_time)
         distance_in_minutes = ((to_time - from_time) / 60).round
-        
+
         case distance_in_minutes
           when 0          then "less than a minute"
           when 1          then "1 minute"
@@ -28,7 +28,7 @@ module ActionView
           else                 "#{(distance_in_minutes / 1440).round} days"
         end
       end
-      
+
       # Like distance_of_time_in_words, but where <tt>to_time</tt> is fixed to <tt>Time.now</tt>.
       def distance_of_time_in_words_to_now(from_time)
         distance_of_time_in_words(from_time, Time.now)
@@ -48,7 +48,7 @@ module ActionView
       #
       #   date_select("post", "written_on")
       #   date_select("post", "written_on", :start_year => 1995)
-      #   date_select("post", "written_on", :start_year => 1995, :use_month_numbers => true, 
+      #   date_select("post", "written_on", :start_year => 1995, :use_month_numbers => true,
       #                                     :discard_day => true, :include_blank => true)
       #   date_select("post", "written_on", :order => [:day, :month, :year])
       #   date_select("user", "birthday",   :order => [:month, :day])
@@ -107,7 +107,7 @@ module ActionView
 
         0.upto(59) do |minute|
           minute_options << ((datetime.kind_of?(Fixnum) ? datetime : datetime.min) == minute ?
-            "<option selected=\"selected\">#{leading_zero_on_single_digits(minute)}</option>\n" : 
+            "<option selected=\"selected\">#{leading_zero_on_single_digits(minute)}</option>\n" :
             "<option>#{leading_zero_on_single_digits(minute)}</option>\n"
           )
         end
@@ -122,7 +122,7 @@ module ActionView
 
         0.upto(23) do |hour|
           hour_options << ((datetime.kind_of?(Fixnum) ? datetime : datetime.hour) == hour ?
-            "<option selected=\"selected\">#{leading_zero_on_single_digits(hour)}</option>\n" : 
+            "<option selected=\"selected\">#{leading_zero_on_single_digits(hour)}</option>\n" :
             "<option>#{leading_zero_on_single_digits(hour)}</option>\n"
           )
         end
@@ -137,18 +137,18 @@ module ActionView
 
         1.upto(31) do |day|
           day_options << ((date.kind_of?(Fixnum) ? date : date.day) == day ?
-            "<option selected=\"selected\">#{day}</option>\n" : 
+            "<option selected=\"selected\">#{day}</option>\n" :
             "<option>#{day}</option>\n"
           )
         end
 
         select_html("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.
       # The month names are presented as keys (what's shown to the user) and the month numbers (1-12) are used as values
       # (what's submitted to the server). It's also possible to use month numbers for the presentation instead of names --
-      # 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>: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. Examples:
       #
       #   select_month(Date.today)                             # Will use keys like "January", "March"
@@ -158,7 +158,7 @@ module ActionView
         month_options = []
 
         1.upto(12) do |month_number|
-          month_name = if options[:use_month_numbers] 
+          month_name = if options[:use_month_numbers]
             month_number
           elsif options[:add_month_numbers]
             month_number.to_s + " - " + Date::MONTHNAMES[month_number]
@@ -167,16 +167,16 @@ module ActionView
           end
 
           month_options << ((date.kind_of?(Fixnum) ? date : date.month) == month_number ?
-            %(<option value="#{month_number}" selected="selected">#{month_name}</option>\n) : 
+            %(<option value="#{month_number}" selected="selected">#{month_name}</option>\n) :
             %(<option value="#{month_number}">#{month_name}</option>\n)
           )
         end
 
         select_html("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 
+      # 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:
       #
       #   select_year(Date.today, :start_year => 1992, :end_year => 2007)
@@ -187,14 +187,14 @@ module ActionView
 
         (options[:start_year] || default_start_year).upto(options[:end_year] || default_end_year) do |year|
           year_options << ((date.kind_of?(Fixnum) ? date : date.year) == year ?
-            "<option selected=\"selected\">#{year}</option>\n" : 
+            "<option selected=\"selected\">#{year}</option>\n" :
             "<option>#{year}</option>\n"
           )
         end
 
         select_html("year", year_options, options[:prefix], options[:include_blank], options[:discard_type])
       end
-      
+
       private
         def select_html(type, options, prefix = nil, include_blank = false, discard_type = false)
           select_html  = %(<select name="#{prefix || DEFAULT_PREFIX})
@@ -206,7 +206,7 @@ module ActionView
 
           return select_html
         end
-        
+
         def leading_zero_on_single_digits(number)
           number > 9 ? number : "0#{number}"
         end
@@ -217,36 +217,32 @@ module ActionView
 
       def to_date_select_tag(options = {})
         defaults = { :discard_type => true }
-        options  = defaults.merge(options) 
-        options_with_prefix = Proc.new { |position| options.update({ :prefix => "#{@object_name}[#{@method_name}(#{position}i)]" }) }
+        options  = defaults.merge(options)
+        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 = ""
-        
-        if options[:month_before_year] # For backwards compatibility
-          options[:order] = [:month, :year, :day]
-        end
-
+        options[:order]   = [:month, :year, :day] if options[:month_before_year] # For backwards compatibility
         options[:order] ||= [:year, :month, :day]
 
         position = {:year => 1, :month => 2, :day => 3}
-        
+
         discard = {}
         discard[:year]  = true if options[:discard_year]
         discard[:month] = true if options[:discard_month]
         discard[:day]   = true if options[:discard_day] or options[:discard_month]
-        
+
         options[:order].each do |param|
           date_select << self.send("select_#{param}", date, options_with_prefix.call(position[param])) unless discard[param]
         end
 
         return date_select
       end
-      
+
       def to_datetime_select_tag(options = {})
         defaults = { :discard_type => true }
-        options  = defaults.merge(options) 
-        options_with_prefix = Proc.new { |position| options.update({ :prefix => "#{@object_name}[#{@method_name}(#{position}i)]" }) }
+        options  = defaults.merge(options)
+        options_with_prefix = Proc.new { |position| options.merge(:prefix => "#{@object_name}[#{@method_name}(#{position}i)]") }
         datetime = options[:include_blank] ? (value || 0) : (value || Time.now)
 
         datetime_select  = select_year(datetime, options_with_prefix.call(1))
@@ -254,7 +250,7 @@ module ActionView
         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]
-        
+
         return datetime_select
       end
     end