@@ -23,15 +23,15 @@ module Mack # # Examples: # Mack::Generator::ColumnObject.new("user", "username:string").form_field - # => "<%= model_text_field(@user, :username) %>" + # => "<%= :user.text_field :username %>" # Mack::Generator::ColumnObject.new("Post", "body:text").form_field - # => "<%= model_textarea(@user, :username) %>" + # => "<%= :post.text_area :body %>" def form_field case self.column_type when "text" - %{<%= model_textarea(@#{self.model_name}, :#{self.column_name}) %>} + %{<%= :#{self.model_name}.text_area :#{self.column_name} %>} else - %{<%= model_text_field(@#{self.model_name}, :#{self.column_name}) %>} + %{<%= :#{self.model_name}.text_field :#{self.column_name} %>} end end mack-orm/lib/mack-orm/model_column.rb @@ -2,26 +2,25 @@ module Mack module ViewHelpers # :nodoc: module OrmHelpers - # Generates a text input tag for a given model and field - # - # Example: - # model_text_field(@user, :username) # => <input id="user_username" name="user[username]" type="text" value="<@user.username's value>" /> - def model_text_field(model, property, options = {}) + # DEPRECATED: Use Mack::ViewHelpers::FormHelpers text_field instead. + def model_text_field(model, property, options = {}) # :nodoc: + deprecate_method(:model_text_field, :text_field, '0.7.0') m_name = model.class.to_s.underscore - non_content_tag(:input, {:type => :text, :name => "#{m_name}[#{property}]", :id => "#{m_name}_#{property}", :value => model.send(property)}.merge(options)) + text_field(model.class.to_s.underscore, property, options) end - # Generates a password input tag for a given model and field - # - # Example: - # model_password_field(@user, :password) # => <input id="user_username" name="user[username]" type="password" value="<@user.username's value>" /> - def model_password_field(model, property, options = {}) - model_text_field(model, property, {:type => :password}.merge(options)) + # DEPRECATED: Use Mack::ViewHelpers::FormHelpers password_field instead. + def model_password_field(model, property, options = {}) # :nodoc: + deprecate_method(:model_password_field, :password_field, '0.7.0') + m_name = model.class.to_s.underscore + password_field(model.class.to_s.underscore, property, options) end - def model_textarea(model, property, options = {}) + # DEPRECATED: Use Mack::ViewHelpers::FormHelpers text_area instead. + def model_textarea(model, property, options = {}) # :nodoc: + deprecate_method(:model_textarea, :text_area, '0.7.0') m_name = model.class.to_s.underscore - content_tag(:textarea, {:name => "#{m_name}[#{property}]", :id => "#{m_name}_#{property}", :cols => 60, :rows => 20}.merge(options), model.send(property)) + text_area(model.class.to_s.underscore, property, options) end end # OrmHelpers mack-orm/lib/mack-orm/orm_helpers.rb b4a3fe55fa83a1c70c93e591063fe9569b4e48b7 Mark Bates mark@markbates.com http://github.com/markbates/mack-more/commit/27c345da851775cf2443b5813890c4ae0bf64809 27c345da851775cf2443b5813890c4ae0bf64809 2008-08-15T08:23:26-07:00 2008-08-15T08:23:26-07:00 Deprecated the model_text_field, model_password_field, and model_textarea methods. [#19] 287b5127c560fbdb91bd13e4a0f15641af149faa Mark Bates mark@markbates.com