@@ -2,15 +2,21 @@ module DateTimeTextFieldHelpers module FormHelpers def date_text_field(object_name, method, options = {}) - ActionView::Helpers::InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_date_text_field_tag(options) + args = [object_name, method, self, options.delete(:object)] + args.insert(3, nil) if Rails::VERSION::STRING < '2.2' + ActionView::Helpers::InstanceTag.new(*args).to_date_text_field_tag(options) end def time_text_field(object_name, method, options = {}) - ActionView::Helpers::InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_time_text_field_tag(options) + args = [object_name, method, self, options.delete(:object)] + args.insert(3, nil) if Rails::VERSION::STRING < '2.2' + ActionView::Helpers::InstanceTag.new(*args).to_time_text_field_tag(options) end def datetime_text_field(object_name, method, options = {}) - ActionView::Helpers::InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_datetime_text_field_tag(options) + args = [object_name, method, self, options.delete(:object)] + args.insert(3, nil) if Rails::VERSION::STRING < '2.2' + ActionView::Helpers::InstanceTag.new(*args).to_datetime_text_field_tag(options) end end lib/date_time_text_field_helpers/form_helpers.rb @@ -41,7 +41,7 @@ module DateTimeTextFieldHelpers options = defaults.merge(options) datetime = value(object) - datetime ||= default_time_from_options(options[:default]) unless options[:blank] + datetime ||= default_datetime(options) unless options[:blank] position = { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 } @@ -114,5 +114,38 @@ module DateTimeTextFieldHelpers datetime_text_field_html = %(<input type="text" id="#{options[:id]}" name="#{options[:name]}" size="#{size}" value="#{value}" class="#{options[:class]}" />) end + if Rails::VERSION::STRING < '2.2' + + def default_datetime(options) + default_time_from_options(options[:default]) + end + + else + + def options_with_prefix(position, options) + prefix = "#{@object_name}" + if options[:index] + prefix << "[#{options[:index]}]" + elsif @auto_index + prefix << "[#{@auto_index}]" + end + options.merge(:prefix => "#{prefix}[#{@method_name}(#{position}i)]") + end + + def name_and_id_from_options(options, type) + options[:name] = (options[:prefix] || 'date') + (options[:discard_type] ? '' : "[#{type}]") + options[:id] = options[:name].gsub(/([\[\(])|(\]\[)/, '_').gsub(/[\]\)]/, '') + end + + def leading_zero_on_single_digits(number) + number > 9 ? number : "0#{number}" + 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" + end + + end end end lib/date_time_text_field_helpers/instance_tag.rb @@ -1,7 +1,8 @@ require File.dirname(__FILE__) + '/spec_helper' describe DateTimeTextFieldHelpers::FormHelpers do - + include DateTimeTextFieldHelpers::FormHelpers + before do self.stub!(:params).and_return({}) end spec/form_helpers_spec.rb @@ -3,6 +3,7 @@ require 'rubygems' require 'spec' require 'spec/interop/test' +require 'rails/version' require 'active_support' require 'action_controller' require 'action_controller/test_process' spec/spec_helper.rb c84d0e726368579f8f9a5e5ac4c6711d02268c70 Adam Meehan adam.meehan@gmail.com http://github.com/adzap/date_time_text_field_helpers/commit/261de08eda66aa09ae73193fa07a30c4795c55b2 261de08eda66aa09ae73193fa07a30c4795c55b2 2009-03-02T03:34:25-08:00 2009-03-02T03:34:25-08:00 backwards compatible fixes for Rails 2.2. Just copied deprecated methods from Rails 2.1 bce5c5ecc4e15a3ab942ad90b634bfdc97f91ba5 Adam Meehan adam.meehan@gmail.com