Ticket #3287: capture_helper_works_for_non_erb.4.patch

actionpack/test/controller/capture_test.rb

@@ -7 +7 @@
-  def content_for
-    render :layout => "talk_from_action"
-  end
+  
+  def erb_content_for
+    render :layout => "talk_from_action"
+  end
+  
+  def block_content_for
+    render :layout => "talk_from_action"
+  end
+  
+  def non_erb_block_content_for
+    render :layout => "talk_from_action"
+  end
-
-  def rescue_action(e) raise end
-end
@@ -34 +46 @@
-  
-  def test_content_for
-    get :content_for
-"<title>Putting stuff in the title!</title>\n\nGreat stuff!"
+expected_content_for_output
-  end
+  
+  def test_erb_content_for
+    get :content_for
+    assert_equal expected_content_for_output, @response.body
+  end
+  
+  def test_block_content_for
+    get :block_content_for
+    assert_equal expected_content_for_output, @response.body
+  end
+  
+  def test_non_erb_block_content_for
+    get :non_erb_block_content_for
+    assert_equal expected_content_for_output, @response.body
+  end
-
-  def test_update_element_with_capture
-    get :update_element_with_capture
@@ -45 +72 @@
-      @response.body.strip
-    )
-  end
+  
+  private
+  def expected_content_for_output
+    "<title>Putting stuff in the title!</title>\n\nGreat stuff!"
+  end
-end

actionpack/test/fixtures/test/block_content_for.rhtml

@@ +1 @@
+<% block_content_for :title do 'Putting stuff in the title!' end %>
+Great stuff!

actionpack/test/fixtures/test/erb_content_for.rhtml

@@ +1 @@
+<% erb_content_for :title do %>Putting stuff in the title!<% end %>
+Great stuff!

actionpack/test/fixtures/test/non_erb_block_content_for.rxml

@@ +1 @@
+content_for :title do
+  'Putting stuff in the title!'
+end
+xml << "\nGreat stuff!"

actionpack/lib/action_view/helpers/capture_helper.rb

@@ -43 +43 @@
-      # instance variable. You can use this instance variable anywhere
-      # in your templates and even in your layout. 
-      # 
-
+ of capture being used in a .rhtml page
-      # 
-      #   <% @greeting = capture do %>
-      #     Welcome To my shiny new web page!
-
+
+
+
+
+
+
+
-      def capture(*args, &block)
-        # execute the block
+        begin
+          buffer = eval("_erbout", block.binding)
+        rescue
+          buffer = nil
+        end
+        
+        if buffer.nil?
+          capture_block(*args, &block)
+        else
+          capture_erb_with_buffer(buffer, *args, &block)
+        end
+      end
+      
+      def capture_erb(*args, &block)
-        buffer = eval("_erbout", block.binding)
+        
+        capture_erb_with_buffer(buffer, *args, &block)
+      end
+      
+      def capture_erb_with_buffer(buffer, *args, &block)
-        pos = buffer.length
-        block.call(*args)
-        
@@ -63 +88 @@
-        data
-      end
-      
+      def capture_block(*args, &block)
+        block.call(*args)
+      end
+      
-      # Content_for will store the given block
-      # in an instance variable for later use in another template
-      # or in the layout. 
@@ -84 +113 @@
-      def content_for(name, &block)
-        eval "@content_for_#{name} = (@content_for_#{name} || '') + capture(&block)"
-      end
+      
+      def erb_content_for(name, &block)
+        eval "@content_for_#{name} = (@content_for_#{name} || '') + capture_erb(&block)"
+      end
+      
+      def block_content_for(name, &block)
+        eval "@content_for_#{name} = (@content_for_#{name} || '') + capture_block(&block)"
+      end
-    end
-  end
-end