@@ -287,22 +287,14 @@ module Merb::Helpers::Form::Builder super end - # Provides a generic HTML label. - # - # ==== Parameters - # attrs<Hash>:: HTML attributes - # - # ==== Returns - # String:: HTML - # - # ==== Example - # <%= label :for => "name", :label => "Full Name" %> - # => <label for="name">Full Name</label> - def label(attrs) - attrs ||= {} - for_attr = attrs[:id] ? {:for => attrs[:id]} : {} - if label_text = attrs.delete(:label) - tag(:label, label_text, for_attr) + 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]} : {} + tag(:label, contents, for_attr) else "" end merb_helpers/lib/merb_helpers/form/builder.rb @@ -149,6 +149,21 @@ module Merb::Helpers::Form end end + # Provides a generic HTML label. + # + # ==== Parameters + # attrs<Hash>:: HTML attributes + # + # ==== Returns + # String:: HTML + # + # ==== Example + # <%= label "Full Name", :for => "name" %> + # => <label for="name">Full Name</label> + def label(*args) + current_form_context.label(*args) + end + # Provides a HTML text input tag # # ==== Parameters merb_helpers/lib/merb_helpers/form/helpers.rb @@ -1011,6 +1011,15 @@ describe "fieldset" do end end +describe "label" do + it_should_behave_like "FakeController" + + it "should render a label tag" do + result = label("First Name", :id => "user_first_name") + result.should match_tag(:label, :for => "user_first_name", :content => "First Name") + end +end + describe "file_field" do it_should_behave_like "FakeController" merb_helpers/spec/merb_helpers_form_spec.rb a269b9b92ca1fc4acc14dce60202fc8d8a6e2aa8 Michael Sheakoski michael@Michaels-iMac.local http://github.com/wycats/merb-plugins/commit/91c5f336e898b06c0a811eb827f58c61d8c513da 91c5f336e898b06c0a811eb827f58c61d8c513da 2008-09-05T17:00:29-07:00 2008-09-05T17:00:29-07:00 Added a public #label helper. Specs provided by Bryan Ray. Closes #155 9003fe9a64abb51b2c6c302172fccdaaa67f99c0 Michael Sheakoski michael@Michaels-iMac.local