Ticket #9883: add_index_override_to_fields_for_helper_3.diff

actionpack/test/template/form_helper_test.rb

@@ -383 +383 @@
-    assert_dom_equal expected, _erbout
-  end
-
+  def test_form_for_with_nil_index_option_override
+    _erbout = ''
+
+    form_for("post[]", @post, "index" => nil) do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+
+    expected =
+      "<form action='http://www.example.com' method='post'>" +
+      "<input name='post[][title]' size='30' type='text' id='post__title' value='Hello World' />" +
+      "<textarea name='post[][body]' id='post__body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />" +
+      "<input name='post[][secret]' type='hidden' value='0' />" +
+      "</form>"
+
+    assert_dom_equal expected, _erbout
+  end
+
-  def test_nested_fields_for
-    _erbout = ''
-    form_for(:post, @post) do |f|
@@ -416 +436 @@
-    assert_dom_equal expected, _erbout
-  end
-
+  def test_fields_for_with_index
+    _erbout = ''
+
+    fields_for("post[]", @post) do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+
+    expected =
+      "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
+      "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />" +
+      "<input name='post[123][secret]' type='hidden' value='0' />"
+
+    assert_dom_equal expected, _erbout
+  end
+
+  def test_fields_for_with_nil_index_option_override
+    _erbout = ''
+
+    fields_for("post[]", @post, :index => nil) do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+
+    expected =
+      "<input name='post[][title]' size='30' type='text' id='post__title' value='Hello World' />" +
+      "<textarea name='post[][body]' id='post__body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />" +
+      "<input name='post[][secret]' type='hidden' value='0' />"
+
+    assert_dom_equal expected, _erbout
+  end
+
+  def test_fields_for_with_index_option_override
+    _erbout = ''
+
+    fields_for("post[]", @post, :index => "abc") do |f|
+      _erbout.concat f.text_field(:title)
+      _erbout.concat f.text_area(:body)
+      _erbout.concat f.check_box(:secret)
+    end
+
+    expected =
+      "<input name='post[abc][title]' size='30' type='text' id='post_abc_title' value='Hello World' />" +
+      "<textarea name='post[abc][body]' id='post_abc_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[abc][secret]' checked='checked' type='checkbox' id='post_abc_secret' value='1' />" +
+      "<input name='post[abc][secret]' type='hidden' value='0' />"
+
+    assert_dom_equal expected, _erbout
+  end
+
-  def test_fields_for_without_object
-    _erbout = ''
-    fields_for(:post) do |f|

actionpack/lib/action_view/helpers/form_helper.rb

@@ -57 +57 @@
-    #
-    #   <input type="text" id="person_1_name" name="person[1][name]" value="<%= @person.name %>" />
-    #
+    # An <tt>index</tt> option may also be passed to <tt>form_for</tt> and <tt>fields_for</tt>.  This automatically applies
+    # the <tt>index</tt> to all the nested fields.
+    #
-    # There are also methods for helping to build form tags in link:classes/ActionView/Helpers/FormOptionsHelper.html,
-    # link:classes/ActionView/Helpers/DateHelper.html, and link:classes/ActionView/Helpers/ActiveRecordHelper.html
-    module FormHelper
@@ -628 +631 @@
-
-      def initialize(object_name, object, template, options, proc)
-        @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
+        @default_options = @options.with_indifferent_access.slice(:index)
-      end
-
-      (field_helpers - %w(label check_box radio_button fields_for)).each do |selector|
-        src = <<-end_src
-          def #{selector}(method, options = {})
-ptions.merge(:object => @object
+bjectify_options(options
-          end
-        end_src
-        class_eval src, __FILE__, __LINE__
@@ -657 +661 @@
-      end
-
-      def label(method, text = nil, options = {})
-ptions.merge(:object => @object
+bjectify_options(options
-      end
-
-      def check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
-ptions.merge(:object => @object
+bjectify_options(options
-      end
-
-      def radio_button(method, tag_value, options = {})
-ptions.merge(:object => @object
+bjectify_options(options
-      end
-
-      def error_message_on(method, prepend_text = "", append_text = "", css_class = "formError")
@@ -673 +677 @@
-      end
-
-      def error_messages(options = {})
-ptions.merge(:object => @object
+bjectify_options(options
-      end
-
-      def submit(value = "Save changes", options = {})
-        @template.submit_tag(value, options.reverse_merge(:id => "#{object_name}_submit"))
-      end
+
+      private
+
+      def objectify_options(options)
+        @default_options.merge(options.merge(:object => @object))
+      end
-    end
-  end
-