@@ -2,8 +2,5 @@ require 'labeling_form_builder' require 'labeling_form_tag_helper' class ActionView::Base - # Use to overwrite the default, non-instance based form helpers. - def self.enable_labeling_form_tag_helper! - ActionView::Helpers::FormTagHelper.module_eval { include LabelingFormTagHelper } - end + include LabelingFormHelperHelper end init.rb @@ -21,23 +21,6 @@ class LabelingFormBuilder < ActionView::Helpers::FormBuilder label[:text] ||= args.first.to_s.humanize render_label_and_tag label, unlabeled_tag, @template - - # if label[:wrap] - # label_and_tag = if label[:after] or :after == label[:wrap] - # [unlabeled_tag, label[:text]] - # else - # [label[:text], unlabeled_tag] - # end.join("\n") - # - # @template.content_tag(:label, label_and_tag, label_html) - # - # elsif label[:after] - # unlabeled_tag + @template.content_tag(:label, label[:text], label_html) - # - # else - # @template.content_tag(:label, label[:text], label_html) + unlabeled_tag - # - # end end end lib/labeling_form_builder.rb @@ -1,81 +1,65 @@ -require 'labeling_form_helper_helper' - -module ActionView::Helpers::FormTagHelper - include LabelingFormHelperHelper - - # A list of labelable helpers. - # We exclude password and file fields because they use a text field, - # so we would get double labels including them in the list. - def self.labelable #:nodoc: - public_instance_methods. - reject { |h| h =~ /form|submit|hidden|password|file/ || h =~ /_with(out)?_label/ }. - map(&:to_sym) - end - - labelable.each do |helper| - define_method "#{helper}_with_label" do |*args| - label = extract_label_options! args - - handle_disparate_args! helper, args - - unlabeled_tag = send "#{helper}_without_label", *args - return unlabeled_tag unless label - - name = args.first.to_s - label[:text] ||= name.humanize - label[:for] ||= name.gsub(/[^a-z0-9_-]+/, '_').gsub(/^_+|_+$/, '') - - render_label_and_tag label, unlabeled_tag - - # if label[:wrap] - # label_and_tag = if label[:after] or :after == label[:wrap] - # [unlabeled_tag, label[:text]] - # else - # [label[:text], unlabeled_tag] - # end.join - # - # content_tag(:label, label_and_tag, label_html) - # - # elsif label[:after] - # unlabeled_tag + content_tag(:label, label[:text], label_html) - # - # else - # content_tag(:label, label[:text], label_html) + unlabeled_tag - # end - end - - alias_method_chain helper, :label - end - -private - # We want to account for certain optional arguments - # that can occur before the options hash in the unlabeled helpers. - # - # Specifically, we want to be able to ignore them and say things like: - # check_box_tag :bulk_delete, :label => 'get outta here' - def handle_disparate_args!(helper, args) #:nodoc: - # Ignore the options hash, if present, until we are done munging the args. - options = args.pop if args.last.is_a? Hash - - if args.size == 1 - if check_or_radio?(helper) - args.insert 1, 1 - # Everything except :file_field_tag takes something as its second - # argument which can be safely defaulted to +nil+. - elsif helper != :file_field_tag - args.insert 1, nil - end - end - - # :check_box_tag and :radio_button_tag can take another argument - # to determine if they are 'checked' or not. - if (2 == args.size) and check_or_radio?(helper) - args.insert 2, false - end - - # Reunite the options with the rest of the args. - args << options if options - - args - end +require 'labeling_form_helper_helper' + +module ActionView::Helpers::FormTagHelper + include LabelingFormHelperHelper + + # A list of labelable helpers. + # We exclude password and file fields because they use a text field, + # so we would get double labels including them in the list. + def self.labelable #:nodoc: + public_instance_methods. + reject { |h| h =~ /form|submit|hidden|password|file/ || h =~ /_with(out)?_label/ }. + map(&:to_sym) + end + + labelable.each do |helper| + define_method "#{helper}_with_label" do |*args| + label = extract_label_options! args + + handle_disparate_args! helper, args + + unlabeled_tag = send "#{helper}_without_label", *args + return unlabeled_tag unless label + + name = args.first.to_s + label[:text] ||= name.humanize + label[:for] ||= name.gsub(/[^a-z0-9_-]+/, '_').gsub(/^_+|_+$/, '') + + render_label_and_tag label, unlabeled_tag + end + + alias_method_chain helper, :label + end + +private + # We want to account for certain optional arguments + # that can occur before the options hash in the unlabeled helpers. + # + # Specifically, we want to be able to ignore them and say things like: + # check_box_tag :bulk_delete, :label => 'get outta here' + def handle_disparate_args!(helper, args) #:nodoc: + # Ignore the options hash, if present, until we are done munging the args. + options = args.pop if args.last.is_a? Hash + + if args.size == 1 + if check_or_radio?(helper) + args.insert 1, 1 + # Everything except :file_field_tag takes something as its second + # argument which can be safely defaulted to +nil+. + elsif helper != :file_field_tag + args.insert 1, nil + end + end + + # :check_box_tag and :radio_button_tag can take another argument + # to determine if they are 'checked' or not. + if (2 == args.size) and check_or_radio?(helper) + args.insert 2, false + end + + # Reunite the options with the rest of the args. + args << options if options + + args + end end \ No newline at end of file lib/labeling_form_tag_helper.rb a0ad4badb5d015ffee6e3b0116b148ef408818ed Seth Thomas Rasmussen sethrasmussen@gmail.com http://github.com/greatseth/labeling-form-helper/commit/0c335711cd9e91958d5aa00e013e2818df1d027a 0c335711cd9e91958d5aa00e013e2818df1d027a 2007-10-23T14:56:27-07:00 2007-10-23T14:56:27-07:00 remove dead shit, fix bug with helper helpers git-svn-id: http://sethrasmussen.com/svn/rails/plugins/labeling_form_helper@509 fb9bd3d9-41f6-4e67-aeff-99515e7e2596 07446002c4c5fbe7d36dca9d210786d85df0d419 Seth Thomas Rasmussen sethrasmussen@gmail.com