Changeset 1028

Timestamp:

11/20/07 06:20:45 (11 months ago)

Author:

jimfree..@gmail.com

Message:

Added submit_field and ability to set attributes on the checkbox auto added input.

Files:

• plugins/merb_helpers/lib/form_helpers.rb (modified) (7 diffs)
• plugins/merb_helpers/specs/merb_helpers_spec.rb (modified) (2 diffs)

plugins/merb_helpers/lib/form_helpers.rb

@@ -166 +166 @@
-      def text_control(col, attrs = {})
-        errorify_field(attrs, col)
+        attrs.merge!(:id => control_id(col))
-        text_field(control_name_value(col, attrs))
-      end
@@ -214 +215 @@
-      # ==== Example
-      #     <%= checkbox_control :is_activated, :label => "Activated?" %>
-
+, hidden_attrs={}
-        errorify_field(attrs, col)
-        attrs.merge!(:checked => "checked") if col_val_to_bool(@_obj.send(col))
-
+
+
-      end
-
@@ -224 +226 @@
-      # ==== Example
-      #     <% checkbox_field :name => "is_activated", :value => "1" %>
-
+, hidden_attrs={}
-        on            = attrs.delete(:on)  || 1
-        off           = attrs.delete(:off) || 0
@@ -230 +232 @@
-        attrs.merge!(:type => :checkbox)
-        attrs.add_html_class!("checkbox")
-:name => attrs[:name], :value => off
+{:name => attrs[:name], :value => off}.merge(hidden_attrs)
-      end
-      
@@ -244 +246 @@
-        attrs.delete(:label)
-        errorify_field(attrs, col)
+        attrs[:class] ||= "hidden"
-        hidden_field(control_name_value(col, attrs))
-      end
@@ -486 +489 @@
-      end
-      
+      def submit_field(attrs = {})
+        attrs.merge!(:type => :submit)
+        attrs[:name] ||= "submit"
+        self_closing_tag("input", attrs)
+      end
+      
-      private
-      # Fake out the browser to send back the method for RESTful stuff.
@@ -506 +515 @@
-        if label
-          title = label.is_a?(Hash) ? label.delete(:title) : label
-name].blank? ? {} : {:for => attrs[:name
-
+id].blank? ? {} : {:for => attrs[:id
+.merge(named)
-        else
-          yield

plugins/merb_helpers/specs/merb_helpers_spec.rb

@@ -249 +249 @@
-  it "should take a string and return a useful checkbox control" do
-    form_for :obj do
-
+, :id => "fake_model_baz"
-      checkbox_control(:bat).should match_tag(:input, :type =>"checkbox", :name => "fake_model[bat]", :class => "checkbox", :value => "0")
-    end
@@ -559 +559 @@
-end
-
+describe "submit_field (basic)" do
+  it "should return a basic submit input based on the values passed in" do
+    submit_field(:name => "foo", :value => "bar").should match_tag(:input, :type => "submit", :name => "foo", :value => "bar")
+  end
+  
+  it "should provide an additional label tag if the :label option is passed in" do
+    result = submit_field(:value => "foo", :label => "LABEL")
+    result.should match(/<input.*type="submit"/)
+    result.should match(/<input.*name="submit"/)
+    result.should match(/<input.*value="foo"/)
+    result.should match(/<input.*label="LABEL"/)
+  end
+end