0
@@ -0,0 +1,14 @@
0
+6/22/2008:
0
+
0
+Erubis modified:
0
+* <%= %> now can take a block, so <%= helper do %>Hello<% end %> now works
0
+* Erubis buffer is now an ivar (@_erb_buf), which eliminates the need for
0
+  eval in capture helpers.
0
+  
0
+CONSEQUENCE:
0
+Helpers that take a block should simply return a string, and should not
0
+use concat. Example:
0
+  
0
+  def my_helper(&blk)
0
+    "My helper says #{capture(&blk)}."
0
+  end
0
\ No newline at end of file

0
@@ -4,16 +4,29 @@ require "erubis"
0
 module Erubis
0
   module BlockAwareEnhancer
0
     def add_preamble(src)
0
-      src << "@_buf = '';"
0
-    end    
0
+      src << "_old_buf, @_erb_buf = @_erb_buf, ''; "
0
+    end
0
+    
0
+    def add_postamble(src)
0
+      src << "\n" unless src[-1] == ?\n      
0
+      src << "_ret = @_erb_buf; @_erb_buf = _old_buf; _ret.to_s\n"
0
+    end
0
+    
0
+    def add_text(src, text)
0
+      src << " @_erb_buf << '" << text << "'; "
0
+    end
0
+    
0
+    def add_expr_escaped(src, code)
0
+      src << ' @_erb_buf << ' << escaped_expr(code) << ';'
0
+    end
0
     
0
     def add_expr_literal(src, code)
0
       unless code =~ /(do|\{)(\s*|[^|]*|)?\s*$/
0
-        src << ' _buf << (' << code << ').to_s;'
0
+        src << ' @_erb_buf << (' << code << ').to_s;'
0
       else
0
-        src << ' _buf << ' << code << "; "
0
+        src << ' @_erb_buf << ' << code << "; "
0
       end
0
-    end    
0
+    end
0
   end
0
   
0
   class BlockAwareEruby < Eruby
0
@@ -22,21 +35,22 @@ module Erubis
0
 end
0
 
0
 class Context
0
-  def _buf
0
-    @_buf ||= ""
0
-  end
0
-
0
   def capture(&blk)
0
-    _old_buf, @_buf = @_buf, ""
0
+    _old_buf, @_erb_buf = @_erb_buf, ""
0
     blk.call
0
-    ret = @_buf
0
-    @_buf = _old_buf
0
+    ret = @_erb_buf
0
+    @_erb_buf = _old_buf
0
     ret
0
   end
0
+  
0
+  def hello
0
+    "Hello"
0
+  end
0
 
0
   def helper(&blk)
0
     "<tag>#{capture(&blk)}</tag>"
0
   end
0
 end
0
 
0
-p Erubis::BlockAwareEruby.new.process("Begin: <%= helper do %>Hello<% end %><% 3.times do %>X<% end %>", Context.new)
0
\ No newline at end of file
0
+puts Erubis::BlockAwareEruby.new("Begin: <%= helper do %>Hello<% end %><% 3.times do %>X<% end %><%= hello %>").src
0
+p Erubis::BlockAwareEruby.new.process("Begin: <%= helper do %>Hello<% end %><% 3.times do %>X<% end %><%= hello %>", Context.new)
0
\ No newline at end of file

0
@@ -156,24 +156,13 @@ module Merb::Template
0
     # name<String>:: The name of the method that will be created.
0
     # mod<Module>:: The module that the compiled method will be placed into.
0
     def self.compile_template(io, name, mod)
0
-      template = ::Erubis::Eruby.new(io.read)
0
+      template = ::Erubis::BlockAwareEruby.new(io.read)
0
       template.def_method(mod, name, File.expand_path(io.path))
0
       name
0
     end
0
 
0
     module Mixin
0
       
0
-      # Provides direct acccess to the buffer for this view context
0
-      #
0
-      # ==== Parameters
0
-      # the_binding<Binding>:: The binding to pass to the buffer.
0
-      #
0
-      # ==== Returns
0
-      # DOC
0
-      def _erb_buffer( the_binding )
0
-        @_buffer = eval( "_buf", the_binding, __FILE__, __LINE__)
0
-      end
0
-
0
       # ==== Parameters
0
       # *args:: Arguments to pass to the block.
0
       # &block:: The template block to call.
0
@@ -188,30 +177,16 @@ module Merb::Template
0
       #     <p>Some Foo content!</p> 
0
       #   <% end %>
0
       def capture_erb(*args, &block)
0
-        # get the buffer from the block's binding
0
-        buffer = _erb_buffer( block.binding ) rescue nil
0
-
0
-        # If there is no buffer, just call the block and get the contents
0
-        if buffer.nil?
0
-          block.call(*args)
0
-        # If there is a buffer, execute the block, then extract its contents
0
-        else
0
-          pos = buffer.length
0
-          block.call(*args)
0
-
0
-          # extract the block
0
-          data = buffer[pos..-1]
0
-
0
-          # replace it in the original with empty string
0
-          buffer[pos..-1] = ''
0
-
0
-          data
0
-        end
0
+        _old_buf, @_erb_buf = @_erb_buf, ""
0
+        block.call
0
+        ret = @_erb_buf
0
+        @_erb_buf = _old_buf
0
+        ret
0
       end
0
 
0
       # DOC
0
       def concat_erb(string, binding)
0
-        _erb_buffer(binding) << string
0
+        @_erb_buf << string
0
       end
0
             
0
     end
0
@@ -222,14 +197,46 @@ module Merb::Template
0
 end
0
 
0
 module Erubis
0
-  module RubyEvaluator
0
+  module BlockAwareEnhancer
0
+    def add_preamble(src)
0
+      src << "_old_buf, @_erb_buf = @_erb_buf, ''; "
0
+      src << "@_engine = 'erb'; "
0
+    end
0
 
0
-    # DOC
0
-    def def_method(object, method_name, filename=nil)
0
-      m = object.is_a?(Module) ? :module_eval : :instance_eval
0
-      setup = "@_engine = 'erb'"
0
-      object.__send__(m, "def #{method_name}(locals={}); #{setup}; #{@src}; end", filename || @filename || '(erubis)')
0
+    def add_postamble(src)
0
+      src << "\n" unless src[-1] == ?\n      
0
+      src << "_ret = @_erb_buf; @_erb_buf = _old_buf; _ret.to_s\n"
0
+    end
0
+
0
+    def add_text(src, text)
0
+      src << " @_erb_buf << '" << escape_text(text) << "'; "
0
+    end
0
+
0
+    def add_expr_escaped(src, code)
0
+      src << ' @_erb_buf << ' << escaped_expr(code) << ';'
0
+    end
0
+
0
+    def add_expr_literal(src, code)
0
+      unless code =~ /(do|\{)(\s*|[^|]*|)?\s*$/
0
+        src << ' @_erb_buf << (' << code << ').to_s;'
0
+      else
0
+        src << ' @_erb_buf << ' << code << "; "
0
+      end
0
     end
0
-   
0
   end
0
+
0
+  class BlockAwareEruby < Eruby
0
+    include BlockAwareEnhancer
0
+  end
0
+  
0
+  # module RubyEvaluator
0
+  # 
0
+  #   # DOC
0
+  #   def def_method(object, method_name, filename=nil)
0
+  #     m = object.is_a?(Module) ? :module_eval : :instance_eval
0
+  #     setup = "@_engine = 'erb'"
0
+  #     object.__send__(m, "def #{method_name}(locals={}); #{setup}; #{@src}; end", filename || @filename || '(erubis)')
0
+  #   end
0
+  #  
0
+  # end
0
 end
0
\ No newline at end of file

0
@@ -7,11 +7,18 @@ module Merb::Test::Fixtures
0
       def _template_location(context, type = nil, controller = controller_name)
0
         "helpers/#{File.basename(controller)}/#{context}"
0
       end
0
+      
0
+      def index
0
+        render
0
+      end
0
     end
0
     
0
     class Capture < HelperTesting
0
-      def index
0
-        render
0
+    end
0
+    
0
+    class CaptureEq < HelperTesting
0
+      def helper_using_capture(&blk)
0
+        "Beginning... #{capture(&blk)}... Done"
0
       end
0
     end
0
 

0
@@ -5,9 +5,13 @@ describe Merb::AbstractController, " with capture and concat" do
0
   it "should support capture" do
0
     dispatch_should_make_body("Capture", "Capture")    
0
   end
0
+
0
+  it "should support basic helpers that use capture with <%=" do
0
+    dispatch_should_make_body("CaptureEq", "Pre. Beginning... Capturing... Done. Post.")
0
+  end
0
   
0
   it "should support concat" do
0
     dispatch_should_make_body("Concat", "Concat")
0
   end
0
-  
0
+    
0
 end