Changeset 8786

Timestamp:

02/02/08 06:16:04 (5 months ago)

Author:

bitsweat

Message:

Introduce the :index option for form_for and fields_for to simplify multi-model forms (see http://railscasts.com/episodes/75). Closes #9883.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/form_helper.rb (modified) (6 diffs)
• trunk/actionpack/test/controller/new_render_test.rb (modified) (1 diff)
• trunk/actionpack/test/template/form_helper_test.rb (modified) (4 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Introduce the :index option for form_for and fields_for to simplify multi-model forms (see http://railscasts.com/episodes/75).  #9883 [rmm5t]
-
-* Introduce map.resources :cards, :as => 'tarjetas' to use a custom resource name in the URL: cards_path == '/tarjetas'.  #10578 [blj]

trunk/actionpack/lib/action_view/helpers/form_helper.rb

@@ -66 +66 @@
-    #
-    #   <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,
@@ -645 +648 @@
-      def initialize(object_name, object, template, options, proc)
-        @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
+        @default_options = @options ? @options.slice(:index) : {}
-      end
-
@@ -650 +654 @@
-        src = <<-end_src
-          def #{selector}(method, options = {})
-ptions.merge(:object => @object
+bjectify_options(options
-          end
-        end_src
@@ -669 +673 @@
-          args.unshift(object)
-        end
-
+
-        @template.fields_for(name, *args, &block)
-      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
-
@@ -690 +694 @@
-
-      def error_messages(options = {})
-ptions.merge(:object => @object
+bjectify_options(options
-      end
-
@@ -696 +700 @@
-        @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

trunk/actionpack/test/controller/new_render_test.rb

@@ -137 +137 @@
-
-  def partial_with_form_builder
-nil
-
-
+{}
+
+
-  def partial_with_form_builder_subclass
-nil
+{}
-  end
-

trunk/actionpack/test/template/form_helper_test.rb

@@ -364 +364 @@
-  def test_form_for_with_index
-    _erbout = ''
-
+
-    form_for("post[]", @post) do |f|
-      _erbout.concat f.label(:title)
@@ -371 +371 @@
-      _erbout.concat f.check_box(:secret)
-    end
-
+
-    expected = 
-      "<form action='http://www.example.com' method='post'>" +
@@ -384 +384 @@
-  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 = ''
@@ -413 +433 @@
-      "<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
+    _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