Ticket #10814: render_partial_builder.diff

actionpack/test/controller/new_render_test.rb

@@ -17 +17 @@
-  end
-end
-
+class LabellingFormBuilder < ActionView::Helpers::FormBuilder
+end
+
-class NewRenderTestController < ActionController::Base
-  layout :determine_layout
-
@@ -136 +139 @@
-  def partial_with_locals
-    render :partial => "customer", :locals => { :customer => Customer.new("david") } 
-  end
+
+  def partial_with_form_builder
+    render :partial => ActionView::Helpers::FormBuilder.new(:post, nil, @template, nil, Proc.new {})
+  end
-  
+  def partial_with_form_builder_subclass
+    render :partial => LabellingFormBuilder.new(:post, nil, @template, nil, Proc.new {})
+  end
+  
-  def partial_collection
-    render :partial => "customer", :collection => [ Customer.new("david"), Customer.new("mary") ]
-  end
@@ -685 +696 @@
-    assert_equal "Hello: david", @response.body
-  end
-
+  def test_partial_with_form_builder
+    get :partial_with_form_builder
+    assert_match(/<label/, @response.body)
+    assert_template('test/_form')
+  end
+  
+  def test_partial_with_form_builder_subclass
+    get :partial_with_form_builder_subclass
+    assert_match(/<label/, @response.body)
+    assert_template('test/_labelling_form')
+  end
+
-  def test_partial_collection
-    get :partial_collection
-    assert_equal "Hello: davidHello: mary", @response.body

actionpack/lib/action_view/partials.rb

@@ -119 +119 @@
-          else
-            render("#{path}/_#{partial_name}", local_assigns)
-          end
+        when ActionView::Helpers::FormBuilder
+          builder_partial_path = partial_path.class.to_s.demodulize.underscore.sub(/_builder$/, '')
+          render_partial(builder_partial_path, object_assigns, (local_assigns || {}).merge(builder_partial_path.to_sym => partial_path))
-        when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Associations::HasManyThroughAssociation
-          if partial_path.any?
-            path       = ActionController::RecordIdentifier.partial_path(partial_path.first)

actionpack/lib/action_view/helpers/form_helper.rb

@@ -32 +32 @@
-    #       <input name="commit" type="submit" value="Create" />
-    #     </form>
-    #
+    # If you are using a partial for your form fields, you can use this shortcut:
+    #
+    #     <% form_for :person, @person, :url => { :action => "create" } do |f| %>
+    #       <%= render :partial => f %>
+    #       <%= submit_tag 'Create' %>
+    #     <% end %>
+    #
+    # This example will render the <tt>people/_form</tt> partial, setting a local variable called <tt>form</tt> which references the yielded FormBuilder.
+    #
-    # The <tt>params</tt> object created when this form is submitted would look like:
-    #
-    #     {"action"=>"create", "controller"=>"persons", "person"=>{"first_name"=>"William", "last_name"=>"Smith"}}
@@ -153 +162 @@
-      #     <%= check_box_tag "person[admin]", @person.company.admin? %>
-      #   <% end %>
-      #
+      # In this case, if you use this:
+      #
+      #   <%= render :partial => f %>
+      #
+      # The rendered template is <tt>people/_labelling_form</tt> and the local variable referencing the form builder is called <tt>labelling_form</tt>.
+      #
-      # In many cases you will want to wrap the above in another helper, so you could do something like the following:
-      #
-      #   def labelled_form_for(record_or_name_or_array, *args, &proc)