spec/public/abstract_controller/controllers/views/helpers/capture_eq/index.erb @@ -0,0 +1,14 @@ +6/22/2008: + +Erubis modified: +* <%= %> now can take a block, so <%= helper do %>Hello<% end %> now works +* Erubis buffer is now an ivar (@_erb_buf), which eliminates the need for + eval in capture helpers. + +CONSEQUENCE: +Helpers that take a block should simply return a string, and should not +use concat. Example: + + def my_helper(&blk) + "My helper says #{capture(&blk)}." + end \ No newline at end of file PUBLIC_CHANGELOG @@ -4,16 +4,29 @@ require "erubis" module Erubis module BlockAwareEnhancer def add_preamble(src) - src << "@_buf = '';" - end + src << "_old_buf, @_erb_buf = @_erb_buf, ''; " + end + + def add_postamble(src) + src << "\n" unless src[-1] == ?\n + src << "_ret = @_erb_buf; @_erb_buf = _old_buf; _ret.to_s\n" + end + + def add_text(src, text) + src << " @_erb_buf << '" << text << "'; " + end + + def add_expr_escaped(src, code) + src << ' @_erb_buf << ' << escaped_expr(code) << ';' + end def add_expr_literal(src, code) unless code =~ /(do|\{)(\s*|[^|]*|)?\s*$/ - src << ' _buf << (' << code << ').to_s;' + src << ' @_erb_buf << (' << code << ').to_s;' else - src << ' _buf << ' << code << "; " + src << ' @_erb_buf << ' << code << "; " end - end + end end class BlockAwareEruby < Eruby @@ -22,21 +35,22 @@ module Erubis end class Context - def _buf - @_buf ||= "" - end - def capture(&blk) - _old_buf, @_buf = @_buf, "" + _old_buf, @_erb_buf = @_erb_buf, "" blk.call - ret = @_buf - @_buf = _old_buf + ret = @_erb_buf + @_erb_buf = _old_buf ret end + + def hello + "Hello" + end def helper(&blk) "<tag>#{capture(&blk)}</tag>" end end -p Erubis::BlockAwareEruby.new.process("Begin: <%= helper do %>Hello<% end %><% 3.times do %>X<% end %>", Context.new) \ No newline at end of file +puts Erubis::BlockAwareEruby.new("Begin: <%= helper do %>Hello<% end %><% 3.times do %>X<% end %><%= hello %>").src +p Erubis::BlockAwareEruby.new.process("Begin: <%= helper do %>Hello<% end %><% 3.times do %>X<% end %><%= hello %>", Context.new) \ No newline at end of file experimentation/experiments/erubis.rb @@ -156,24 +156,13 @@ module Merb::Template # name<String>:: The name of the method that will be created. # mod<Module>:: The module that the compiled method will be placed into. def self.compile_template(io, name, mod) - template = ::Erubis::Eruby.new(io.read) + template = ::Erubis::BlockAwareEruby.new(io.read) template.def_method(mod, name, File.expand_path(io.path)) name end module Mixin - # Provides direct acccess to the buffer for this view context - # - # ==== Parameters - # the_binding<Binding>:: The binding to pass to the buffer. - # - # ==== Returns - # DOC - def _erb_buffer( the_binding ) - @_buffer = eval( "_buf", the_binding, __FILE__, __LINE__) - end - # ==== Parameters # *args:: Arguments to pass to the block. # &block:: The template block to call. @@ -188,30 +177,16 @@ module Merb::Template # <p>Some Foo content!</p> # <% end %> def capture_erb(*args, &block) - # get the buffer from the block's binding - buffer = _erb_buffer( block.binding ) rescue nil - - # If there is no buffer, just call the block and get the contents - if buffer.nil? - block.call(*args) - # If there is a buffer, execute the block, then extract its contents - else - pos = buffer.length - block.call(*args) - - # extract the block - data = buffer[pos..-1] - - # replace it in the original with empty string - buffer[pos..-1] = '' - - data - end + _old_buf, @_erb_buf = @_erb_buf, "" + block.call + ret = @_erb_buf + @_erb_buf = _old_buf + ret end # DOC def concat_erb(string, binding) - _erb_buffer(binding) << string + @_erb_buf << string end end @@ -222,14 +197,46 @@ module Merb::Template end module Erubis - module RubyEvaluator + module BlockAwareEnhancer + def add_preamble(src) + src << "_old_buf, @_erb_buf = @_erb_buf, ''; " + src << "@_engine = 'erb'; " + end - # DOC - def def_method(object, method_name, filename=nil) - m = object.is_a?(Module) ? :module_eval : :instance_eval - setup = "@_engine = 'erb'" - object.__send__(m, "def #{method_name}(locals={}); #{setup}; #{@src}; end", filename || @filename || '(erubis)') + def add_postamble(src) + src << "\n" unless src[-1] == ?\n + src << "_ret = @_erb_buf; @_erb_buf = _old_buf; _ret.to_s\n" + end + + def add_text(src, text) + src << " @_erb_buf << '" << escape_text(text) << "'; " + end + + def add_expr_escaped(src, code) + src << ' @_erb_buf << ' << escaped_expr(code) << ';' + end + + def add_expr_literal(src, code) + unless code =~ /(do|\{)(\s*|[^|]*|)?\s*$/ + src << ' @_erb_buf << (' << code << ').to_s;' + else + src << ' @_erb_buf << ' << code << "; " + end end - end + + class BlockAwareEruby < Eruby + include BlockAwareEnhancer + end + + # module RubyEvaluator + # + # # DOC + # def def_method(object, method_name, filename=nil) + # m = object.is_a?(Module) ? :module_eval : :instance_eval + # setup = "@_engine = 'erb'" + # object.__send__(m, "def #{method_name}(locals={}); #{setup}; #{@src}; end", filename || @filename || '(erubis)') + # end + # + # end end \ No newline at end of file lib/merb-core/controller/template.rb @@ -7,11 +7,18 @@ module Merb::Test::Fixtures def _template_location(context, type = nil, controller = controller_name) "helpers/#{File.basename(controller)}/#{context}" end + + def index + render + end end class Capture < HelperTesting - def index - render + end + + class CaptureEq < HelperTesting + def helper_using_capture(&blk) + "Beginning... #{capture(&blk)}... Done" end end spec/public/abstract_controller/controllers/helpers.rb @@ -5,9 +5,13 @@ describe Merb::AbstractController, " with capture and concat" do it "should support capture" do dispatch_should_make_body("Capture", "Capture") end + + it "should support basic helpers that use capture with <%=" do + dispatch_should_make_body("CaptureEq", "Pre. Beginning... Capturing... Done. Post.") + end it "should support concat" do dispatch_should_make_body("Concat", "Concat") end - + end spec/public/abstract_controller/helper_spec.rb 0e44eca7bd69e325b687d2174f054ece61910ad0 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/7043503871759eadc947bc5138ebbc96b8e17d74 7043503871759eadc947bc5138ebbc96b8e17d74 2008-06-22T18:37:13-07:00 2008-06-22T18:37:13-07:00 <%= now takes a block in Erubis. Erubis buffer now an ivar (@_erb_buf) so eval is no longer required for capture. Helpers that take a block should now return a string. 28d5d1835e98962007a98e671ae73df979014a2a Yehuda Katz wycats@gmail.com