Extract PasswordField

4 files changed, 24 insertions, 5 deletions

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index d3d0e2e2f8..87674cc2d0 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -699,7 +699,7 @@ module ActionView
       #   # => <input type="password" id="account_pin" name="account[pin]" size="20" class="form_input" />
       #
       def password_field(object_name, method, options = {})
-        InstanceTag.new(object_name, method, self, options.delete(:object)).to_input_field_tag("password", { :value => nil }.merge!(options))
+        ActionView::Helpers::Tags::PasswordField.new(object_name, method, self, options).render
       end
 
       # Returns a hidden input tag tailored for accessing a specified attribute (identified by +method+) on an object
diff --git a/actionpack/lib/action_view/helpers/tags.rb b/actionpack/lib/action_view/helpers/tags.rb
index bc2fb34deb..036fb1efd8 100644
--- a/actionpack/lib/action_view/helpers/tags.rb
+++ b/actionpack/lib/action_view/helpers/tags.rb
@@ -1,9 +1,10 @@
 module ActionView
   module Helpers
     module Tags
-      autoload :Base,      'action_view/helpers/tags/base'
-      autoload :Label,     'action_view/helpers/tags/label'
-      autoload :TextField, 'action_view/helpers/tags/text_field'
+      autoload :Base,          'action_view/helpers/tags/base'
+      autoload :Label,         'action_view/helpers/tags/label'
+      autoload :TextField,     'action_view/helpers/tags/text_field'
+      autoload :PasswordField, 'action_view/helpers/tags/password_field'
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/tags/password_field.rb b/actionpack/lib/action_view/helpers/tags/password_field.rb
new file mode 100644
index 0000000000..6e7a4d3c36
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/tags/password_field.rb
@@ -0,0 +1,12 @@
+module ActionView
+  module Helpers
+    module Tags
+      class PasswordField < TextField #:nodoc:
+        def render
+          @options = {:value => nil}.merge!(@options)
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/tags/text_field.rb b/actionpack/lib/action_view/helpers/tags/text_field.rb
index 4e745061db..758fd636f2 100644
--- a/actionpack/lib/action_view/helpers/tags/text_field.rb
+++ b/actionpack/lib/action_view/helpers/tags/text_field.rb
@@ -6,12 +6,18 @@ module ActionView
           options = @options.stringify_keys
           options["size"] = options["maxlength"] || DEFAULT_FIELD_OPTIONS["size"] unless options.key?("size")
           options = DEFAULT_FIELD_OPTIONS.merge(options)
-          options["type"]  ||= "text"
+          options["type"]  ||= field_type
           options["value"] = options.fetch("value"){ value_before_type_cast(object) }
           options["value"] &&= ERB::Util.html_escape(options["value"])
           add_default_name_and_id(options)
           tag("input", options)
         end
+
+        private
+
+        def field_type
+          self.class.name.split("::").last.sub("Field", "").downcase
+        end
       end
     end
   end