merb-helpers 1.0.6.1 → 1.0.7

data/lib/merb-helpers/form/builder.rb

@@ -291,33 +291,44 @@ module Merb::Helpers::Form::Builder
 
   class Form < Base
     def label(contents, attrs = {})
-      if contents.is_a?(Hash)
-        attrs    = contents
-        contents = attrs.delete(:label)
-      end
       if contents
-        for_attr = attrs[:id] ? {:for => attrs[:id]} : {}
         if contents.is_a?(Hash)
-          attrs = contents
-          contents = attrs.delete(:title)
-          for_attr = for_attr.merge(attrs)
+          label_attrs = contents
+          contents = label_attrs.delete(:title)
+        else
+          label_attrs = attrs
         end
-        tag(:label, contents, for_attr)
+        tag(:label, contents, label_attrs)
       else
         ""
       end
     end
-
+    
     %w(text password file).each do |kind|
       self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def unbound_#{kind}_field(attrs = {})
-          label(attrs) + super
+          unbound_label(attrs) + super
         end
       RUBY
     end
+    
+    def unbound_label(attrs = {})
+      if attrs[:id]
+        label_attrs = {:for => attrs[:id]}
+      else
+        label_attrs = {}
+      end
+
+      label_option = attrs.delete(:label)
+      if label_option.is_a? Hash
+        label(label_attrs.merge(label_option))
+      else
+        label(label_option, label_attrs)
+      end
+    end
 
     def unbound_check_box(attrs = {})
-      label_text = label(attrs)
+      label_text = unbound_label(attrs)
       super + label_text
     end
 
@@ -327,24 +338,24 @@ module Merb::Helpers::Form::Builder
     end
 
     def unbound_radio_button(attrs = {})
-      label_text = label(attrs)
+      label_text = unbound_label(attrs)
       super + label_text
     end
 
     def unbound_select(attrs = {})
-      label(attrs) + super
+      unbound_label(attrs) + super
     end
 
     def unbound_text_area(contents, attrs = {})
-      label(attrs) + super
+      unbound_label(attrs) + super
     end
 
     def button(contents, attrs = {})
-      label(attrs) + super
+      unbound_label(attrs) + super
     end
 
     def submit(value, attrs = {})
-      label(attrs) + super
+      unbound_label(attrs) + super
     end
 
     private

data/spec/fixture/app/views/label_specs/basic.html.erb

@@ -1 +1 @@
-<%= label "First Name", :id => "user_first_name" %>
+<%= label "First Name", :for => "user_first_name" %>

data/spec/fixture/app/views/label_specs/basic_with_attributes.html.erb

@@ -0,0 +1 @@
+<%= label "Email Me", :style => "display:none", :rel => "tooltip" %>

data/spec/fixture/app/views/label_specs/basic_with_class.html.erb

@@ -0,0 +1 @@
+<%= label "Last Name", :class => "name_class" %>

data/spec/merb.main.pid

@@ -1 +1 @@
-25322
+2424

data/spec/merb_helpers_form_spec.rb

@@ -1050,6 +1050,17 @@ describe "label" do
     r = @c.render :basic
     r.should have_selector("label[for=user_first_name]:contains('First Name')")
   end
+
+  it "should render a label tag with a :class attribute set" do
+    r = @c.render :basic_with_class
+    r.should have_selector("label[class=name_class]")
+  end
+
+  it "should render a label tag with both rel and style attributes set" do
+    r = @c.render :basic_with_attributes
+    r.should have_selector("label[rel=tooltip][style='display:none']")
+  end
+
 end
 
 describe "file_field" do

data/spec/merb_test.log

@@ -61,3 +61,87 @@
  ~ {:after_filters_time=>6.0e-06, :dispatch_time=>0.000648, :before_filters_time=>5.0e-06, :action_time=>0.000453}
  ~ 
 
+ ~ Compiling routes...
+ ~ Started request handling: Sun Dec 28 15:34:54 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"tag_with_content", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>2.7e-05, :dispatch_time=>0.001595, :before_filters_time=>2.8e-05, :action_time=>0.001066}
+ ~ 
+
+ ~ Started request handling: Sun Dec 28 15:34:54 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"tag_with_content_in_the_block", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>9.0e-06, :dispatch_time=>0.001147, :before_filters_time=>1.3e-05, :action_time=>0.000678}
+ ~ 
+
+ ~ Started request handling: Sun Dec 28 15:34:54 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"tag_with_attributes", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>9.0e-06, :dispatch_time=>0.000981, :before_filters_time=>1.1e-05, :action_time=>0.000637}
+ ~ 
+
+ ~ Started request handling: Sun Dec 28 15:34:54 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"nested_tags", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>8.0e-06, :dispatch_time=>0.001034, :before_filters_time=>1.0e-05, :action_time=>0.000735}
+ ~ 
+
+ ~ Compiling routes...
+ ~ Started request handling: Sun Dec 28 15:35:38 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"tag_with_content", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>1.4e-05, :dispatch_time=>0.0009, :before_filters_time=>1.5e-05, :action_time=>0.000615}
+ ~ 
+
+ ~ Started request handling: Sun Dec 28 15:35:38 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"tag_with_content_in_the_block", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>4.0e-06, :dispatch_time=>0.000585, :before_filters_time=>6.0e-06, :action_time=>0.000357}
+ ~ 
+
+ ~ Started request handling: Sun Dec 28 15:35:38 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"tag_with_attributes", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>5.0e-06, :dispatch_time=>0.000523, :before_filters_time=>5.0e-06, :action_time=>0.000346}
+ ~ 
+
+ ~ Started request handling: Sun Dec 28 15:35:38 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"nested_tags", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>6.0e-06, :dispatch_time=>0.000693, :before_filters_time=>7.0e-06, :action_time=>0.000497}
+ ~ 
+
+ ~ Compiling routes...
+ ~ Started request handling: Sun Dec 28 15:56:42 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"tag_with_content", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>2.9e-05, :dispatch_time=>0.001609, :before_filters_time=>1.8e-05, :action_time=>0.001234}
+ ~ 
+
+ ~ Started request handling: Sun Dec 28 15:56:42 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"tag_with_content_in_the_block", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>6.0e-06, :dispatch_time=>0.000784, :before_filters_time=>9.0e-06, :action_time=>0.0005}
+ ~ 
+
+ ~ Started request handling: Sun Dec 28 15:56:42 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"tag_with_attributes", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>7.0e-06, :dispatch_time=>0.001473, :before_filters_time=>1.2e-05, :action_time=>0.000754}
+ ~ 
+
+ ~ Started request handling: Sun Dec 28 15:56:42 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"nested_tags", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>1.5e-05, :dispatch_time=>0.002152, :before_filters_time=>1.9e-05, :action_time=>0.001482}
+ ~ 
+
+ ~ Compiling routes...
+ ~ Started request handling: Sun Dec 28 16:32:08 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"tag_with_content", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>1.7e-05, :dispatch_time=>0.001518, :before_filters_time=>1.4e-05, :action_time=>0.001218}
+ ~ 
+
+ ~ Started request handling: Sun Dec 28 16:32:08 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"tag_with_content_in_the_block", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>5.0e-06, :dispatch_time=>0.000514, :before_filters_time=>5.0e-06, :action_time=>0.000269}
+ ~ 
+
+ ~ Started request handling: Sun Dec 28 16:32:08 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"tag_with_attributes", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>4.0e-06, :dispatch_time=>0.00042, :before_filters_time=>5.0e-06, :action_time=>0.000234}
+ ~ 
+
+ ~ Started request handling: Sun Dec 28 16:32:08 -0800 2008
+ ~ Params: {"format"=>nil, "action"=>"nested_tags", "id"=>nil, "controller"=>"tag_helper"}
+ ~ {:after_filters_time=>5.0e-06, :dispatch_time=>0.00055, :before_filters_time=>1.0e-05, :action_time=>0.000352}
+ ~ 
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-helpers
 version: !ruby/object:Gem::Version 
-  version: 1.0.6.1
+  version: 1.0.7
 platform: ruby
 authors: 
 - Michael D. Ivey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-16 00:00:00 -08:00
+date: 2008-12-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.6.1
+        version: 1.0.7
     version: 
 description: Helper support for Merb
 email: ivey@gweezlebur.com
@@ -210,6 +210,8 @@ files:
 - spec/fixture/app/views/hidden_field_specs/label.html.erb
 - spec/fixture/app/views/label_specs
 - spec/fixture/app/views/label_specs/basic.html.erb
+- spec/fixture/app/views/label_specs/basic_with_attributes.html.erb
+- spec/fixture/app/views/label_specs/basic_with_class.html.erb
 - spec/fixture/app/views/layout
 - spec/fixture/app/views/layout/application.html.erb
 - spec/fixture/app/views/numeric_ext_specs