@@ -32,6 +32,7 @@ class TenplateFormBuilder < ActionView::Helpers::FormBuilder def text_field(object_method , options={}) label_html_attributes = label_attributes(object_method, options.delete(:label)) tip = options.delete(:tip) + value = options.delete(:value) || object.respond_to?(object_method) && object.send(object_method) || nil supported_attributes = [:class, :id, :disabled, :size, :alt, :tabindex, :accesskey, :onfocus, :onblur, :onselect, :onchange, :value] options.delete_if {|attribute_name, attribute_value| !supported_attributes.include?(attribute_name.to_sym)} @template.render :partial => "form_templates/text_field", @@ -39,7 +40,7 @@ class TenplateFormBuilder < ActionView::Helpers::FormBuilder :object_method => object_method, :label_text => label_html_attributes[:text], :label_for => label_html_attributes[:for], - :value => options.delete(:value), + :value => value, :builder => self, :scoped_by_object => true, :tip => tip, @@ -74,7 +75,7 @@ class TenplateFormBuilder < ActionView::Helpers::FormBuilder selected_state = options.delete(:selected) == true checked_value = options[:checked_value].nil? ? "1" : options.delete(:checked_value) unchecked_value = options[:unchecked_value].nil? ? "0" : options.delete(:unchecked_value) - supported_attributes = [:class, :id, :disabled, :size, :alt, :tabindex, :accesskey, :onfocus, :onblur, :onselect, :onchange] + supported_attributes = [:checked, :class, :id, :disabled, :size, :alt, :tabindex, :accesskey, :onfocus, :onblur, :onselect, :onchange] options.delete_if {|attribute_name, attribute_value| !supported_attributes.include?(attribute_name.to_sym)} @template.render :partial => 'form_templates/check_box', @@ -91,15 +92,17 @@ class TenplateFormBuilder < ActionView::Helpers::FormBuilder end def check_box(object_method, options = {}) - options.delete(:label_method) - options.delete(:value_method) label_text = options[:label] && options[:label][:text] ? options[:label].delete(:text) : object_method.to_s.titleize label_for = options[:label] && options[:label][:for] ? options[:label].delete(:for) : object_method checked_value = options[:checked_value].nil? ? "1" : options.delete(:checked_value) unchecked_value = options[:unchecked_value].nil? ? "0" : options.delete(:unchecked_value) part_of_group = options.delete(:part_of_group) == true - selected_state = options.delete(:selected) == true - supported_attributes = [:class, :id, :disabled, :size, :alt, :tabindex, :accesskey, :onfocus, :onblur, :onselect, :onchange] + value_method = object_method.is_a?(Hash) ? object_method.keys.first : object_method + if options.delete(:selected) == true || (object.respond_to?(value_method) && object.send(value_method) == true) + selected_state = "checked" + end + + supported_attributes = [:checked, :class, :id, :disabled, :size, :alt, :tabindex, :accesskey, :onfocus, :onblur, :onselect, :onchange] options.delete_if {|attribute_name, attribute_value| !supported_attributes.include?(attribute_name.to_sym)} @template.render :partial => 'form_templates/check_box', @@ -136,7 +139,7 @@ class TenplateFormBuilder < ActionView::Helpers::FormBuilder unchecked_value = 0 field_name, label_text = checkboxable_object.is_a?(Hash) ? checkboxable_object.to_a.flatten : checkboxable_object if !field_name.is_a?(ActiveRecord::Base) && object.respond_to?(field_name) - selected = Array(selected_values).include?(field_name) + selected = Array(selected_values).include?(field_name) || object.send(field_name) == true check_box(field_name, :label => {:text => label_text}, :selected => selected, :part_of_group => part_of_group, @@ -219,8 +222,9 @@ class TenplateFormBuilder < ActionView::Helpers::FormBuilder def text_area(object_method, options = {}) label_html_attributes = label_attributes(object_method, options.delete(:label)) tip = options.delete(:tip) - value_method = options.delete(:value_method) || :id - label_method = options.delete(:label_method) || :id + value_method = options.delete(:value_method) || object_method + value = value = options.delete(:value) || object.respond_to?(object_method) && object.send(object_method) + label_method = options.delete(:label_method) || object_method supported_attributes = [:class, :id, :disabled, :size, :alt, :tabindex, :accesskey, :onfocus, :onblur, :onselect, :onchange, :value] options.delete_if {|attribute_name, attribute_value| !supported_attributes.include?(attribute_name.to_sym)} @@ -234,6 +238,7 @@ class TenplateFormBuilder < ActionView::Helpers::FormBuilder :tip => tip, :builder => self, :scoped_by_object => true, + :value => value, :options => options } end lib/templates/form_builder/tenplate_form_builder.rb @@ -5,7 +5,7 @@ end describe TenplateFormBuilder do before(:each) do - @object = mock("A Person object") + @object = mock("A Person object", :first_name => "John", :admin => true) @object_name = @object @template = mock("View template object") @builder = TenplateFormBuilder.new @object, @object_name, @template, {}, nil @@ -284,7 +284,7 @@ describe TenplateFormBuilder do :label_for => :first_name, :scoped_by_object => true, :tip => nil, - :value => nil, + :value => "John", :options => {} }.each_pair do |key, value| it "renders the template with '#{key}' set to '#{value}'" do @@ -294,6 +294,14 @@ describe TenplateFormBuilder do end end + context "with an invalid method_name" do + it "renders an empty textfield" do + expected_render_arguments = hash_including(:locals => hash_including(:value => nil)) + @template.should_receive(:render).with(expected_render_arguments).and_return(lambda {"Template rendered"}) + @builder.text_field(:invalid_field_name).should_not raise_error + end + end + it_should_behave_like "Any labeled input type" it_should_behave_like "Any self-cleaning input type" @@ -333,7 +341,14 @@ describe TenplateFormBuilder do it_should_behave_like "Any self-cleaning input type" it_should_behave_like "Any labeled input type" it_should_behave_like "Any tipable input type" - it_should_behave_like "Any scoped input accepting 'value_method' and 'label_method' attributes" + + it "passes ':biography' as the 'value_method' to the view template" do + check_options_full :passed_in => {}, :expected => {:value_method => :biography} + end + + it "passes ':biography' as the 'label_method' to the view template" do + check_options_full :passed_in => {}, :expected => {:label_method => :biography} + end end context "by calling 'text_area_tag'" do @@ -482,9 +497,10 @@ describe TenplateFormBuilder do end end - context "setting 'selected'" do - before(:each) {testing_option :selected, :selected_state} - it_should_behave_like "Any boolean option" + context "setting 'selected' to true" do + it "passes a 'selected_state' of 'checked' to the view template" do + check_options_full :passed_in => {:selected => true}, :expected => {:selected_state => "checked"} + end end context "setting 'part_of_group'" do @@ -737,7 +753,7 @@ describe TenplateFormBuilder do @builder.check_box(@hash_of_roles, validations[:passed_in]).should_not raise_error end - {:selected => false, + {:selected => true, :part_of_group => false, :checked_value => 1, :unchecked_value => 0 spec/templates/form_builder/tenplate_form_builder_spec.rb 9014d178ae793e5bb9dd2f4248edfbf61af4c866 Tom Kersten tkersten@obtiva.com http://github.com/danboy/tenplate/commit/513ff83dc4a461345ed43052a0d37d02c1ed592d 513ff83dc4a461345ed43052a0d37d02c1ed592d 2009-03-09T21:43:29-07:00 2009-03-09T21:43:29-07:00 Updated form builder to correctly restore checkbox values - User previously was forced to pass in a "selected" attribute which fit for many cases, but not the simplest ActiveRecord field case. This has been resolved. - Updated associated specs... fee1d6853e98c4ab5f7c2537ab956b3705b6fc94 Tom Kersten tkersten@obtiva.com