erubis 2.6.6 → 2.7.0

data/lib/erubis/engine/escheme.rb

@@ -1,6 +1,6 @@
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/optimized.rb

@@ -1,6 +1,6 @@
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 

data/lib/erubis/enhancer.rb

@@ -1,6 +1,6 @@
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -67,7 +67,7 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_buf = $stdout;"
+      src << "#{@bufvar} = $stdout;"
     end
 
     def add_postamble(src)
@@ -92,15 +92,15 @@ module Erubis
     end
 
     def add_text(src, text)
-      src << " print '" << escape_text(text) << "';" unless text.empty?
+      src << " print '#{escape_text(text)}';" unless text.empty?
     end
 
     def add_expr_literal(src, code)
-      src << ' print((' << code << ').to_s);'
+      src << " print((#{code}).to_s);"
     end
 
     def add_expr_escaped(src, code)
-      src << ' print ' << escaped_expr(code) << ';'
+      src << " print #{escaped_expr(code)};"
     end
 
     def add_postamble(src)
@@ -162,12 +162,12 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_buf = [];"
+      src << "#{@bufvar} = [];"
     end
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf\n"
+      src << "#{@bufvar}\n"
     end
 
   end
@@ -208,12 +208,12 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_buf = '';"
+      src << "#{@bufvar} = '';"
     end
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf.to_s\n"
+      src << "#{@bufvar}.to_s\n"
     end
 
   end
@@ -231,12 +231,12 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_buf = StringIO.new;"
+      src << "#{@bufvar} = StringIO.new;"
     end
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf.string\n"
+      src << "#{@bufvar}.string\n"
     end
 
   end
@@ -254,12 +254,12 @@ module Erubis
     end
 
     def add_preamble(src)
-      src << "_erbout = _buf = '';"
+      src << "_erbout = #{@bufvar} = '';"
     end
 
     def add_postamble(src)
       src << "\n" unless src[-1] == ?\n
-      src << "_buf.to_s\n"
+      src << "#{@bufvar}.to_s\n"
     end
 
   end
@@ -434,23 +434,34 @@ module Erubis
 
 
   ##
-  ## regards lines starting with '%' as program code
+  ## regards lines starting with '^[ \t]*%' as program code
   ##
-  ## this is for compatibility to eruby and ERB.
+  ## in addition you can specify prefix character (default '%')
   ##
   ## this is language-independent.
   ##
-  module PercentLineEnhancer
+  module PrefixedLineEnhancer
 
     def self.desc   # :nodoc:
-      "regard lines starting with '%' as program code"
+      "regard lines matched to '^[ \t]*%' as program code"
+    end
+
+    def init_generator(properties={})
+      super
+      @prefixchar = properties[:prefixchar]
     end
 
     def add_text(src, text)
+      unless @prefixrexp
+        @prefixchar ||= '%'
+        @prefixrexp = Regexp.compile("^([ \\t]*)\\#{@prefixchar}(.*?\\r?\\n)")
+      end
       pos = 0
       text2 = ''
-      text.scan(/^\%(.*?\r?\n)/) do
-        line  = $1
+      text.scan(@prefixrexp) do
+        space = $1
+        line  = $2
+        space, line = '', $1 unless $2
         match = Regexp.last_match
         len   = match.begin(0) - pos
         str   = text[pos, len]
@@ -460,12 +471,12 @@ module Erubis
         else
           text2 << str
         end
-        if line[0] == ?%
-          text2 << line
+        if line[0, 1] == @prefixchar
+          text2 << space << line
         else
           super(src, text2)
           text2 = ''
-          add_stmt(src, line)
+          add_stmt(src, space + line)
         end
       end
       #rest = pos == 0 ? text : $'             # ruby1.8
@@ -480,6 +491,39 @@ module Erubis
   end
 
 
+  ##
+  ## regards lines starting with '%' as program code
+  ##
+  ## this is for compatibility to eruby and ERB.
+  ##
+  ## this is language-independent.
+  ##
+  module PercentLineEnhancer
+    include PrefixedLineEnhancer
+
+    def self.desc   # :nodoc:
+      "regard lines starting with '%' as program code"
+    end
+
+    #--
+    #def init_generator(properties={})
+    #  super
+    #  @prefixchar = '%'
+    #  @prefixrexp = /^\%(.*?\r?\n)/
+    #end
+    #++
+
+    def add_text(src, text)
+      unless @prefixrexp
+        @prefixchar = '%'
+        @prefixrexp = /^\%(.*?\r?\n)/
+      end
+      super(src, text)
+    end
+
+  end
+
+
   ##
   ## [experimental] allow header and footer in eRuby script
   ##
@@ -654,16 +698,15 @@ module Erubis
       #src << " _buf << %Q`" << text << "`;"
       if text[-1] == ?\n
         text[-1] = "\\n"
-        src << " _buf << %Q`" << text << "`\n"
+        src << " #{@bufvar} << %Q`#{text}`\n"
       else
-        src << " _buf << %Q`" << text << "`;"
+        src << " #{@bufvar} << %Q`#{text}`;"
       end
     end
 
     def _add_text_to_str(str, text)
       return if !text || text.empty?
-      text.gsub!(/[`\#\\]/, '\\\\\&')
-      str << text
+      str << text.gsub(/[`\#\\]/, '\\\\\&')
     end
 
     def add_expr_escaped(str, code)

data/lib/erubis/error.rb

@@ -1,6 +1,6 @@
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 module Erubis

data/lib/erubis/evaluator.rb

@@ -1,6 +1,6 @@
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/error'

data/lib/erubis/generator.rb

@@ -1,9 +1,9 @@
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
-require 'abstract'
+require 'erubis/util'
 
 module Erubis
 

data/lib/erubis/helper.rb

@@ -1,6 +1,6 @@
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 

data/lib/erubis/helpers/rails_form_helper.rb

@@ -1,6 +1,6 @@
 ###
-### $Release: 2.6.6 $
-### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ###
 
 

data/lib/erubis/helpers/rails_helper.rb

@@ -1,6 +1,6 @@
 ###
-### $Release: 2.6.6 $
-### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ###
 
 

data/lib/erubis/local-setting.rb

@@ -1,6 +1,6 @@
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 ##

data/lib/erubis/main.rb

@@ -1,6 +1,6 @@
 ###
-### $Release: 2.6.6 $
-### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ###
 
 require 'yaml'
@@ -11,6 +11,7 @@ require 'erubis/engine/optimized'
 require 'erubis/engine/eruby'
 require 'erubis/engine/ephp'
 require 'erubis/engine/ec'
+require 'erubis/engine/ecpp'
 require 'erubis/engine/ejava'
 require 'erubis/engine/escheme'
 require 'erubis/engine/eperl'
@@ -231,7 +232,7 @@ module Erubis
       buf << "  -z            : syntax checking"
       buf << "  -e            : escape (equal to '--E Escape')"
       buf << "  -p pattern    : embedded pattern (default '<% %>')"
-      buf << "  -l lang       : convert but no execute (ruby/php/c/java/scheme/perl/js)"
+      buf << "  -l lang       : convert but no execute (ruby/php/c/cpp/java/scheme/perl/js)"
       buf << "  -E e1,e2,...  : enhancer names (Escape, PercentLine, BiPattern, ...)"
       buf << "  -I path       : library include path"
       buf << "  -K kanji      : kanji code (euc/sjis/utf8) (default none)"
@@ -269,7 +270,7 @@ module Erubis
       list << ['(common)', common_props]
       list << ['(basic)',  basic_props - common_props]
       list << ['(pi)',     pi_props    - common_props]
-      %w[ruby php c java scheme perl javascript].each do |lang|
+      %w[ruby php c cpp java scheme perl javascript].each do |lang|
         klass = Erubis.const_get("E#{lang}")
         list << [lang, collect_supported_properties(klass) - basic_props]
       end
@@ -484,6 +485,32 @@ module Erubis
       return "#{filename}:#{linenum}: #{message}"
     end
 
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+      def check_syntax(filename, src)
+        require 'compiler'
+        verbose = $VERBOSE
+        msg = nil
+        begin
+          $VERBOSE = true
+          Rubinius::Compiler.compile_string(src, filename)
+        rescue SyntaxError => ex
+          ex_linenum = ex.line
+          linenum = 0
+          srcline = src.each_line do |line|
+            linenum += 1
+            break line if linenum == ex_linenum
+          end
+          msg = "#{ex.message}\n"
+          msg << srcline
+          msg << "\n" unless srcline =~ /\n\z/
+          msg << (" " * (ex.column-1)) << "^\n"
+        ensure
+          $VERBOSE = verbose
+        end
+        return msg
+      end
+    end
+
   end
 
 end

data/lib/erubis/preprocessing.rb

@@ -1,6 +1,6 @@
 ###
-### $Release: 2.6.6 $
-### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ###
 
 require 'cgi'

data/lib/erubis/tiny.rb

@@ -1,6 +1,6 @@
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 module Erubis

data/lib/erubis/util.rb

@@ -0,0 +1,22 @@
+##
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
+##
+
+module Kernel
+
+  ##
+  ## raise NotImplementedError
+  ##
+  def not_implemented     #:doc:
+    backtrace = caller()
+    method_name = (backtrace.shift =~ /`(\w+)'$/) && $1
+    mesg = "class #{self.class.name} must implement abstract method '#{method_name}()'."
+    #mesg = "#{self.class.name}##{method_name}() is not implemented."
+    err = NotImplementedError.new mesg
+    err.set_backtrace backtrace
+    raise err
+  end
+  private :not_implemented
+
+end

data/test/assert-text-equal.rb

@@ -1,6 +1,6 @@
 ###
-### $Release: 2.6.6 $
-### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ###
 
 require 'test/unit'

data/test/data/users-guide/bufvar-example.rb

@@ -0,0 +1,10 @@
+require 'erubis'
+input = File.read('example.eruby')
+
+puts "----- default -----"
+eruby = Erubis::FastEruby.new(input)
+puts eruby.src
+
+puts "----- with :bufvar option -----"
+eruby = Erubis::FastEruby.new(input, :bufvar=>'@_out_buf')
+print eruby.src

data/test/data/users-guide/bufvar-example.result

@@ -0,0 +1,17 @@
+$ ruby bufvar-example.rb
+----- default -----
+_buf = ''; _buf << %Q`<div>\n`
+ for item in list 
+ _buf << %Q`  <p>#{ item }</p>
+  <p>#{Erubis::XmlHelper.escape_xml( item )}</p>\n`
+ end 
+ _buf << %Q`</div>\n`
+_buf.to_s
+----- with :bufvar option -----
+@_out_buf = ''; @_out_buf << %Q`<div>\n`
+ for item in list 
+ @_out_buf << %Q`  <p>#{ item }</p>
+  <p>#{Erubis::XmlHelper.escape_xml( item )}</p>\n`
+ end 
+ @_out_buf << %Q`</div>\n`
+@_out_buf.to_s