@@ -30,12 +30,13 @@ class Symbol 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 - # See Mack::ViewHelpers::FormHelpers label_tag for more information + # + # Examples: + # @user = User.new + # <%= :user.label_tag :email %> # => <label for="user_email">Email</label> + # <%= :i_dont_exist.label_tag %> # => <label for="i_dont_exist">I don't exist</label> + # <%= :i_dont_exist.label_tag :value => "Hello" %> # => <label for="i_dont_exist">Hello</label> def label_tag(*args) Thread.current[:view_template].label(self, *args) end @@ -51,6 +52,11 @@ class Symbol end # See Mack::ViewHelpers::FormHelpers radio_button for more information + # + # 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" /> def radio_button(*args) Thread.current[:view_template].radio_button(self, *args) end lib/mack/core_extensions/symbol.rb @@ -67,15 +67,6 @@ module Mack content_tag(:label, fe.options, content) end - def radio_button(name, *args) - build_form_element(name, {:type => :radio}, *args) do |var, fe, options| - if options[:value] - options.merge!(:checked => "checked") - end - options.delete(:value) - end - end - def select(name, *args) var = instance_variable_get("@#{name}") fe = FormElement.new(*args) @@ -140,14 +131,26 @@ module Mack build_form_element(name, {:type => :password}, *args) end + def radio_button(name, *args) + build_form_element(name, {:type => :radio, :value => ""}, *args) do |var, fe, options| + if fe.options[:value] + if fe.options[:value] == options[:value] + options.merge!(:checked => "checked") + end + elsif options[:value] + options.merge!(:checked => "checked") + end + end + end + private def build_form_element(name, options, *original_args) var = instance_variable_get("@#{name}") + fe = FormElement.new(*original_args) options = {:name => name, :id => name}.merge(options) if var.nil? - return non_content_tag(:input, options) + return non_content_tag(:input, options.merge(fe.options)) else - fe = FormElement.new(*original_args) unless fe.calling_method == :to_s options.merge!(:name => "#{name}[#{fe.calling_method}]", :id => "#{name}_#{fe.calling_method}") end @@ -180,6 +183,9 @@ module Mack else raise ArgumentError.new("You must provide either a Symbol, a String, a Hash, or a combination thereof.") end + if self.options[:checked] + self.options[:checked] = :checked + end end end lib/mack/view_helpers/form_helpers.rb @@ -151,25 +151,19 @@ describe Mack::ViewHelpers::FormHelpers do describe "radio_button" do it "should create a nested radio_button for a model" do - radio_button(:cop, :tos).should == %{<input id="cop_tos" name="cop[tos]" type="radio" />} + radio_button(:cop, :level).should == %{<input checked="checked" id="cop_level" name="cop[level]" type="radio" value="1" />} + radio_button(:cop, :level, :value => "twoa").should == %{<input id="cop_level" name="cop[level]" type="radio" value="twoa" />} end it "should create a non-nested radio_button for a simple object" do - radio_button(:simple).should == %{<input checked="checked" id="simple" name="simple" type="radio" />} + radio_button(:simple).should == %{<input checked="checked" id="simple" name="simple" type="radio" value="hi" />} + radio_button(:simple, :value => "twob").should == %{<input id="simple" name="simple" type="radio" value="twob" />} end it "should create a non-nested radio_button for just a symbol" do - radio_button(:unknown).should == %{<input id="unknown" name="unknown" type="radio" />} - end - - it "should be checked if the value is true" do - @cop.tos = true - radio_button(:cop, :tos).should == %{<input checked="checked" id="cop_tos" name="cop[tos]" type="radio" />} - end - - it "should be unchecked if the value is false" do - @cop.tos = false - radio_button(:cop, :tos).should == %{<input id="cop_tos" name="cop[tos]" type="radio" />} + radio_button(:unknown).should == %{<input id="unknown" name="unknown" type="radio" value="" />} + radio_button(:unknown, :value => "twoc").should == %{<input id="unknown" name="unknown" type="radio" value="twoc" />} + radio_button(:unknown, :value => "twod", :checked => true).should == %{<input checked="checked" id="unknown" name="unknown" type="radio" value="twod" />} end end test/unit/view_helpers/form_helpers_spec.rb eec9f0b42187b957405790fc1780600de062f0c7 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/d83e931e8bd246ca664547f181fdc30c516d56c4 d83e931e8bd246ca664547f181fdc30c516d56c4 2008-08-14T13:08:07-07:00 2008-08-14T13:08:07-07:00 Actually made radio_button work right. :) [#19] f18a9b009e5ac199e8b98a59bf904ec1deb20cc6 Mark Bates mark@markbates.com