0
@@ -55,23 +55,31 @@ class Symbol
0
   # 
0
   # Examples:
0
   #   @user = User.new(:level => 1)
0
-  #   <%= :user.radio_button :level %> # => <input checked="checked" id="user_level" name="user[level]" type="radio" />
0
-  #   <%= :i_dont_exist.radio_button %> # => <input id="i_dont_exist" name="i_dont_exist" type="radio" />
0
+  #   <%= :user.radio_button :level %> # => <input checked="checked" id="user_level" name="user[level]" type="radio" value="1" />
0
+  #   <%= :user.radio_button :level, :value => 2 %> # => <input id="user_level" name="user[level]" type="radio" value="2" />
0
+  #   <%= :i_dont_exist.radio_button %> # => <input id="i_dont_exist" name="i_dont_exist" type="radio" value="" />
0
   def radio_button(*args)
0
     Thread.current[:view_template].radio_button(self, *args)
0
   end
0
   
0
-  # See Mack::ViewHelpers::FormHelpers select for more information
0
-  def select(*args)
0
-    Thread.current[:view_template].select(self, *args)
0
-  end
0
-  
0
-  # See Mack::ViewHelpers::FormHelpers submit for more information
0
-  def submit(*args)
0
-    Thread.current[:view_template].submit(self, *args)
0
+  # See Mack::ViewHelpers::FormHelpers select_tag for more information
0
+  # 
0
+  # Examples:
0
+  #   @user = User.new(:level => 1)
0
+  #   <%= :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>
0
+  #   <%= :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>
0
+  #   <%= :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>
0
+  def select_tag(*args)
0
+    Thread.current[:view_template].select_tag(self, *args)
0
   end
0
   
0
   # See Mack::ViewHelpers::FormHelpers text_area for more information
0
+  # 
0
+  # Examples:
0
+  #   @user = User.new(:bio => "my bio here")
0
+  #   <%= :user.text_area :bio %> # => <textarea id="user_bio" name="user[bio]">my bio here</textarea>
0
+  #   <%= :i_dont_exist.text_area %> # => <textarea id="i_dont_exist" name="i_dont_exist"></textarea>
0
+  #   <%= :i_dont_exist.text_area :value => "hi there" %> # => <textarea id="i_dont_exist" name="i_dont_exist">hi there</textarea>
0
   def text_area(*args)
0
     Thread.current[:view_template].text_area(self, *args)
0
   end

0
@@ -24,12 +24,14 @@ module Mack
0
       end
0
       
0
       def submit_tag(value = "Submit", options = {}, *original_args)
0
-        Mack.logger.warn("DEPRECATED: 'submit_tag'. Please use 'submit' instead")
0
-        submit(value, options, *original_args)
0
+        Mack.logger.warn("DEPRECATED: 'submit_tag'. Please use 'submit_button' instead")
0
+        submit_button(value, options, *original_args)
0
       end
0
       
0
-      # Builds an HTML submit tag
0
-      def submit(value = "Submit", options = {}, *original_args)
0
+      # Examples:
0
+      #   <%= submit_button %> # => <input type="submit" value="Submit" />
0
+      #   <%= submit_button "Login" %> # => <input type="submit" value="Login" />
0
+      def submit_button(value = "Submit", options = {}, *original_args)
0
         non_content_tag(:input, {:type => :submit, :value => value}.merge(options))
0
       end
0
       
0
@@ -67,7 +69,7 @@ module Mack
0
         content_tag(:label, fe.options, content)
0
       end
0
 
0
-      def select(name, *args)
0
+      def select_tag(name, *args)
0
         var = instance_variable_get("@#{name}")
0
         fe = FormElement.new(*args)
0
         options = {:name => name, :id => name}
0
@@ -107,7 +109,9 @@ module Mack
0
         fe = FormElement.new(*args)
0
         options = {:name => name, :id => name}
0
         if var.nil?
0
-          return content_tag(:textarea, options.merge(fe.options))
0
+          value = fe.options[:value]
0
+          fe.options.delete(:value)
0
+          return content_tag(:textarea, options.merge(fe.options), value)
0
         else
0
           unless fe.calling_method == :to_s
0
             options.merge!(:name => "#{name}[#{fe.calling_method}]", :id => "#{name}_#{fe.calling_method}")

0
@@ -168,30 +168,30 @@ describe Mack::ViewHelpers::FormHelpers do
0
     
0
   end
0
   
0
-  describe "select" do
0
+  describe "select_tag" do
0
     
0
     it "should create a nested select tag for a model" do
0
-      select(:cop, :level).should == %{<select id="cop_level" name="cop[level]"></select>}
0
+      select_tag(:cop, :level).should == %{<select id="cop_level" name="cop[level]"></select>}
0
     end
0
     
0
     it "should create a non-nested select tag for a simple model" do
0
-      select(:simple).should == %{<select id="simple" name="simple"></select>}
0
+      select_tag(:simple).should == %{<select id="simple" name="simple"></select>}
0
     end
0
     
0
     it "should build the options from a given array of arrays" do
0
-      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>}
0
+      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>}
0
     end
0
     
0
     it "should build the options from a given hash" do
0
-      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>}
0
+      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>}
0
     end
0
     
0
     it "should mark an option as selected if the model has it seleceted" do
0
-      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>}
0
+      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>}
0
     end
0
     
0
     it "should mark an option as selected if the selected options is available" do
0
-      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>}
0
+      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>}
0
     end
0
     
0
   end
0
@@ -208,6 +208,7 @@ describe Mack::ViewHelpers::FormHelpers do
0
     
0
     it "should create a non-nested text_area for just a symbol" do
0
       text_area(:unknown).should == %{<textarea id="unknown" name="unknown"></textarea>}
0
+      text_area(:unknown, :value => "hi there").should == %{<textarea id="unknown" name="unknown">hi there</textarea>}
0
     end
0
 
0
     it "should create a nested text_area for a model with an empty value if value is false" do
0
@@ -278,18 +279,18 @@ Hello
0
     
0
   end
0
   
0
-  describe "submit" do
0
+  describe "submit_button" do
0
     
0
     it "should build a simple submit tag" do
0
-      submit.should == %{<input type="submit" value="Submit" />}
0
+      submit_button.should == %{<input type="submit" value="Submit" />}
0
     end
0
     
0
     it "should allow you to change the value" do
0
-      submit("Login").should == %{<input type="submit" value="Login" />}
0
+      submit_button("Login").should == %{<input type="submit" value="Login" />}
0
     end
0
     
0
     it "should take options" do
0
-      submit("Login", {:class => :foo}).should == %{<input class="foo" type="submit" value="Login" />}
0
+      submit_button("Login", {:class => :foo}).should == %{<input class="foo" type="submit" value="Login" />}
0
     end
0
     
0
   end