Changeset 947

Timestamp:

11/11/07 02:47:01 (1 year ago)

Author:

luke.sutt..@gmail.com

Message:

Add password_control and password_field helpers.

Files:

• plugins/merb_helpers/lib/form_helpers.rb (modified) (1 diff)
• plugins/merb_helpers/specs/merb_helpers_spec.rb (modified) (1 diff)

plugins/merb_helpers/lib/form_helpers.rb

@@ -77 +77 @@
-      end
-      
+      def password_control(col, attrs = {})
+        attrs.merge!(:name => control_name(col))
+        errorify_field(attrs, col)
+        password_field(control_name_value(col, attrs))
+      end
+      
+      def password_field(attrs = {})
+        attrs.delete(:value)
+        attrs.merge!(:type => 'password')
+        optional_label(attrs) { self_closing_tag("input", attrs) }
+      end
+      
-      # translate column values from the db to boolean
-      # nil, false, 0 and '0' are false. All others are true

plugins/merb_helpers/specs/merb_helpers_spec.rb

@@ -193 +193 @@
-end
-
+describe "password_field (basic)" do
+  it_should_behave_like "FakeBufferConsumer"
+  
+  it "should return a basic password field, but omit the value" do
+    password_field(:name => "foo", :value => "bar").should match_tag(:input, :type => "password", :name => "foo")
+  end
+  
+  it "should wrap the field in a label if the :label option is passed to the text_field" do
+    result = password_field(:label => "LABEL" )
+    result.should match(/<label>LABEL<input type="password"\s*\/><\/label>/)
+  end
+end
+
+describe "password_control (data bound)" do
+  it_should_behave_like "FakeBufferConsumer"
+  
+  it "should take a string object and return a useful password control, but omit the value" do
+    f = form_for :obj do
+      password_control(:foo).should match_tag(:input, :type => "password", :name => "fake_model[foo]")
+    end
+  end
+
+  it "should take additional attributes and use them" do
+    form_for :obj do
+      password_control(:foo, :bar => "7").should match_tag(:input, :type => "password", :name => "fake_model[foo]", :bar => "7")
+    end
+  end
+  
+  it "should wrap the text_control in a label if the :label option is passed in" do
+    form_for :obj do
+      _buffer << password_control(:foo, :label => "LABEL")
+    end
+    _buffer.should match(/<label>LABEL<input/)
+    res = _buffer.scan(/<[^>]*>/)
+    res[2].should_not match_tag(:input, :label => "LABEL")
+  end
+end
+
-describe "checkbox_field (basic)" do
-  it "should return a basic checkbox based on the values passed in" do