@@ -55,23 +55,31 @@ class Symbol # # Examples: # @user = User.new(:level => 1) - # <%= :user.radio_button :level %> # => <input checked="checked" id="user_level" name="user[level]" type="radio" /> - # <%= :i_dont_exist.radio_button %> # => <input id="i_dont_exist" name="i_dont_exist" type="radio" /> + # <%= :user.radio_button :level %> # => <input checked="checked" id="user_level" name="user[level]" type="radio" value="1" /> + # <%= :user.radio_button :level, :value => 2 %> # => <input id="user_level" name="user[level]" type="radio" value="2" /> + # <%= :i_dont_exist.radio_button %> # => <input id="i_dont_exist" name="i_dont_exist" type="radio" value="" /> 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) + # See Mack::ViewHelpers::FormHelpers select_tag for more information + # + # Examples: + # @user = User.new(:level => 1) + # <%= :user.select_tag :level, :options => [["one", 1], ["two", 2]] %> # => <select id="user_level" name="user[level]"><option value="1" selected>one</option><option value="2" >two</option></select> + # <%= :user.select_tag :level, :options => {:one => 1, :two => 2} %> # => <select id="user_level" name="user[level]"><option value="1" selected>one</option><option value="2" >two</option></select> + # <%= :i_dont_exist.select_tag :options => [["one", 1], ["two", 2]], :selected => 1 %> # => <select id="i_dont_exist" name="i_dont_exist"><option value="1" selected>one</option><option value="2" >two</option></select> + def select_tag(*args) + Thread.current[:view_template].select_tag(self, *args) end # See Mack::ViewHelpers::FormHelpers text_area for more information + # + # Examples: + # @user = User.new(:bio => "my bio here") + # <%= :user.text_area :bio %> # => <textarea id="user_bio" name="user[bio]">my bio here</textarea> + # <%= :i_dont_exist.text_area %> # => <textarea id="i_dont_exist" name="i_dont_exist"></textarea> + # <%= :i_dont_exist.text_area :value => "hi there" %> # => <textarea id="i_dont_exist" name="i_dont_exist">hi there</textarea> def text_area(*args) Thread.current[:view_template].text_area(self, *args) end lib/mack/core_extensions/symbol.rb @@ -24,12 +24,14 @@ module Mack end def submit_tag(value = "Submit", options = {}, *original_args) - Mack.logger.warn("DEPRECATED: 'submit_tag'. Please use 'submit' instead") - submit(value, options, *original_args) + Mack.logger.warn("DEPRECATED: 'submit_tag'. Please use 'submit_button' instead") + submit_button(value, options, *original_args) end - # Builds an HTML submit tag - def submit(value = "Submit", options = {}, *original_args) + # Examples: + # <%= submit_button %> # => <input type="submit" value="Submit" /> + # <%= submit_button "Login" %> # => <input type="submit" value="Login" /> + def submit_button(value = "Submit", options = {}, *original_args) non_content_tag(:input, {:type => :submit, :value => value}.merge(options)) end @@ -67,7 +69,7 @@ module Mack content_tag(:label, fe.options, content) end - def select(name, *args) + def select_tag(name, *args) var = instance_variable_get("@#{name}") fe = FormElement.new(*args) options = {:name => name, :id => name} @@ -107,7 +109,9 @@ module Mack fe = FormElement.new(*args) options = {:name => name, :id => name} if var.nil? - return content_tag(:textarea, options.merge(fe.options)) + value = fe.options[:value] + fe.options.delete(:value) + return content_tag(:textarea, options.merge(fe.options), value) else unless fe.calling_method == :to_s options.merge!(:name => "#{name}[#{fe.calling_method}]", :id => "#{name}_#{fe.calling_method}") lib/mack/view_helpers/form_helpers.rb @@ -168,30 +168,30 @@ describe Mack::ViewHelpers::FormHelpers do end - describe "select" do + describe "select_tag" do it "should create a nested select tag for a model" do - select(:cop, :level).should == %{<select id="cop_level" name="cop[level]"></select>} + select_tag(:cop, :level).should == %{<select id="cop_level" name="cop[level]"></select>} end it "should create a non-nested select tag for a simple model" do - select(:simple).should == %{<select id="simple" name="simple"></select>} + select_tag(:simple).should == %{<select id="simple" name="simple"></select>} end it "should build the options from a given array of arrays" do - select(:simple, :options => @select_options).should == %{<select id="simple" name="simple"><option value="1" >one</option><option value="2" >two</option><option value="3" >three</option></select>} + select_tag(:simple, :options => @select_options).should == %{<select id="simple" name="simple"><option value="1" >one</option><option value="2" >two</option><option value="3" >three</option></select>} end it "should build the options from a given hash" do - select(:simple, :options => {"one" => 1, "two" => 2, "three" => 3}).should == %{<select id="simple" name="simple"><option value="1" >one</option><option value="3" >three</option><option value="2" >two</option></select>} + select_tag(:simple, :options => {"one" => 1, "two" => 2, "three" => 3}).should == %{<select id="simple" name="simple"><option value="1" >one</option><option value="3" >three</option><option value="2" >two</option></select>} end it "should mark an option as selected if the model has it seleceted" do - select(:cop, :level, :options => @select_options).should == %{<select id="cop_level" name="cop[level]"><option value="1" selected>one</option><option value="2" >two</option><option value="3" >three</option></select>} + select_tag(:cop, :level, :options => @select_options).should == %{<select id="cop_level" name="cop[level]"><option value="1" selected>one</option><option value="2" >two</option><option value="3" >three</option></select>} end it "should mark an option as selected if the selected options is available" do - select(:simple, :options => @select_options, :selected => 1).should == %{<select id="simple" name="simple"><option value="1" selected>one</option><option value="2" >two</option><option value="3" >three</option></select>} + select_tag(:simple, :options => @select_options, :selected => 1).should == %{<select id="simple" name="simple"><option value="1" selected>one</option><option value="2" >two</option><option value="3" >three</option></select>} end end @@ -208,6 +208,7 @@ describe Mack::ViewHelpers::FormHelpers do it "should create a non-nested text_area for just a symbol" do text_area(:unknown).should == %{<textarea id="unknown" name="unknown"></textarea>} + text_area(:unknown, :value => "hi there").should == %{<textarea id="unknown" name="unknown">hi there</textarea>} end it "should create a nested text_area for a model with an empty value if value is false" do @@ -278,18 +279,18 @@ Hello end - describe "submit" do + describe "submit_button" do it "should build a simple submit tag" do - submit.should == %{<input type="submit" value="Submit" />} + submit_button.should == %{<input type="submit" value="Submit" />} end it "should allow you to change the value" do - submit("Login").should == %{<input type="submit" value="Login" />} + submit_button("Login").should == %{<input type="submit" value="Login" />} end it "should take options" do - submit("Login", {:class => :foo}).should == %{<input class="foo" type="submit" value="Login" />} + submit_button("Login", {:class => :foo}).should == %{<input class="foo" type="submit" value="Login" />} end end test/unit/view_helpers/form_helpers_spec.rb d83e931e8bd246ca664547f181fdc30c516d56c4 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/7201f443900acb6f7e010d1aa6df4766416a5fd5 7201f443900acb6f7e010d1aa6df4766416a5fd5 2008-08-14T13:38:29-07:00 2008-08-14T13:38:29-07:00 Added some more rdoc and fixed a bug or two with html form helpers. [#19] c1315ee82dafe9cedaf5245a4e5afc49b5059ee7 Mark Bates mark@markbates.com