Ticket #9209: render_partial_with_layout_patch_2.diff

actionpack/test/controller/new_render_test.rb

@@ -361 +361 @@
-    render :action => "calling_partial_with_layout"
-  end
-
+  def render_call_to_partial_with_layout_in_main_layout_and_within_content_for_layout
+    render :action => "calling_partial_with_layout"
+  end
+
-  def render_using_layout_around_block
-    render :action => "using_layout_around_block"
-  end
-
+  def render_using_layout_around_block_in_main_layout_and_within_content_for_layout
+    render :action => "using_layout_around_block"
+  end
+  
-  def rescue_action(e) raise end
-    
-  private
@@ -387 +395 @@
-          "layouts/builder"
-        when "action_talk_to_layout", "layout_overriding_layout"
-          "layouts/talk_from_action"
+        when "render_call_to_partial_with_layout_in_main_layout_and_within_content_for_layout"
+          "layouts/partial_with_layout"
+        when "render_using_layout_around_block_in_main_layout_and_within_content_for_layout"
+          "layouts/block_with_layout"
-      end
-    end
-end
@@ -824 +836 @@
-    get :render_call_to_partial_with_layout
-    assert_equal "Before (David)\nInside from partial (David)\nAfter", @response.body
-  end
-
+
+
+
+
+
+
-  def test_using_layout_around_block
-
+render_
-    assert_equal "Before (David)\nInside from block\nAfter", @response.body
-  end
+
+  def test_using_layout_around_block_in_main_layout_and_within_content_for_layout
+    get :render_using_layout_around_block_in_main_layout_and_within_content_for_layout
+    assert_equal "Before (Anthony)\nInside from first block in layout\nAfter\nBefore (David)\nInside from block\nAfter\nBefore (Ramm)\nInside from second block in layout\nAfter\n", @response.body
+  end
+
-end

actionpack/test/fixtures/layouts/block_with_layout.erb

@@ +1 @@
+<% render(:layout => "layout_for_partial", :locals => { :name => "Anthony" }) do %>Inside from first block in layout<% end %>
+<%= yield %>
+<% render(:layout => "layout_for_partial", :locals => { :name => "Ramm" }) do %>Inside from second block in layout<% end %>

actionpack/test/fixtures/layouts/partial_with_layout.erb

@@ +1 @@
+<%= render( :layout => "layout_for_partial", :partial => "partial_for_use_in_layout", :locals => {:name => 'Anthony' } ) %>
+<%= yield %>
+<%= render( :layout => "layout_for_partial", :partial => "partial_for_use_in_layout", :locals => {:name => 'Ramm' } ) %>

actionpack/lib/action_view/base.rb

@@ -338 +338 @@
-          path, partial_name = partial_pieces(options.delete(:layout))
-
-          if block_given?
-
-
+
+
+
-          else
-
-
+
+
+
-          end
-        elsif options[:file]
-          render_file(options[:file], options[:use_full_path], options[:locals])
@@ -441 +443 @@
-    end
-
-    private
+      def wrap_content_for_layout(content)
+        original_content_for_layout = @content_for_layout
+        @content_for_layout = content
+        returning(yield) { @content_for_layout = original_content_for_layout }
+      end
+  
-      def find_full_template_path(template_path, extension)
-        file_name = "#{template_path}.#{extension}"
-        base_path = find_base_path_for(file_name)