radiant 0.7.2 → 0.8.0

data/vendor/rails/actionpack/lib/action_view/helpers/atom_feed_helper.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 # 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
@@ -17,7 +19,7 @@ module ActionView
       #       # GET /posts.atom
       #       def index
       #         @posts = Post.find(:all)
-      #         
+      #
       #         respond_to do |format|
       #           format.html
       #           format.atom
@@ -28,13 +30,13 @@ module ActionView
       #   app/views/posts/index.atom.builder:
       #     atom_feed do |feed|
       #       feed.title("My great blog!")
-      #       feed.updated((@posts.first.created_at))
-      #     
+      #       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
@@ -47,9 +49,11 @@ module ActionView
       # * <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.
-      # * <tt>:schema_date</tt>: The date at which the tag scheme for the feed was first used. A good default is the year you 
-      #   created the feed. See http://feedvalidator.org/docs/error/InvalidTAG.html for more information. If not specified, 
+      # * <tt>:id</tt>: The id for this feed. Defaults to "tag:#{request.host},#{options[:schema_date]}:#{request.request_uri.split(".")[0]}"
+      # * <tt>:schema_date</tt>: The date at which the tag scheme for the feed was first used. A good default is the year you
+      #   created the feed. See http://feedvalidator.org/docs/error/InvalidTAG.html for more information. If not specified,
       #   2005 is used (as an "I don't care" value).
+      # * <tt>:instruct</tt>: Hash of XML processing instructions in the form {target => {attribute => value, }} or {target => [{attribute => value, }, ]}
       #
       # Other namespaces can be added to the root element:
       #
@@ -73,36 +77,90 @@ module ActionView
       #       end
       #     end
       #
+      # The Atom spec defines five elements (content rights title subtitle
+      # summary) which may directly contain xhtml content if :type => 'xhtml'
+      # is specified as an attribute.  If so, this helper will take care of
+      # the enclosing div and xhtml namespace declaration.  Example usage:
+      #
+      #    entry.summary :type => 'xhtml' do |xhtml|
+      #      xhtml.p pluralize(order.line_items.count, "line item")
+      #      xhtml.p "Shipped to #{order.address}"
+      #      xhtml.p "Paid by #{order.pay_type}"
+      #    end
       #
-      # atom_feed yields an AtomFeedBuilder instance.
+      #
+      # atom_feed yields an AtomFeedBuilder instance.  Nested elements yield
+      # an AtomBuilder instance.
       def atom_feed(options = {}, &block)
         if options[:schema_date]
           options[:schema_date] = options[:schema_date].strftime("%Y-%m-%d") if options[:schema_date].respond_to?(:strftime)
         else
           options[:schema_date] = "2005" # The Atom spec copyright date
         end
-        
+
         xml = options[:xml] || eval("xml", block.binding)
         xml.instruct!
+        if options[:instruct]
+          options[:instruct].each do |target,attrs|
+            if attrs.respond_to?(:keys)
+              xml.instruct!(target, attrs)
+            elsif attrs.respond_to?(:each)
+              attrs.each { |attr_group| xml.instruct!(target, attr_group) }
+            end
+          end
+        end
 
         feed_opts = {"xml:lang" => options[:language] || "en-US", "xmlns" => 'http://www.w3.org/2005/Atom'}
         feed_opts.merge!(options).reject!{|k,v| !k.to_s.match(/^xml/)}
 
         xml.feed(feed_opts) do
-          xml.id("tag:#{request.host},#{options[:schema_date]}:#{request.request_uri.split(".")[0]}")      
+          xml.id(options[:id] || "tag:#{request.host},#{options[:schema_date]}:#{request.request_uri.split(".")[0]}")
           xml.link(:rel => 'alternate', :type => 'text/html', :href => options[:root_url] || (request.protocol + request.host_with_port))
           xml.link(:rel => 'self', :type => 'application/atom+xml', :href => options[:url] || request.url)
-          
+
           yield AtomFeedBuilder.new(xml, self, options)
         end
       end
 
+      class AtomBuilder
+        XHTML_TAG_NAMES = %w(content rights title subtitle summary).to_set
 
-      class AtomFeedBuilder
+        def initialize(xml)
+          @xml = xml
+        end
+
+        private
+          # Delegate to xml builder, first wrapping the element in a xhtml
+          # namespaced div element if the method and arguments indicate
+          # that an xhtml_block? is desired.
+          def method_missing(method, *arguments, &block)
+            if xhtml_block?(method, arguments)
+              @xml.__send__(method, *arguments) do
+                @xml.div(:xmlns => 'http://www.w3.org/1999/xhtml') do |xhtml|
+                  block.call(xhtml)
+                end
+              end
+            else
+              @xml.__send__(method, *arguments, &block)
+            end
+          end
+
+          # True if the method name matches one of the five elements defined
+          # in the Atom spec as potentially containing XHTML content and
+          # if :type => 'xhtml' is, in fact, specified.
+          def xhtml_block?(method, arguments)
+            if XHTML_TAG_NAMES.include?(method.to_s)
+              last = arguments.last
+              last.is_a?(Hash) && last[:type].to_s == 'xhtml'
+            end
+          end
+      end
+
+      class AtomFeedBuilder < AtomBuilder
         def initialize(xml, view, feed_options = {})
           @xml, @view, @feed_options = xml, view, feed_options
         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)
@@ -115,9 +173,10 @@ module ActionView
         # * <tt>:published</tt>: Time first published. Defaults to the created_at attribute on the record if one such exists.
         # * <tt>:updated</tt>: Time of update. 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.
+        # * <tt>:id</tt>: The ID for this entry. Defaults to "tag:#{@view.request.host},#{@feed_options[:schema_date]}:#{record.class}/#{record.id}"
         def entry(record, options = {})
-          @xml.entry do 
-            @xml.id("tag:#{@view.request.host},#{@feed_options[:schema_date]}:#{record.class}/#{record.id}")
+          @xml.entry do
+            @xml.id(options[:id] || "tag:#{@view.request.host},#{@feed_options[:schema_date]}:#{record.class}/#{record.id}")
 
             if options[:published] || (record.respond_to?(:created_at) && record.created_at)
               @xml.published((options[:published] || record.created_at).xmlschema)
@@ -129,15 +188,11 @@ module ActionView
 
             @xml.link(:rel => 'alternate', :type => 'text/html', :href => options[:url] || @view.polymorphic_url(record))
 
-            yield @xml
+            yield AtomBuilder.new(@xml)
           end
         end
-
-        private
-          def method_missing(method, *arguments, &block)
-            @xml.__send__(method, *arguments, &block)
-          end
       end
+
     end
   end
 end

data/vendor/rails/actionpack/lib/action_view/helpers/benchmark_helper.rb

@@ -15,19 +15,40 @@ module ActionView
       #    <%= expensive_files_operation %>
       #  <% end %>
       #
-      # That would add something like "Process data files (0.34523)" to the log,
+      # That would add something like "Process data files (345.2ms)" 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
+      # You may give an optional logger level as the :level option.
       # (:debug, :info, :warn, :error); the default value is :info.
-      def benchmark(message = "Benchmarking", level = :info)
+      #
+      #  <% benchmark "Low-level files", :level => :debug do %>
+      #    <%= lowlevel_files_operation %>
+      #  <% end %>
+      #
+      # Finally, you can pass true as the third argument to silence all log activity 
+      # inside the block. This is great for boiling down a noisy block to just a single statement:
+      #
+      #  <% benchmark "Process data files", :level => :info, :silence => true do %>
+      #    <%= expensive_and_chatty_files_operation %>
+      #  <% end %>
+      def benchmark(message = "Benchmarking", options = {})
         if controller.logger
-          real = Benchmark.realtime { yield }
-          controller.logger.send(level, "#{message} (#{'%.5f' % real})")
+          if options.is_a?(Symbol)
+            ActiveSupport::Deprecation.warn("use benchmark('#{message}', :level => :#{options}) instead", caller)
+            options = { :level => options, :silence => false }
+          else
+            options.assert_valid_keys(:level, :silence)
+            options[:level] ||= :info
+          end
+          
+          result = nil
+          ms = Benchmark.ms { result = options[:silence] ? controller.logger.silence { yield } : yield }
+          controller.logger.send(options[:level], '%s (%.1fms)' % [ message, ms ])
+          result
         else
           yield
         end
       end
     end
   end
-end
+end

data/vendor/rails/actionpack/lib/action_view/helpers/cache_helper.rb

@@ -32,8 +32,7 @@ module ActionView
       #      <i>Topics listed alphabetically</i>
       #    <% end %>
       def cache(name = {}, options = nil, &block)
-        handler = Template.handler_class_for_extension(current_render_extension.to_sym)
-        handler.new(@controller).cache_fragment(block, name, options)
+        @controller.fragment_for(output_buffer, name, options, &block)
       end
     end
   end

data/vendor/rails/actionpack/lib/action_view/helpers/capture_helper.rb

@@ -31,20 +31,15 @@ module ActionView
       #   </body></html>
       #
       def capture(*args, &block)
-        # execute the block
-        begin
-          buffer = eval(ActionView::Base.erb_variable, block.binding)
-        rescue
-          buffer = nil
-        end
-        
-        if buffer.nil?
-          capture_block(*args, &block).to_s
+        # Return captured buffer in erb.
+        if block_called_from_erb?(block)
+          with_output_buffer { block.call(*args) }
         else
-          capture_erb_with_buffer(buffer, *args, &block).to_s
+          # Return block result otherwise, but protect buffer also.
+          with_output_buffer { return block.call(*args) }
         end
       end
-      
+
       # 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>.
@@ -121,41 +116,21 @@ module ActionView
       # named <tt>@content_for_#{name_of_the_content_block}</tt>. The preferred usage is now
       # <tt><%= yield :footer %></tt>.
       def content_for(name, content = nil, &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)
+        ivar = "@content_for_#{name}"
+        content = capture(&block) if block_given?
+        instance_variable_set(ivar, "#{instance_variable_get(ivar)}#{content}")
+        nil
       end
 
-      private
-        def capture_block(*args, &block)
-          block.call(*args)
-        end
-      
-        def capture_erb(*args, &block)
-          buffer = eval(ActionView::Base.erb_variable, block.binding)
-          capture_erb_with_buffer(buffer, *args, &block)
-        end
-      
-        def capture_erb_with_buffer(buffer, *args, &block)
-          pos = buffer.length
-          block.call(*args)
-        
-          # extract the block 
-          data = buffer[pos..-1]
-        
-          # replace it in the original with empty string
-          buffer[pos..-1] = ''
-        
-          data
-        end
-      
-        def erb_content_for(name, &block)
-          eval "@content_for_#{name} = (@content_for_#{name} || '') + capture_erb(&block)"
-        end
-      
-        def block_content_for(name, &block)
-          eval "@content_for_#{name} = (@content_for_#{name} || '') + capture_block(&block)"
-        end
+      # Use an alternate output buffer for the duration of the block.
+      # Defaults to a new empty string.
+      def with_output_buffer(buf = '') #:nodoc:
+        self.output_buffer, old_buffer = buf, output_buffer
+        yield
+        output_buffer
+      ensure
+        self.output_buffer = old_buffer
+      end
     end
   end
 end

data/vendor/rails/actionpack/lib/action_view/helpers/date_helper.rb

@@ -3,18 +3,16 @@ require 'action_view/helpers/tag_helper'
 
 module ActionView
   module Helpers
-    # 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:
+    # 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
-    #   birthday[month] instead of date[month] if passed to the select_month method.
+    # * <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
-    #   method would use simply "date" (which can be overwritten using <tt>:prefix</tt>) instead of "date[month]".
+    # * <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
-      include ActionView::Helpers::TagHelper
-      DEFAULT_PREFIX = 'date' unless const_defined?('DEFAULT_PREFIX')
-
       # Reports the approximate distance in time between two Time or Date objects or integers as seconds.
       # Set <tt>include_seconds</tt> to true if you want more detailed approximations when distance < 1 min, 29 secs
       # Distances are reported based on the following table:
@@ -51,40 +49,45 @@ module ActionView
       #   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
+      #   distance_of_time_in_words(from_time, from_time + 4.years + 9.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
       #
-      def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)
+      def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false, options = {})
         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
-            case distance_in_seconds
-              when 0..4   then 'less than 5 seconds'
-              when 5..9   then 'less than 10 seconds'
-              when 10..19 then 'less than 20 seconds'
-              when 20..39 then 'half a minute'
-              when 40..59 then 'less than a minute'
-              else             '1 minute'
-            end
-
-          when 2..44           then "#{distance_in_minutes} minutes"
-          when 45..89          then 'about 1 hour'
-          when 90..1439        then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
-          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..525599   then "#{(distance_in_minutes / 43200).round} months"
-          when 525600..1051199 then 'about 1 year'
-          else                      "over #{(distance_in_minutes / 525600).round} years"
+        I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
+          case distance_in_minutes
+            when 0..1
+              return distance_in_minutes == 0 ?
+                     locale.t(:less_than_x_minutes, :count => 1) :
+                     locale.t(:x_minutes, :count => distance_in_minutes) unless include_seconds
+
+              case distance_in_seconds
+                when 0..4   then locale.t :less_than_x_seconds, :count => 5
+                when 5..9   then locale.t :less_than_x_seconds, :count => 10
+                when 10..19 then locale.t :less_than_x_seconds, :count => 20
+                when 20..39 then locale.t :half_a_minute
+                when 40..59 then locale.t :less_than_x_minutes, :count => 1
+                else             locale.t :x_minutes,           :count => 1
+              end
+
+            when 2..44           then locale.t :x_minutes,      :count => distance_in_minutes
+            when 45..89          then locale.t :about_x_hours,  :count => 1
+            when 90..1439        then locale.t :about_x_hours,  :count => (distance_in_minutes.to_f / 60.0).round
+            when 1440..2879      then locale.t :x_days,         :count => 1
+            when 2880..43199     then locale.t :x_days,         :count => (distance_in_minutes / 1440).round
+            when 43200..86399    then locale.t :about_x_months, :count => 1
+            when 86400..525599   then locale.t :x_months,       :count => (distance_in_minutes / 43200).round
+            when 525600..1051199 then locale.t :about_x_years,  :count => 1
+            else                      locale.t :over_x_years,   :count => (distance_in_minutes / 525600).round
+          end
         end
       end
 
@@ -102,17 +105,41 @@ module ActionView
 
       alias_method :distance_of_time_in_words_to_now, :time_ago_in_words
 
-      # Returns a set of select tags (one for year, month, and day) pre-selected for accessing a specified date-based attribute (identified by
-      # +method+) on an object assigned to the template (identified by +object+). It's possible to tailor the selects through the +options+ hash,
-      # which accepts all the keys that each of the individual select builders do (like <tt>:use_month_numbers</tt> for select_month) as well as a range of
-      # discard options. The discard options are <tt>:discard_year</tt>, <tt>:discard_month</tt> and <tt>:discard_day</tt>. Set to true, they'll
-      # drop the respective select. Discarding the month select will also automatically discard the day select. 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. 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 <tt>:year</tt>, <tt>:month</tt>, <tt>:day</tt>, <tt>:hour</tt>, <tt>:minute</tt>, and <tt>:second</tt>.
-      #
-      # Passing <tt>:disabled => true</tt> as part of the +options+ will make elements inaccessible for change.
+      # Returns a set of select tags (one for year, month, and day) pre-selected for accessing a specified date-based
+      # attribute (identified by +method+) on an object assigned to the template (identified by +object+). You can
+      # the output in the +options+ hash.
+      #
+      # ==== Options
+      # * <tt>:use_month_numbers</tt> - Set to true if you want to use month numbers rather than month names (e.g.
+      #   "2" instead of "February").
+      # * <tt>:use_short_month</tt>   - Set to true if you want to use the abbreviated month name instead of the full
+      #   name (e.g. "Feb" instead of "February").
+      # * <tt>:add_month_number</tt>  - Set to true if you want to show both, the month's number and name (e.g.
+      #   "2 - February" instead of "February").
+      # * <tt>:use_month_names</tt>   - Set to an array with 12 month names if you want to customize month names.
+      #   Note: You can also use Rails' new i18n functionality for this.
+      # * <tt>:date_separator</tt>    - Specifies a string to separate the date fields. Default is "" (i.e. nothing).
+      # * <tt>:start_year</tt>        - Set the start year for the year select. Default is <tt>Time.now.year - 5</tt>.
+      # * <tt>:end_year</tt>          - Set the end year for the year select. Default is <tt>Time.now.year + 5</tt>.
+      # * <tt>:discard_day</tt>       - Set to true if you don't want to show a day select. This includes the day
+      #   as a hidden field instead of showing a select field. Also note that this implicitly sets the day to be the
+      #   first of the given month in order to not create invalid dates like 31 February.
+      # * <tt>:discard_month</tt>     - Set to true if you don't want to show a month select. This includes the month
+      #   as a hidden field instead of showing a select field. Also note that this implicitly sets :discard_day to true.
+      # * <tt>:discard_year</tt>      - Set to true if you don't want to show a year select. This includes the year
+      #   as a hidden field instead of showing a select field.
+      # * <tt>:order</tt>             - Set to an array containing <tt>:day</tt>, <tt>:month</tt> and <tt>:year</tt> do
+      #   customize the order in which the select fields are shown. If you leave out any of the symbols, the respective
+      #   select will not be shown (like when you set <tt>:discard_xxx => true</tt>. Defaults to the order defined in
+      #   the respective locale (e.g. [:year, :month, :day] in the en locale that ships with Rails).
+      # * <tt>:include_blank</tt>     - Include a blank option in every select field so it's possible to set empty
+      #   dates.
+      # * <tt>:default</tt>           - Set a default date if the affected date isn't set or is nil.
+      # * <tt>:disabled</tt>          - Set to true if you want show the select fields as disabled.
+      # * <tt>:prompt</tt>            - Set to true (for a generic prompt), a prompt string or a hash of prompt strings
+      #   for <tt>:year</tt>, <tt>:month</tt>, <tt>:day</tt>, <tt>:hour</tt>, <tt>:minute</tt> and <tt>:second</tt>.
+      #   Setting this option prepends a select option with a generic prompt  (Day, Month, Year, Hour, Minute, Seconds)
+      #   or the given prompt string.
       #
       # If anything is passed in the +html_options+ hash it will be applied to every select tag in the set.
       #
@@ -128,7 +155,7 @@ module ActionView
       #
       #   # 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. 
+      #   # and without a day select box.
       #   date_select("post", "written_on", :start_year => 1995, :use_month_numbers => true,
       #                                     :discard_day => true, :include_blank => true)
       #
@@ -148,80 +175,100 @@ module ActionView
       #   # that will have a default day of 20.
       #   date_select("credit_card", "bill_due", :default => { :day => 20 })
       #
+      #   # Generates a date select with custom prompts
+      #   date_select("post", "written_on", :prompt => { :day => 'Select day', :month => 'Select month', :year => 'Select year' })
+      #
       # 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.
+      # 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 = {}, html_options = {})
-        InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_date_select_tag(options, html_options)
+        InstanceTag.new(object_name, method, self, options.delete(:object)).to_date_select_tag(options, html_options)
       end
 
-      # 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>.
-      # 
+      # 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>.
+      #
+      # This method will also generate 3 input hidden tags, for the actual year, month and day unless the option
+      # <tt>:ignore_date</tt> is set to +true+.
+      #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
       # ==== 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
+      #   # 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. 
+      #   # 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. 
+      #   # 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}
       #
+      #   # Creates a time select tag with a custom prompt. Use :prompt => true for generic prompts.
+      #   time_select("post", "written_on", :prompt => {:hour => 'Choose hour', :minute => 'Choose minute', :second => 'Choose seconds'})
+      #   time_select("post", "written_on", :prompt => {:hour => true}) # generic prompt for hours
+      #   time_select("post", "written_on", :prompt => true) # generic prompts for all
+      #
       # 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.
+      # 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 = {}, html_options = {})
-        InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_time_select_tag(options, html_options)
+        InstanceTag.new(object_name, method, self, options.delete(:object)).to_time_select_tag(options, html_options)
       end
 
-      # 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:
+      # 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:
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
       # ==== Examples
-      #   # Generates a datetime select that, when POSTed, will be stored in the post variable in the written_on attribute
+      #   # 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 
+      #   # 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.
+      #   # 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.
+      #   # 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)
       #
+      #   # Generates a datetime select with a custom prompt. Use :prompt=>true for generic prompts.
+      #   datetime_select("post", "written_on", :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
+      #   datetime_select("post", "written_on", :prompt => {:hour => true}) # generic prompt for hours
+      #   datetime_select("post", "written_on", :prompt => true) # generic prompts for all
+      #
       # The selects are prepared for multi-parameter assignment to an Active Record object.
       def datetime_select(object_name, method, options = {}, html_options = {})
-        InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_datetime_select_tag(options, html_options)
+        InstanceTag.new(object_name, method, self, options.delete(:object)).to_datetime_select_tag(options, html_options)
       end
 
-      # 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 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.
+      # 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 appended onto the <tt>:order</tt> passed in. You can also add
+      # <tt>:date_separator</tt>, <tt>:datetime_separator</tt> and <tt>:time_separator</tt> keys to the +options+ to
+      # control visual display of the elements.
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
@@ -242,7 +289,12 @@ module ActionView
       #   # 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 
+      #   # Generates a datetime select that defaults to the datetime in my_date_time (four days after today)
+      #   # with a date fields separated by '/', time fields separated by '' and the date and time fields
+      #   # separated by a comma (',').
+      #   select_datetime(my_date_time, :date_separator => '/', :time_separator => '', :datetime_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)
       #
@@ -250,15 +302,19 @@ module ActionView
       #   # prefixed with 'payday' rather than 'date'
       #   select_datetime(my_date_time, :prefix => 'payday')
       #
+      #   # Generates a datetime select with a custom prompt. Use :prompt=>true for generic prompts.
+      #   select_datetime(my_date_time, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
+      #   select_datetime(my_date_time, :prompt => {:hour => true}) # generic prompt for hours
+      #   select_datetime(my_date_time, :prompt => true) # generic prompts for all
+      #
       def select_datetime(datetime = Time.current, options = {}, html_options = {})
-        separator = options[:datetime_separator] || ''
-        select_date(datetime, options, html_options) + separator + select_time(datetime, options, html_options)
-       end
+        DateTimeSelector.new(datetime, options, html_options).select_datetime
+      end
 
       # 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 appended onto the <tt>:order</tt> passed in.
+      # 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 appended onto the <tt>:order</tt> passed in.
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
       #
@@ -275,27 +331,29 @@ module ActionView
       #   # 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 
+      #   # 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)
+      #   select_date(my_date, :discard_type => true)
+      #
+      #   # Generates a date select that defaults to the date in my_date,
+      #   # which has fields separated by '/'
+      #   select_date(my_date, :date_separator => '/')
       #
       #   # 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')
+      #   select_date(my_date, :prefix => 'payday')
+      #
+      #   # Generates a date select with a custom prompt. Use :prompt=>true for generic prompts.
+      #   select_date(my_date, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
+      #   select_date(my_date, :prompt => {:hour => true}) # generic prompt for hours
+      #   select_date(my_date, :prompt => true) # generic prompts for all
       #
       def select_date(date = Date.current, options = {}, html_options = {})
-        options[:order] ||= []
-        [:year, :month, :day].each { |o| options[:order].push(o) unless options[:order].include?(o) }
-
-        select_date = ''
-        options[:order].each do |o|
-          select_date << self.send("select_#{o}", date, options, html_options)
-        end
-        select_date
+        DateTimeSelector.new(date, options, html_options).select_date
       end
 
       # Returns a set of html select-tags (one for hour and minute)
-      # You can set <tt>:time_separator</tt> key to format the output, and 
+      # 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.
       #
       # If anything is passed in the html_options hash it will be applied to every select tag in the set.
@@ -310,7 +368,7 @@ module ActionView
       #   select_time()
       #
       #   # Generates a time select that defaults to the time in my_time,
-      #   # which has fields separated by ':' 
+      #   # which has fields separated by ':'
       #   select_time(my_time, :time_separator => ':')
       #
       #   # Generates a time select that defaults to the time in my_time,
@@ -321,9 +379,13 @@ module ActionView
       #   # separated by ':' and includes an input for seconds
       #   select_time(my_time, :time_separator => ':', :include_seconds => true)
       #
+      #   # Generates a time select with a custom prompt. Use :prompt=>true for generic prompts.
+      #   select_time(my_time, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
+      #   select_time(my_time, :prompt => {:hour => true}) # generic prompt for hours
+      #   select_time(my_time, :prompt => true) # generic prompts for all
+      #
       def select_time(datetime = Time.current, options = {}, html_options = {})
-        separator = options[:time_separator] || ''
-        select_hour(datetime, options, html_options) + separator + select_minute(datetime, options, html_options) + (options[:include_seconds] ? separator + select_second(datetime, options, html_options) : '')
+        DateTimeSelector.new(datetime, options, html_options).select_time
       end
 
       # Returns a select tag with options for each of the seconds 0 through 59 with the current second selected.
@@ -338,31 +400,22 @@ module ActionView
       #
       #   # 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')
       #
+      #   # Generates a select field for seconds with a custom prompt.  Use :prompt=>true for a
+      #   # generic prompt.
+      #   select_minute(14, :prompt => 'Choose seconds')
+      #
       def select_second(datetime, options = {}, html_options = {})
-        val = datetime ? (datetime.kind_of?(Fixnum) ? datetime : datetime.sec) : ''
-        if options[:use_hidden]
-          options[:include_seconds] ? hidden_html(options[:field_name] || 'second', val, options) : ''
-        else
-          second_options = []
-          0.upto(59) do |second|
-            second_options << ((val == second) ?
-              content_tag(:option, leading_zero_on_single_digits(second), :value => leading_zero_on_single_digits(second), :selected => "selected") :
-              content_tag(:option, leading_zero_on_single_digits(second), :value => leading_zero_on_single_digits(second))
-            )
-            second_options << "\n"
-          end
-          select_html(options[:field_name] || 'second', second_options.join, options, html_options)
-        end
+        DateTimeSelector.new(datetime, options, html_options).select_second
       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.
+      # 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
@@ -373,26 +426,17 @@ module ActionView
       #
       #   # 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')
       #
+      #   # Generates a select field for minutes with a custom prompt.  Use :prompt=>true for a
+      #   # generic prompt.
+      #   select_minute(14, :prompt => 'Choose minutes')
+      #
       def select_minute(datetime, options = {}, html_options = {})
-        val = datetime ? (datetime.kind_of?(Fixnum) ? datetime : datetime.min) : ''
-        if options[:use_hidden]
-          hidden_html(options[:field_name] || 'minute', val, options)
-        else
-          minute_options = []
-          0.step(59, options[:minute_step] || 1) do |minute|
-            minute_options << ((val == minute) ?
-              content_tag(:option, leading_zero_on_single_digits(minute), :value => leading_zero_on_single_digits(minute), :selected => "selected") :
-              content_tag(:option, leading_zero_on_single_digits(minute), :value => leading_zero_on_single_digits(minute))
-            )
-            minute_options << "\n"
-          end
-          select_html(options[:field_name] || 'minute', minute_options.join, options, html_options)
-         end
+        DateTimeSelector.new(datetime, options, html_options).select_minute
       end
 
       # Returns a select tag with options for each of the hours 0 through 23 with the current hour selected.
@@ -402,31 +446,22 @@ module ActionView
       # ==== 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 hours that defaults to the hour for the time in my_time
+      #   select_hour(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
+      #   # Generates a select field for hours that defaults to the number given
+      #   select_hour(13)
+      #
+      #   # Generates a select field for hours 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')
+      #   select_hour(my_time, :field_name => 'stride')
+      #
+      #   # Generates a select field for hours with a custom prompt.  Use :prompt => true for a
+      #   # generic prompt.
+      #   select_hour(13, :prompt =>'Choose hour')
       #
       def select_hour(datetime, options = {}, html_options = {})
-        val = datetime ? (datetime.kind_of?(Fixnum) ? datetime : datetime.hour) : ''
-        if options[:use_hidden]
-          hidden_html(options[:field_name] || 'hour', val, options)
-        else
-          hour_options = []
-          0.upto(23) do |hour|
-            hour_options << ((val == hour) ?
-              content_tag(:option, leading_zero_on_single_digits(hour), :value => leading_zero_on_single_digits(hour), :selected => "selected") :
-              content_tag(:option, leading_zero_on_single_digits(hour), :value => leading_zero_on_single_digits(hour))
-            )
-            hour_options << "\n"
-          end
-          select_html(options[:field_name] || 'hour', hour_options.join, options, html_options)
-        end
+        DateTimeSelector.new(datetime, options, html_options).select_hour
       end
 
       # Returns a select tag with options for each of the days 1 through 31 with the current day selected.
@@ -441,36 +476,27 @@ module ActionView
       #
       #   # 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')
       #
+      #   # Generates a select field for days with a custom prompt.  Use :prompt => true for a
+      #   # generic prompt.
+      #   select_day(5, :prompt => 'Choose day')
+      #
       def select_day(date, options = {}, html_options = {})
-        val = date ? (date.kind_of?(Fixnum) ? date : date.day) : ''
-        if options[:use_hidden]
-          hidden_html(options[:field_name] || 'day', val, options)
-        else
-          day_options = []
-          1.upto(31) do |day|
-            day_options << ((val == day) ?
-              content_tag(:option, day, :value => day, :selected => "selected") :
-              content_tag(:option, day, :value => day)
-            )
-            day_options << "\n"
-          end
-          select_html(options[:field_name] || 'day', day_options.join, options, html_options)
-        end
+        DateTimeSelector.new(date, options, html_options).select_day
       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>: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. Override the field name using the 
-      # <tt>:field_name</tt> option, 'month' by default.
+      # 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>: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.
+      # 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
@@ -482,7 +508,7 @@ module ActionView
       #   select_month(Date.today, :field_name => 'start')
       #
       #   # Generates a select field for months that defaults to the current month that
-      #   # will use keys like "1", "3".       
+      #   # will use keys like "1", "3".
       #   select_month(Date.today, :use_month_numbers => true)
       #
       #   # Generates a select field for months that defaults to the current month that
@@ -497,37 +523,19 @@ module ActionView
       #   # will use keys like "Januar", "Marts."
       #   select_month(Date.today, :use_month_names => %w(Januar Februar Marts ...))
       #
+      #   # Generates a select field for months with a custom prompt.  Use :prompt => true for a
+      #   # generic prompt.
+      #   select_month(14, :prompt => 'Choose month')
+      #
       def select_month(date, options = {}, html_options = {})
-        val = date ? (date.kind_of?(Fixnum) ? date : date.month) : ''
-        if options[:use_hidden]
-          hidden_html(options[:field_name] || 'month', val, options)
-        else
-          month_options = []
-          month_names = options[:use_month_names] || (options[:use_short_month] ? Date::ABBR_MONTHNAMES : Date::MONTHNAMES)
-          month_names.unshift(nil) if month_names.size < 13
-          1.upto(12) do |month_number|
-            month_name = if options[:use_month_numbers]
-              month_number
-            elsif options[:add_month_numbers]
-              month_number.to_s + ' - ' + month_names[month_number]
-            else
-              month_names[month_number]
-            end
-
-            month_options << ((val == month_number) ?
-              content_tag(:option, month_name, :value => month_number, :selected => "selected") :
-              content_tag(:option, month_name, :value => month_number)
-            )
-            month_options << "\n"
-          end
-          select_html(options[:field_name] || 'month', month_options.join, options, html_options)
-        end
+        DateTimeSelector.new(date, options, html_options).select_month
       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+. 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.  Override the field name using the <tt>:field_name</tt> option, 'year' by default.
+      # 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.
+      # 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
@@ -546,165 +554,422 @@ module ActionView
       #   # has ascending year values
       #   select_year(2006, :start_year => 2000, :end_year => 2010)
       #
+      #   # Generates a select field for years with a custom prompt.  Use :prompt => true for a
+      #   # generic prompt.
+      #   select_year(14, :prompt => 'Choose year')
+      #
       def select_year(date, options = {}, html_options = {})
-        val = date ? (date.kind_of?(Fixnum) ? date : date.year) : ''
-        if options[:use_hidden]
-          hidden_html(options[:field_name] || 'year', val, options)
-        else
-          year_options = []
-          y = date ? (date.kind_of?(Fixnum) ? (y = (date == 0) ? Date.today.year : date) : date.year) : Date.today.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 << ((val == year) ?
-              content_tag(:option, year, :value => year, :selected => "selected") :
-              content_tag(:option, year, :value => year)
-            )
-            year_options << "\n"
+        DateTimeSelector.new(date, options, html_options).select_year
+      end
+    end
+
+    class DateTimeSelector #:nodoc:
+      extend ActiveSupport::Memoizable
+      include ActionView::Helpers::TagHelper
+
+      DEFAULT_PREFIX = 'date'.freeze unless const_defined?('DEFAULT_PREFIX')
+      POSITION = {
+        :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6
+      }.freeze unless const_defined?('POSITION')
+
+      def initialize(datetime, options = {}, html_options = {})
+        @options      = options.dup
+        @html_options = html_options.dup
+        @datetime     = datetime
+      end
+
+      def select_datetime
+        # TODO: Remove tag conditional
+        # Ideally we could just join select_date and select_date for the tag case
+        if @options[:tag] && @options[:ignore_date]
+          select_time
+        elsif @options[:tag]
+          order = date_order.dup
+          order -= [:hour, :minute, :second]
+
+          @options[:discard_year]   ||= true unless order.include?(:year)
+          @options[:discard_month]  ||= true unless order.include?(:month)
+          @options[:discard_day]    ||= true if @options[:discard_month] || !order.include?(:day)
+          @options[:discard_minute] ||= true if @options[:discard_hour]
+          @options[:discard_second] ||= true unless @options[:include_seconds] && !@options[: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 && @options[:discard_day] && !@options[:discard_month]
+            @datetime = @datetime.change(:day => 1)
           end
-          select_html(options[:field_name] || 'year', year_options.join, options, html_options)
+
+          [:day, :month, :year].each { |o| order.unshift(o) unless order.include?(o) }
+          order += [:hour, :minute, :second] unless @options[:discard_hour]
+
+          build_selects_from_types(order)
+        else
+          "#{select_date}#{@options[:datetime_separator]}#{select_time}"
         end
       end
 
-      private
+      def select_date
+        order = date_order.dup
 
-        def select_html(type, html_options, options, select_tag_options = {})
-          name_and_id_from_options(options, type)
-          select_options = {:id => options[:id], :name => options[:name]}
-          select_options.merge!(:disabled => 'disabled') if options[:disabled]
-          select_options.merge!(select_tag_options) unless select_tag_options.empty?
-          select_html = "\n"
-          select_html << content_tag(:option, '', :value => '') + "\n" if options[:include_blank]
-          select_html << html_options.to_s
-          content_tag(:select, select_html, select_options) + "\n"
+        # TODO: Remove tag conditional
+        if @options[:tag]
+          @options[:discard_hour]     = true
+          @options[:discard_minute]   = true
+          @options[:discard_second]   = true
+
+          @options[:discard_year]   ||= true unless order.include?(:year)
+          @options[:discard_month]  ||= true unless order.include?(:month)
+          @options[:discard_day]    ||= true if @options[:discard_month] || !order.include?(:day)
+
+          # 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 && @options[:discard_day] && !@options[:discard_month]
+            @datetime = @datetime.change(:day => 1)
+          end
         end
 
-        def hidden_html(type, value, options)
-          name_and_id_from_options(options, type)
-          hidden_html = tag(:input, :type => "hidden", :id => options[:id], :name => options[:name], :value => value) + "\n"
+        [:day, :month, :year].each { |o| order.unshift(o) unless order.include?(o) }
+
+        build_selects_from_types(order)
+      end
+
+      def select_time
+        order = []
+
+        # TODO: Remove tag conditional
+        if @options[:tag]
+          @options[:discard_month]    = true
+          @options[:discard_year]     = true
+          @options[:discard_day]      = true
+          @options[:discard_second] ||= true unless @options[:include_seconds]
+
+          order += [:year, :month, :day] unless @options[:ignore_date]
         end
 
-        def name_and_id_from_options(options, type)
-          options[:name] = (options[:prefix] || DEFAULT_PREFIX) + (options[:discard_type] ? '' : "[#{type}]")
-          options[:id] = options[:name].gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '')
+        order += [:hour, :minute]
+        order << :second if @options[:include_seconds]
+
+        build_selects_from_types(order)
+      end
+
+      def select_second
+        if @options[:use_hidden] || @options[:discard_second]
+          build_hidden(:second, sec) if @options[:include_seconds]
+        else
+          build_options_and_select(:second, sec)
         end
+      end
 
-        def leading_zero_on_single_digits(number)
-          number > 9 ? number : "0#{number}"
+      def select_minute
+        if @options[:use_hidden] || @options[:discard_minute]
+          build_hidden(:minute, min)
+        else
+          build_options_and_select(:minute, min, :step => @options[:minute_step])
         end
-    end
+      end
 
-    class InstanceTag #:nodoc:
-      include DateHelper
+      def select_hour
+        if @options[:use_hidden] || @options[:discard_hour]
+          build_hidden(:hour, hour)
+        else
+          build_options_and_select(:hour, hour, :end => 23)
+        end
+      end
 
-      def to_date_select_tag(options = {}, html_options = {})
-        date_or_time_select(options.merge(:discard_hour => true), html_options)
+      def select_day
+        if @options[:use_hidden] || @options[:discard_day]
+          build_hidden(:day, day)
+        else
+          build_options_and_select(:day, day, :start => 1, :end => 31, :leading_zeros => false)
+        end
       end
 
-      def to_time_select_tag(options = {}, html_options = {})
-        date_or_time_select(options.merge(:discard_year => true, :discard_month => true), html_options)
+      def select_month
+        if @options[:use_hidden] || @options[:discard_month]
+          build_hidden(:month, month)
+        else
+          month_options = []
+          1.upto(12) do |month_number|
+            options = { :value => month_number }
+            options[:selected] = "selected" if month == month_number
+            month_options << content_tag(:option, month_name(month_number), options) + "\n"
+          end
+          build_select(:month, month_options.join)
+        end
       end
 
-      def to_datetime_select_tag(options = {}, html_options = {})
-        date_or_time_select(options, html_options)
+      def select_year
+        if !@datetime || @datetime == 0
+          val = ''
+          middle_year = Date.today.year
+        else
+          val = middle_year = year
+        end
+
+        if @options[:use_hidden] || @options[:discard_year]
+          build_hidden(:year, val)
+        else
+          options                 = {}
+          options[:start]         = @options[:start_year] || middle_year - 5
+          options[:end]           = @options[:end_year] || middle_year + 5
+          options[:step]          = options[:start] < options[:end] ? 1 : -1
+          options[:leading_zeros] = false
+
+          build_options_and_select(:year, val, options)
+        end
       end
 
       private
-        def date_or_time_select(options, html_options = {})
-          defaults = { :discard_type => true }
-          options  = defaults.merge(options)
-          datetime = value(object)
-          datetime ||= default_time_from_options(options[:default]) unless options[:include_blank]
-
-          position = { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
-
-          order = (options[:order] ||= [:year, :month, :day])
-
-          # Discard explicit and implicit by not being included in the :order
-          discard = {}
-          discard[:year]   = true if options[:discard_year] or !order.include?(:year)
-          discard[:month]  = true if options[:discard_month] or !order.include?(:month)
-          discard[:day]    = true if options[:discard_day] or discard[:month] or !order.include?(:day)
-          discard[:hour]   = true if options[:discard_hour]
-          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)
+        %w( sec min hour day month year ).each do |method|
+          define_method(method) do
+            @datetime.kind_of?(Fixnum) ? @datetime : @datetime.send(method) if @datetime
           end
+        end
 
-          # Maintain valid dates by including hidden fields for discarded elements
-          [:day, :month, :year].each { |o| order.unshift(o) unless order.include?(o) }
+        # Returns translated month names, but also ensures that a custom month
+        # name array has a leading nil element
+        def month_names
+          month_names = @options[:use_month_names] || translated_month_names
+          month_names.unshift(nil) if month_names.size < 13
+          month_names
+        end
+        memoize :month_names
+
+        # Returns translated month names
+        #  => [nil, "January", "February", "March",
+        #           "April", "May", "June", "July",
+        #           "August", "September", "October",
+        #           "November", "December"]
+        #
+        # If :use_short_month option is set
+        #  => [nil, "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+        #           "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
+        def translated_month_names
+          begin
+            key = @options[:use_short_month] ? :'date.abbr_month_names' : :'date.month_names'
+            I18n.translate(key, :locale => @options[:locale])
+          end
+        end
+
+        # Lookup month name for number
+        #  month_name(1) => "January"
+        #
+        # If :use_month_numbers option is passed
+        #  month_name(1) => 1
+        #
+        # If :add_month_numbers option is passed
+        #  month_name(1) => "1 - January"
+        def month_name(number)
+          if @options[:use_month_numbers]
+            number
+          elsif @options[:add_month_numbers]
+            "#{number} - #{month_names[number]}"
+          else
+            month_names[number]
+          end
+        end
+
+        def date_order
+          @options[:order] || translated_date_order
+        end
+        memoize :date_order
+
+        def translated_date_order
+          begin
+            I18n.translate(:'date.order', :locale => @options[:locale]) || []
+          end
+        end
+
+        # Build full select tag from date type and options
+        def build_options_and_select(type, selected, options = {})
+          build_select(type, build_options(selected, options))
+        end
+
+        # Build select option html from date value and options
+        #  build_options(15, :start => 1, :end => 31)
+        #  => "<option value="1">1</option>
+        #      <option value=\"2\">2</option>
+        #      <option value=\"3\">3</option>..."
+        def build_options(selected, options = {})
+          start         = options.delete(:start) || 0
+          stop          = options.delete(:end) || 59
+          step          = options.delete(:step) || 1
+          leading_zeros = options.delete(:leading_zeros).nil? ? true : false
+
+          select_options = []
+          start.step(stop, step) do |i|
+            value = leading_zeros ? sprintf("%02d", i) : i
+            tag_options = { :value => value }
+            tag_options[:selected] = "selected" if selected == i
+            select_options << content_tag(:option, value, tag_options)
+          end
+          select_options.join("\n") + "\n"
+        end
+
+        # Builds select tag from date type and html select options
+        #  build_select(:month, "<option value="1">January</option>...")
+        #  => "<select id="post_written_on_2i" name="post[written_on(2i)]">
+        #        <option value="1">January</option>...
+        #      </select>"
+        def build_select(type, select_options_as_html)
+          select_options = {
+            :id => input_id_from_type(type),
+            :name => input_name_from_type(type)
+          }.merge(@html_options)
+          select_options.merge!(:disabled => 'disabled') if @options[:disabled]
+
+          select_html = "\n"
+          select_html << content_tag(:option, '', :value => '') + "\n" if @options[:include_blank]
+          select_html << prompt_option_tag(type, @options[:prompt]) + "\n" if @options[:prompt]
+          select_html << select_options_as_html.to_s
 
-          # Ensure proper ordering of :hour, :minute and :second
-          [:hour, :minute, :second].each { |o| order.delete(o); order.push(o) }
+          content_tag(:select, select_html, select_options) + "\n"
+        end
+
+        # Builds a prompt option tag with supplied options or from default options
+        #  prompt_option_tag(:month, :prompt => 'Select month')
+        #  => "<option value="">Select month</option>"
+        def prompt_option_tag(type, options)
+          default_options = {:year => false, :month => false, :day => false, :hour => false, :minute => false, :second => false}
+
+          case options
+          when Hash
+            prompt = default_options.merge(options)[type.to_sym]
+          when String
+            prompt = options
+          else
+            prompt = I18n.translate(('datetime.prompts.' + type.to_s).to_sym, :locale => @options[:locale])
+          end
+
+          prompt ? content_tag(:option, prompt, :value => '') : ''
+        end
 
-          date_or_time_select = ''
-          order.reverse.each do |param|
-            # Send hidden fields for discarded elements once output has started
-            # This ensures AR can reconstruct valid dates using ParseDate
-            next if discard[param] && date_or_time_select.empty?
+        # Builds hidden input tag for date part and value
+        #  build_hidden(:year, 2008)
+        #  => "<input id="post_written_on_1i" name="post[written_on(1i)]" type="hidden" value="2008" />"
+        def build_hidden(type, value)
+          tag(:input, {
+            :type => "hidden",
+            :id => input_id_from_type(type),
+            :name => input_name_from_type(type),
+            :value => value
+          }) + "\n"
+        end
 
-            date_or_time_select.insert(0, self.send("select_#{param}", datetime, options_with_prefix(position[param], options.merge(:use_hidden => discard[param])), html_options))
-            date_or_time_select.insert(0,
-              case param
-                when :hour then (discard[:year] && discard[:day] ? "" : " &mdash; ")
-                when :minute then " : "
-                when :second then options[:include_seconds] ? " : " : ""
-                else ""
-              end)
+        # Returns the name attribute for the input tag
+        #  => post[written_on(1i)]
+        def input_name_from_type(type)
+          prefix = @options[:prefix] || ActionView::Helpers::DateTimeSelector::DEFAULT_PREFIX
+          prefix += "[#{@options[:index]}]" if @options.has_key?(:index)
 
+          field_name = @options[:field_name] || type
+          if @options[:include_position]
+            field_name += "(#{ActionView::Helpers::DateTimeSelector::POSITION[type]}i)"
           end
 
-          date_or_time_select
+          @options[:discard_type] ? prefix : "#{prefix}[#{field_name}]"
+        end
+
+        # Returns the id attribute for the input tag
+        #  => "post_written_on_1i"
+        def input_id_from_type(type)
+          input_name_from_type(type).gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '')
+        end
+
+        # Given an ordering of datetime components, create the selection html
+        # and join them with their appropriate seperators
+        def build_selects_from_types(order)
+          select = ''
+          order.reverse.each do |type|
+            separator = separator(type) unless type == order.first # don't add on last field
+            select.insert(0, separator.to_s + send("select_#{type}").to_s)
+          end
+          select
         end
 
-        def options_with_prefix(position, options)
-          prefix = "#{@object_name}"
-          if options[:index]
-            prefix << "[#{options[:index]}]"
-          elsif @auto_index
-            prefix << "[#{@auto_index}]"
+        # Returns the separator for a given datetime component
+        def separator(type)
+          case type
+            when :month, :day
+              @options[:date_separator]
+            when :hour
+              (@options[:discard_year] && @options[:discard_day]) ? "" : @options[:datetime_separator]
+            when :minute
+              @options[:time_separator]
+            when :second
+              @options[:include_seconds] ? @options[:time_separator] : ""
           end
-          options.merge(:prefix => "#{prefix}[#{@method_name}(#{position}i)]")
         end
+    end
+
+    class InstanceTag #:nodoc:
+      def to_date_select_tag(options = {}, html_options = {})
+        datetime_selector(options, html_options).select_date
+      end
+
+      def to_time_select_tag(options = {}, html_options = {})
+        datetime_selector(options, html_options).select_time
+      end
+
+      def to_datetime_select_tag(options = {}, html_options = {})
+        datetime_selector(options, html_options).select_datetime
+      end
+
+      private
+        def datetime_selector(options, html_options)
+          datetime = value(object) || default_datetime(options)
+
+          options = options.dup
+          options[:field_name]           = @method_name
+          options[:include_position]     = true
+          options[:prefix]             ||= @object_name
+          options[:index]                = @auto_index if @auto_index && !options.has_key?(:index)
+          options[:datetime_separator] ||= ' &mdash; '
+          options[:time_separator]     ||= ' : '
+
+          DateTimeSelector.new(datetime, options.merge(:tag => true), html_options)
+        end
+
+        def default_datetime(options)
+          return if options[:include_blank] || options[:prompt]
 
-        def default_time_from_options(default)
-          case default
+          case options[:default]
             when nil
               Time.current
             when Date, Time
-              default
+              options[:default]
             else
+              default = options[:default].dup
+
               # Rename :minute and :second to :min and :sec
               default[:min] ||= default[:minute]
               default[:sec] ||= default[:second]
 
               time = Time.current
-                
+
               [:year, :month, :day, :hour, :min, :sec].each do |key|
                 default[key] ||= time.send(key)
               end
 
-              Time.utc_time(default[:year], default[:month], default[:day], default[:hour], default[:min], default[:sec])
-            end
+              Time.utc_time(
+                default[:year], default[:month], default[:day],
+                default[:hour], default[:min], default[:sec]
+              )
+          end
         end
     end
 
     class FormBuilder
       def date_select(method, options = {}, html_options = {})
-        @template.date_select(@object_name, method, options.merge(:object => @object), html_options)
+        @template.date_select(@object_name, method, objectify_options(options), html_options)
       end
 
       def time_select(method, options = {}, html_options = {})
-        @template.time_select(@object_name, method, options.merge(:object => @object), html_options)
+        @template.time_select(@object_name, method, objectify_options(options), html_options)
       end
 
       def datetime_select(method, options = {}, html_options = {})
-        @template.datetime_select(@object_name, method, options.merge(:object => @object), html_options)
+        @template.datetime_select(@object_name, method, objectify_options(options), html_options)
       end
     end
   end