@@ -1,41 +1,81 @@ class Symbol + # See Mack::ViewHelpers::FormHelpers check_box for more information + # + # Examples: + # @user = User.new(:accepted_tos => true) + # <%= :user.check_box :accepted_tos %> # => <input checked="checked" id="user_accepted_tos" name="user[accepted_tos]" type="checkbox" /> + # <%= :i_dont_exist.checkbox %> # => <input id="i_dont_exist" name="i_dont_exist" type="checkbox" /> def check_box(*args) Thread.current[:view_template].check_box(self, *args) end + # See Mack::ViewHelpers::FormHelpers file_field for more information + # + # Examples: + # @user = User.new(:bio_file => "~/bio.doc") + # <%= :user.file_field :bio_file %> # => <input id="user_bio_field" name="user[bio_field]" type="file" value="~/bio.doc" /> + # <%= :i_dont_exist.file_field %> # => <input id="i_dont_exist" name="i_dont_exist" type="file" value="" /> def file_field(*args) Thread.current[:view_template].file_field(self, *args) end + # See Mack::ViewHelpers::FormHelpers hidden_field for more information + # + # Examples: + # @user = User.new(:email => "mark@mackframework.com") + # <%= :user.hidden_field :email %> # => <input id="user_email" name="user[email]" type="hidden" value="mark@mackframework.com" /> + # <%= :i_dont_exist.hidden_field %> # => <input id="i_dont_exist" name="i_dont_exist" type="hidden" /> def hidden_field(*args) Thread.current[:view_template].hidden_field(self, *args) end + # See Mack::ViewHelpers::FormHelpers image_submit for more information def image_submit(*args) Thread.current[:view_template].image_submit(self, *args) end - def label(*args) + # See Mack::ViewHelpers::FormHelpers label_tag for more information + def label_tag(*args) Thread.current[:view_template].label(self, *args) end + # See Mack::ViewHelpers::FormHelpers password_field for more information + # + # Examples: + # @user = User.new(:email => "mark@mackframework.com") + # <%= :user.password_field :email %> # => <input id="user_email" name="user[email]" type="password" value="mark@mackframework.com" /> + # <%= :i_dont_exist.password_field %> # => <input id="i_dont_exist" name="i_dont_exist" type="password" /> + def password_field(*args) + Thread.current[:view_template].password_field(self, *args) + end + + # See Mack::ViewHelpers::FormHelpers radio_button for more information def radio_button(*args) Thread.current[:view_template].radio_button(self, *args) end + # See Mack::ViewHelpers::FormHelpers select for more information def select(*args) Thread.current[:view_template].select(self, *args) end + # See Mack::ViewHelpers::FormHelpers submit for more information def submit(*args) Thread.current[:view_template].submit(self, *args) end + # See Mack::ViewHelpers::FormHelpers text_area for more information def text_area(*args) Thread.current[:view_template].text_area(self, *args) end + # See Mack::ViewHelpers::FormHelpers text_field for more information + # + # Examples: + # @user = User.new(:email => "mark@mackframework.com") + # <%= :user.text_field :email %> # => <input id="user_email" name="user[email]" type="text" value="mark@mackframework.com" /> + # <%= :i_dont_exist.text_field %> # => <input id="i_dont_exist" name="i_dont_exist" type="text" /> def text_field(*args) Thread.current[:view_template].text_field(self, *args) end lib/mack/core_extensions/symbol.rb @@ -54,7 +54,7 @@ module Mack non_content_tag(:input, {:type => :image, :src => "/images/#{src}"}.merge(options)) end - def label(name, *args) + def label_tag(name, *args) fe = FormElement.new(*args) unless fe.options[:for] fe.options[:for] = (fe.calling_method == :to_s ? name.to_s : "#{name}_#{fe.calling_method}") @@ -101,7 +101,8 @@ module Mack sel_value = var.send(fe.calling_method) if var sel_value = fe.options[:selected] if fe.options[:selected] sopts.each do |kv| - content << %{<option value="#{kv[1]}" #{kv[1].to_s == sel_value.to_s ? "selected" : ""}>#{kv[0]}</option>} + selected = kv[1].to_s == sel_value.to_s ? "selected" : "" + content << %{<option value="#{kv[1]}" #{selected}>#{kv[0]}</option>} end fe.options.delete(:selected) fe.options.delete(:options) lib/mack/view_helpers/form_helpers.rb @@ -120,30 +120,30 @@ describe Mack::ViewHelpers::FormHelpers do end - describe "label" do + describe "label_tag" do it "should create a nested label for a model" do - label(:cop, :full_name).should == %{<label for="cop_full_name">Full name</label>} + label_tag(:cop, :full_name).should == %{<label for="cop_full_name">Full name</label>} end it "should create a non-nested label for a simple object" do - label(:simple).should == %{<label for="simple">Simple</label>} + label_tag(:simple).should == %{<label for="simple">Simple</label>} end it "should create a non-nested label for just a symbol" do - label(:unknown).should == %{<label for="unknown">Unknown</label>} + label_tag(:unknown).should == %{<label for="unknown">Unknown</label>} end it "should create a non-nested label for just a symbol" do - label(:unknown).should == %{<label for="unknown">Unknown</label>} + label_tag(:unknown).should == %{<label for="unknown">Unknown</label>} end it "should create a non-nested label and use :value for it's content" do - label(:unknown, :value => "My Label").should == %{<label for="unknown">My Label</label>} + label_tag(:unknown, :value => "My Label").should == %{<label for="unknown">My Label</label>} end it "should create a non-nested label and use :for for it's for" do - label(:unknown, :for => "my_label").should == %{<label for="my_label">Unknown</label>} + label_tag(:unknown, :for => "my_label").should == %{<label for="my_label">Unknown</label>} end end test/unit/view_helpers/form_helpers_spec.rb 620bd22da9f75b782db693879b8b654bb4587ab2 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/53d126e181ab37c249b472a28201e0b3cf033db8 53d126e181ab37c249b472a28201e0b3cf033db8 2008-08-14T12:37:41-07:00 2008-08-14T12:37:41-07:00 Adding rdoc for html form helpers.[#19] 079bab406c00f24547708fea5cc27cdb1a5a721e Mark Bates mark@markbates.com