Labelled can now take an attribute hash; improved the docs slightly a…

…nd got rid of a warning;

lib/campo/campo.rb

@@ -281,12 +281,14 @@ def output( n=0, tab=2 )
 
 
     # Bit of a convenience method for adding a label around any element.
-    # @param [String] inner The text for the label.
+    # @param [String] :inner The text for the label.
+    # @param [Hash] :attributes Attributes for the label.
     # @return [Base]
-    def labelled( inner=nil )
+    # @see Label#initialize
+    def labelled( inner=nil, attributes={} )
       inner ||= self.attributes[:name].gsub(/\[\]/, "").gsub("_"," ").capitalize
       parent = self.parent
-      label = Label.new( %Q!#{@attributes[:id]}!, inner ) << self
+      label = Label.new( %Q!#{@attributes[:id]}!, inner, attributes ) << self
       retval = if parent.nil?
         label
       else
@@ -540,7 +542,7 @@ def option( *args )
 
     # Adds a default selection to a select list. By default it is disabled.
     # @param [String,nil] The display string for the option. Default is "Choose one:".
-    # @param [Hash,nil] attributes Attributes for the option. Defaults to {disabled: "disabled"}, pass in an empty hash to override (or a filled one), or nil for the default.
+    # @param [Hash,nil] attributes Attributes for the option. Defaults to Hash[ :disabled => "disabled" ], pass in an empty hash to override (or a filled one), or nil for the default.
     # @example 
     #     As a default:
     #     form.select("teas").with_default.option("ceylon")

spec/campo_spec.rb

@@ -40,7 +40,7 @@ module Campo
       context "Given no form" do
         context "When given a select field with options" do
           let(:expected) { %q!
-%label{ for: "teas",  }
+%label{ class: "list", for: "teas",  }
   Favourite tea:
   %select{ atts[:teas], tabindex: "#{@campo_tabindex += 1}", id: "teas", name: "teas",  }
     %option{ atts[:teas_default], id: "teas_default", value: "", disabled: "disabled", name: "teas",  }Choose one:
@@ -51,7 +51,7 @@ module Campo
           }
           let(:tag) {
             select = Campo::Select.new( "teas" )
-            tag = select.with_default.option("ceylon").option("breakfast").option("earl grey").labelled("Favourite tea:") 
+            tag = select.with_default.option("ceylon").option("breakfast").option("earl grey").labelled("Favourite tea:", class: "list") 
             tag
           }
           subject { Campo.output tag, :partial=>true }