Changeset 746

Timestamp:

10/14/07 19:40:35 (1 year ago)

Author:

wyca..@gmail.com

Message:

Fixes various bugs in form_helpers

Files:

• plugins/merb_helpers/lib/form_helpers.rb (modified) (9 diffs)
• plugins/merb_helpers/specs/merb_helpers_spec.rb (modified) (17 diffs)
• plugins/merb_helpers/specs/spec_helper.rb (modified) (5 diffs)

plugins/merb_helpers/lib/form_helpers.rb

@@ -1 @@
-class Hash
-  
-  def to_html_attributes
-    map do |k,v|
-      "#{k.to_s.camelize.downcase}=\"#{v}\""
-    end.join(" ")
-  end
-  
-  def add_html_class!(html_class)
-    if self[:class]
-      self[:class] = "#{self[:class]} #{html_class}"
-    else
-      self[:class] = html_class
-    end
-  end
-  
-end
-
-module Merb
-  module Helpers
@@ -36 +18 @@
-      end
-      
-      def open_tag(name, attrs = nil)
-        "<#{name}#{' ' + attrs.to_html_attributes if attrs}>"
-      end
-      
-      def self_closing_tag(name, attrs = nil)
-        "<#{name}#{' ' + attrs.to_html_attributes if attrs}/>"
-      end
-      
-      def form_tag(attrs = {}, &block)
+        attrs.merge!( :enctype => "multipart/form-data" ) if attrs.delete(:multipart)
+        fake_form_method = set_form_method(attrs)
-        concat(open_tag("form", attrs), block.binding)
+        concat(generate_fake_form_method(fake_form_method), block.binding) if fake_form_method
-        concat(capture(&block), block.binding)
-        concat("</form>", block.binding)
-      end
-      
-
+
+
-        concat(open_tag("form", attrs), block.binding)
+        concat(generate_fake_form_method(fake_form_method), block.binding) if fake_form_method
-        fields_for(obj, attrs, &block)
-        concat("</form>", block.binding)
@@ -58 +37 @@
-      def fields_for(obj, attrs=nil, &block)
-        old_obj, @_obj = @_obj, instance_variable_get("@#{obj}")
-obj
+"#{@_obj.class}".snake_case
-        old_block, @_block = @_block, block
-        
@@ -66 +45 @@
-      end
-      
-
+control_
-        "#{@_object_name}[#{col}]"
-      end
-      
-
+control_
-        @_obj.send(col)
-      end
-      
-
-name(col), :value => 
+control_
+control_name(col), :value => control_
-      end
-      
-      def text_control(col, attrs = {})
-        errorify_field(attrs, col)
-
+control_
-      end
-      
-      def text_field(attrs = {})
-        attrs.merge!(:type => "text")
-self_closing_tag("input", attrs)
+add_field_label(attrs){self_closing_tag("input", attrs)}
-      end
-      
@@ -93 +72 @@
-        attrs.merge!(:value => val ? "1" : "0")
-        attrs.merge!(:checked => "checked") if val
-
+control_
-      end
-      
@@ -99 +78 @@
-        attrs.merge!(:type => :checkbox)
-        attrs.add_html_class!("checkbox")
-self_closing_tag("input", attrs)
+add_field_label(attrs){self_closing_tag("input", attrs)}
-      end
-      
-      def hidden_control(col, attrs = {})
+        attrs.delete(:label)
-        errorify_field(attrs, col)
-
+control_
-      end
-      
-      def hidden_field(attrs = {})
+        attrs.delete(:label)
-        attrs.merge!(:type => :hidden)
-        self_closing_tag("input", attrs)
@@ -117 +98 @@
-        ret = ""
-        options.each do |opt|
-
+, :label => opt
-          hash.merge!(:selected => "selected") if val.to_s == opt.to_s
-          ret << radio_field(hash)
@@ -127 +108 @@
-        attrs.merge!(:type => "radio")
-        attrs.add_html_class!("radio")
-self_closing_tag("input", attrs)
+add_field_label(attrs){self_closing_tag("input", attrs)}
-      end
-      
-      def text_area_control(col, attrs = {})
+        attrs ||= {}
-        errorify_field(attrs, col)
-value(col), attrs.merge(:name => 
+control_value(col), attrs.merge(:name => control_
-      end
-      
-      def text_area_field(val, attrs = {})
-
-
-
+
+
+
+
+
+
-      end
-      
@@ -147 +132 @@
-
-      def errorify_field(attrs, col)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-      

plugins/merb_helpers/specs/merb_helpers_spec.rb

@@ -39 +39 @@
-  it_should_behave_like "FakeBufferConsumer"
-  
+  it "should use the post method by default" do
+    form_tag do
+      _buffer << "CONTENT"
+    end
+    _buffer.should match_tag(:form, :method => "post")
+    _buffer.should include("CONTENT")
+  end
+  
+  it "should use the get method if set" do
+    form_tag :method => :get do
+      _buffer << "CONTENT"
+    end
+    _buffer.should match_tag(:form, :method => "get")
+    _buffer.should include("CONTENT")        
+  end
+  
+  it "should fake out the put method if set" do
+    form_tag :method => :put do
+      _buffer << "CONTENT"
+    end
+    _buffer.should match_tag(:form, :method => "post")
+    _buffer.should match_tag(:input, :type => "hidden", :name => "_method", :value => "put")    
+  end
+  
+  it "should fake out the delete method if set" do
+    form_tag :method => :delete do
+      _buffer << "CONTENT"
+    end
+    _buffer.should match_tag(:form, :method => "post")
+    _buffer.should match_tag(:input, :type => "hidden", :name => "_method", :value => "delete")
+  end
+  
+  it "should silently set method to post if an unsupported method is used" do
+      form_tag :method => :dodgy do
+        _buffer << "CONTENT"
+      end
+      _buffer.should match_tag(:form, :method => "post")
+      _buffer.should_not match_tag(:input, :type => "hidden", :name => "_method", :value => "dodgy")
+  end
+  
-  it "should take create a form" do
-"POST"
+:post
-      _buffer << "Hello"
-    end
-POST
+post
-    _buffer.should include("Hello")
+  end
+  
+  it "should set a form to be mutlipart" do
+    form_tag( :action => "foo", :method => :post, :multipart => true ) do
+      _buffer << "CONTENT"
+    end
+    _buffer.should match_tag( :form, :action => "foo", :method => "post", :enctype => "multipart/form-data")
+    _buffer.should include("CONTENT")  
-  end
-end
@@ -53 +101 @@
-  it "should wrap the contents in a form tag" do
-    form_for(:obj) do
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-end
-
@@ -64 +129 @@
-  it "should dump the contents in the context of the object" do
-    fields_for(:obj) do
-
-
-
+
+
+
+
-  end  
-
@@ -74 +140 @@
-      text_control(:foo).should match_tag(:input, :type => "text", :value => "foowee")      
-      fields_for(:obj2) do
-
+name => "fake_model2[foo]", :
-      end
-      text_control(:foo).should match_tag(:input, :type => "text", :value => "foowee")      
-    end
-  end
+  
+  it "should handle an explicit nil attribute" do
+    fields_for(:obj, nil) do
+      _buffer << text_control(:foo)
+    end
+    _buffer.should match_tag(:input, :name => "fake_model[foo]", :value => "foowee", :type => "text")
+  end
+  
-end
-
-describe "text_field (basic)" do
+  it_should_behave_like "FakeBufferConsumer"
+  
-  it "should return a basic text field based on the values passed in" do
-    text_field(:name => "foo", :value => "bar").should match_tag( :input, :type => "text", :name => "foo", :value => "bar")
-  end
+  
+  it "should wrap the field in a label if the :label option is passed to the text_field" do
+    result = text_field(:label => "LABEL" )
+    result.should match(/<label>LABEL<input type="text"\s*\/><\/label>/)
+  end
-end
-
@@ -92 +173 @@
-  it "should take a string object and return a useful text control" do
-    f = form_for :obj do
-obj
+fake_model
-    end
-  end
@@ -98 +179 @@
-  it "should take additional attributes and use them" do
-    form_for :obj do
-
-
+
+
+
+
+
+
+
+
+
+
+
-  end
-end
@@ -106 +196 @@
-  it "should return a basic checkbox based on the values passed in" do
-    checkbox_field(:name => "foo", :checked => "checked").should match_tag(:input, :class => "checkbox", :name => "foo", :checked => "checked")
+  end
+  
+  it "should wrap the checkbox_field in a label if the :label option is passed in" do
+    result = checkbox_field(:label => "LABEL" )
+    result.should match(/<label>LABEL<input/)
+    res = result.scan(/<[^>]*>/)
+    res[2].should_not match_tag(:input, :label => "LABEL")
-  end
-end
@@ -114 +211 @@
-  it "should take a string and return a useful checkbox control" do
-    form_for :obj do
-obj
-obj
+fake_model
+fake_model
-    end
-  end
@@ -121 +218 @@
-  it "should render controls with errors if their attribute contains an error" do
-    form_for :obj do
-obj
+fake_model
-        :class => "error checkbox", :value => "1", :checked => "checked")
-obj
+fake_model
-        :class => "error checkbox", :value => "0")        
-    end
-
-
+
+
+
+
+
+
+
+
+
+
-end
-
@@ -135 +240 @@
-    hidden_field(:name => "foo", :value => "bar").should match_tag(:input, :type => "hidden", :name => "foo", :value => "bar")
-  end
+  
+  it "should not render a label if the :label option is passed in" do
+    res = hidden_field(:label => "LABEL")
+    res.should_not match(/<label>LABEL/)
+    res.should_not match_tag(:input, :label=> "LABEL")  
+  end
-end
-
@@ -141 +252 @@
-    
-  it "should take a string and return a useful checkbox control" do
-
-obj
+ 
+fake_model
-    end
-  end
@@ -148 +259 @@
-  it "should render controls with errors if their attribute contains an error" do
-    form_for :obj do
-
+
+
+
+
+
+
+
+
+
-    end
-  end
@@ -158 +277 @@
-    radio_field(:name => "foo", :value => "bar").should match_tag(:input, :type => "radio", :name => "foo", :value => "bar")
-  end
+  
+  it "should render a label when the label is passed in" do
+    result = radio_field(:name => "foo", :value => "bar", :label => "LABEL")
+    result.should match(/<label>LABEL<input/)
+    res = result.scan(/<[^>]*>/)
+    res[2].should_not match_tag(:input, :label => "LABEL")
+  end
+  
-end
-
@@ -166 +293 @@
-    form_for :obj do
-      radio = radio_group_control(:foo, [:foowee, :baree]).scan(/<[^>]*>/)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end
-  end
@@ -174 +311 @@
-
-describe "text area (basic)" do
-  # include TagMatchers
-  it "should should return a basic text area based on the values passed in" do
-    text_area_field("foo", :name => "foo").should match_tag(:textarea, :name => "foo")
-  end
+  
+  it "should handle a nil content" do
+    text_area_field(nil, :name => "foo").should == "<textarea name=\"foo\"></textarea>"
+  end
+  
+  it "should handle a nil attributes hash" do
+    text_area_field("CONTENT", nil).should == "<textarea>CONTENT</textarea>"
+  end
+  
+  it "should render a label when the label is passed in" do
+    result = text_area_field( "CONTENT", :name => "foo", :value => "bar", :label => "LABEL")
+    result.should match(/<label>LABEL<textarea/)
+    res = result.scan(/<[^>]*>/)
+    res[1].should_not match_tag(:textarea, :label => "LABEL")
+  end
-end
-
@@ -187 +338 @@
-      ta = text_area_control(:foo)
-      tab = text_area_control(:foobad)
-obj
-obj
+fake_model
+fake_model
-      ta.should include("foowee")
-    end
-  end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-describe "submit_button" do
@@ -202 +399 @@
-  end
-end
+
+describe "label helpers" do
+  it_should_behave_like "FakeBufferConsumer"
+  
+  it "should add a label to arbitrary markup in a template" do
+    result = add_label("Name:"){ _buffer << text_field(:name => "name_value") }
+    result.should == "<label>Name:<input type=\"text\" name=\"name_value\"/></label>"
+    
+  end
+  
+  it "should add a label to a text returning helper" do
+    form_for(:obj) do
+      _buffer << add_field_label({:label => "LABEL"}){ text_control(:foo) }
+    end
+    _buffer.should match(/<label>LABEL<input .+\/><\/label>/)
+  end
+  
+end
+

plugins/merb_helpers/specs/spec_helper.rb

@@ -3 +3 @@
-require 'rubygems'
-require 'merb'
-
+# 
-
-class FakeModel
@@ -22 +22 @@
-  end
-  
+  def new_record?
+    false
+  end
+  
-  def errors
-    FakeErrors.new(self)
@@ -29 +33 @@
-    "foowee"
-  end
+  
-  alias_method :foobad, :foo
-  
@@ -45 +50 @@
-  end
-  alias_method :batbad, :bat
+  
+  def nothing
+    nil
+  end
-end
-
@@ -53 +62 @@
-  end
-  alias_method :foobad, :foo
+  
+  def new_record?
+    true
+  end
-  
-end