5 files changed, 43 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index bdfef920c5..44e24fecd1 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -889,6 +889,24 @@ module ActionView
       end
       alias phone_field telephone_field
 
+      # Returns a text_field of type "date".
+      #
+      #   date_field("user", "born_on")
+      #   # => <input id="user_born_on" name="user[born_on]" type="date" />
+      #
+      # The default value is generated by trying to call "to_date"
+      # on the object's value, which makes it behave as expected for instances
+      # of DateTime and ActiveSupport::TimeWithZone. You can still override that
+      # by passing the "value" option explicitly, e.g.
+      #
+      #   @user.born_on = Date.new(1984, 1, 27)
+      #   date_field("user", "born_on", value: "1984-05-12")
+      #   # => <input id="user_born_on" name="user[born_on]" type="date" value="1984-05-12" />
+      #
+      def date_field(object_name, method, options = {})
+        Tags::DateField.new(object_name, method, self, options).render
+      end
+
       # Returns a text_field of type "url".
       #
       #   url_field("user", "homepage")
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index e97f602728..53fd189c39 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -549,6 +549,14 @@ module ActionView
       end
       alias phone_field_tag telephone_field_tag
 
+      # Creates a text field of type "date".
+      #
+      # ==== Options
+      # * Accepts the same options as text_field_tag.
+      def date_field_tag(name, value = nil, options = {})
+        text_field_tag(name, value, options.stringify_keys.update("type" => "date"))
+      end
+
       # Creates a text field of type "url".
       #
       # ==== Options
diff --git a/actionpack/lib/action_view/helpers/tags.rb b/actionpack/lib/action_view/helpers/tags.rb
index c480799fe3..3cf762877f 100644
--- a/actionpack/lib/action_view/helpers/tags.rb
+++ b/actionpack/lib/action_view/helpers/tags.rb
@@ -8,6 +8,7 @@ module ActionView
       autoload :CollectionCheckBoxes
       autoload :CollectionRadioButtons
       autoload :CollectionSelect
+      autoload :DateField
       autoload :DateSelect
       autoload :DatetimeSelect
       autoload :EmailField
diff --git a/actionpack/lib/action_view/helpers/tags/base.rb b/actionpack/lib/action_view/helpers/tags/base.rb
index e22612ccd0..1ece0ad2fc 100644
--- a/actionpack/lib/action_view/helpers/tags/base.rb
+++ b/actionpack/lib/action_view/helpers/tags/base.rb
@@ -36,7 +36,7 @@ module ActionView
 
             object.respond_to?(method_before_type_cast) ?
               object.send(method_before_type_cast) :
-              object.send(@method_name)
+              value(object)
           end
         end
 
diff --git a/actionpack/lib/action_view/helpers/tags/date_field.rb b/actionpack/lib/action_view/helpers/tags/date_field.rb
new file mode 100644
index 0000000000..bb968e9f39
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/date_field.rb
@@ -0,0 +1,15 @@
+module ActionView
+  module Helpers
+    module Tags
+      class DateField < TextField #:nodoc:
+        def render
+          options = @options.stringify_keys
+          options["value"] = @options.fetch("value") { value(object).try(:to_date) }
+          options["size"] = nil
+          @options = options
+          super
+        end
+      end
+    end
+  end
+end