erubis 2.3.1 → 2.7.0

data/lib/erubis/converter.rb

@@ -1,10 +1,9 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 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
 
@@ -36,6 +35,7 @@ module Erubis
       @preamble.nil? ? add_preamble(codebuf) : (@preamble && (codebuf << @preamble))
       convert_input(codebuf, input)
       @postamble.nil? ? add_postamble(codebuf) : (@postamble && (codebuf << @postamble))
+      @_proc = nil    # clear cached proc object
       return codebuf  # or codebuf.join()
     end
 
@@ -110,10 +110,10 @@ module Erubis
 
     ## return regexp of pattern to parse eRuby script
     def pattern_regexp(pattern)
-      prefix, postfix = pattern.split()   # '<% %>' => '<%', '%>'
-      #return /(.*?)(^[ \t]*)?#{prefix}(=+|\#)?(.*?)-?#{postfix}([ \t]*\r?\n)?/m
-      #return /(^[ \t]*)?#{prefix}(=+|\#)?(.*?)-?#{postfix}([ \t]*\r?\n)?/m
-      return /#{prefix}(=+|-|\#)?(.*?)-?#{postfix}([ \t]*\r?\n)?/m
+      @prefix, @postfix = pattern.split()   # '<% %>' => '<%', '%>'
+      #return /(.*?)(^[ \t]*)?#{@prefix}(=+|\#)?(.*?)-?#{@postfix}([ \t]*\r?\n)?/m
+      #return /(^[ \t]*)?#{@prefix}(=+|\#)?(.*?)-?#{@postfix}([ \t]*\r?\n)?/m
+      return /#{@prefix}(=+|-|\#|%)?(.*?)([-=])?#{@postfix}([ \t]*\r?\n)?/m
     end
     module_function :pattern_regexp
 
@@ -129,7 +129,7 @@ module Erubis
       regexp = pat.nil? || pat == '<% %>' ? DEFAULT_REGEXP : pattern_regexp(pat)
       pos = 0
       is_bol = true     # is beginning of line
-      input.scan(regexp) do |indicator, code, rspace|
+      input.scan(regexp) do |indicator, code, tailch, rspace|
         match = Regexp.last_match()
         len  = match.begin(0) - pos
         text = input[pos, len]
@@ -141,6 +141,7 @@ module Erubis
         ## * when '<%= %>', do nothing
         ## * when '<% %>' or '<%# %>', delete spaces iff only spaces are around '<% %>'
         if ch == ?=              # <%= %>
+          rspace = nil if tailch && !tailch.empty?
           add_text(src, lspace) if lspace
           add_expr(src, code, indicator)
           add_text(src, rspace) if rspace
@@ -153,6 +154,9 @@ module Erubis
             add_stmt(src, "\n" * n)
             add_text(src, rspace) if rspace
           end
+        elsif ch == ?%           # <%% %>
+          s = "#{lspace}#{@prefix||='<%'}#{code}#{tailch}#{@postfix||='%>'}#{rspace}"
+          add_text(src, s)
         else                     # <% %>
           if @trim && lspace && rspace
             add_stmt(src, "#{lspace}#{code}#{rspace}")
@@ -163,7 +167,8 @@ module Erubis
           end
         end
       end
-      rest = $' || input     # add input when no matched
+      #rest = $' || input                        # ruby1.8
+      rest = pos == 0 ? input : input[pos..-1]   # ruby1.9
       add_text(src, rest)
     end
 
@@ -259,7 +264,8 @@ module Erubis
           add_pi_expr(codebuf, expr1 || expr2, indicator1 || indicator2)
         end
       end
-      rest = $' || input
+      #rest = $' || input                        # ruby1.8
+      rest = pos == 0 ? input : input[pos..-1]   # ruby1.9
       add_text(codebuf, rest)
     end
 

data/lib/erubis/engine/ec.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 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/ecpp.rb

@@ -0,0 +1,113 @@
+##
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
+##
+
+require 'erubis/engine'
+require 'erubis/enhancer'
+
+
+module Erubis
+
+
+  module CppGenerator
+    include Generator
+
+    def self.supported_properties()  # :nodoc:
+      return [
+              [:indent, '',       "indent spaces (ex. '  ')"],
+              [:bufvar, '_buf',   "buffer variable name"],
+            ]
+    end
+
+    def init_generator(properties={})
+      super
+      @escapefunc ||= "escape"
+      @indent = properties[:indent] || ''
+      @bufvar = properties[:bufvar] || '_buf'
+    end
+
+    def add_preamble(src)
+      src << "#line 1 \"#{self.filename}\"\n" if self.filename
+    end
+
+    def escape_text(text)
+      @@table_ ||= { "\r"=>"\\r", "\n"=>"\\n", "\t"=>"\\t", '"'=>'\\"', "\\"=>"\\\\" }
+      text.gsub!(/[\r\n\t"\\]/) { |m| @@table_[m] }
+      return text
+    end
+
+    def escaped_expr(code)
+      return "#{@escapefunc}(#{code.strip})"
+    end
+
+    def add_text(src, text)
+      return if text.empty?
+      src << (src.empty? || src[-1] == ?\n ? @indent : ' ')
+      src << "_buf << "
+      i = 0
+      text.each_line do |line|
+        src << "\n" << @indent << "        " if i > 0
+        i += 1
+        src << '"' << escape_text(line) << '"'
+      end
+      src << ";"   #<< (text[-1] == ?\n ? "\n" : "")
+      src << "\n" if text[-1] == ?\n
+    end
+
+    def add_stmt(src, code)
+      src << code
+    end
+
+    def add_expr_literal(src, code)
+      src << @indent if src.empty? || src[-1] == ?\n
+      src << " _buf << (" << code.strip << ");"
+    end
+
+    def add_expr_escaped(src, code)
+      src << @indent if src.empty? || src[-1] == ?\n
+      src << ' ' << escaped_expr(code) << ';'
+    end
+
+    def add_expr_debug(src, code)
+      code.strip!
+      src << @indent if src.empty? || src[-1] == ?\n
+      src << " std::cerr << \"*** debug: #{code.gsub(/(")/, '\\\&')}=\" << (#{code});"
+    end
+
+    def add_postamble(src)
+      # empty
+    end
+
+  end
+
+
+  ##
+  ## engine for C
+  ##
+  class Ecpp < Basic::Engine
+    include CppGenerator
+  end
+
+
+  class EscapedEcpp < Ecpp
+    include EscapeEnhancer
+  end
+
+
+  #class XmlEcpp < Ecpp
+  #  include EscapeEnhancer
+  #end
+
+  class PI::Ecpp < PI::Engine
+    include CppGenerator
+
+    def init_converter(properties={})
+      @pi = 'cpp'
+      super(properties)
+    end
+
+  end
+
+
+end

data/lib/erubis/engine/ejava.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/engine'
@@ -17,7 +16,7 @@ module Erubis
     def self.supported_properties()   # :nodoc:
       return [
               [:indent,   '',       "indent spaces (ex. '  ')"],
-              [:buf,      '_buf',   "output buffer name"],
+              [:bufvar,   '_buf',   "output buffer variable name"],
               [:bufclass, 'StringBuffer', "output buffer class (ex. 'StringBuilder')"],
             ]
     end
@@ -26,12 +25,12 @@ module Erubis
       super
       @escapefunc ||= 'escape'
       @indent = properties[:indent] || ''
-      @buf = properties[:buf] || '_buf'
+      @bufvar = properties[:bufvar] || '_buf'
       @bufclass = properties[:bufclass] || 'StringBuffer'
     end
 
     def add_preamble(src)
-      src << "#{@indent}#{@bufclass} #{@buf} = new #{@bufclass}();"
+      src << "#{@indent}#{@bufclass} #{@bufvar} = new #{@bufclass}();"
     end
 
     def escape_text(text)
@@ -42,7 +41,7 @@ module Erubis
     def add_text(src, text)
       return if text.empty?
       src << (src.empty? || src[-1] == ?\n ? @indent : ' ')
-      src << @buf << ".append("
+      src << @bufvar << ".append("
       i = 0
       text.each_line do |line|
         src << "\n" << @indent << '          + ' if i > 0
@@ -59,7 +58,7 @@ module Erubis
     def add_expr_literal(src, code)
       src << @indent if src.empty? || src[-1] == ?\n
       code.strip!
-      src << " #{@buf}.append(#{code});"
+      src << " #{@bufvar}.append(#{code});"
     end
 
     def add_expr_escaped(src, code)
@@ -74,8 +73,8 @@ module Erubis
 
     def add_postamble(src)
       src << "\n" if src[-1] == ?;
-      src << @indent << "return " << @buf << ".toString();\n"
-      #src << @indent << "System.out.print(" << @buf << ".toString());\n"
+      src << @indent << "return " << @bufvar << ".toString();\n"
+      #src << @indent << "System.out.print(" << @bufvar << ".toString());\n"
     end
 
   end

data/lib/erubis/engine/ejavascript.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/engine'
@@ -17,7 +16,8 @@ module Erubis
     def self.supported_properties()   # :nodoc:
       list = []
       #list << [:indent,   '',       "indent spaces (ex. '  ')"]
-      #list << [:buf,      '_buf',   "output buffer name"]
+      #list << [:bufvar,      '_buf',   "output buffer variable name"]
+      list << [:docwrite, true,     "use 'document.write()' when true"]
       return list
     end
 
@@ -25,11 +25,12 @@ module Erubis
       super
       @escapefunc ||= 'escape'
       @indent = properties[:indent] || ''
-      @buf = properties[:out] || '_buf'
+      @bufvar = properties[:bufvar] || '_buf'
+      @docwrite = properties[:docwrite] != false  # '!= false' will be removed in the next release
     end
 
     def add_preamble(src)
-      src << "#{@indent}var #{@buf} = [];"
+      src << "#{@indent}var #{@bufvar} = [];"
     end
 
     def escape_text(text)
@@ -44,7 +45,7 @@ module Erubis
     def add_text(src, text)
       return if text.empty?
       add_indent(src, @indent)
-      src << @buf << '.push("'
+      src << @bufvar << '.push("'
       s = escape_text(text)
       if s[-1] == ?\n
         s[-2, 2] = ''
@@ -61,7 +62,7 @@ module Erubis
     def add_expr_literal(src, code)
       add_indent(src, @indent)
       code.strip!
-      src << "#{@buf}.push(#{code});"
+      src << "#{@bufvar}.push(#{code});"
     end
 
     def add_expr_escaped(src, code)
@@ -76,7 +77,11 @@ module Erubis
 
     def add_postamble(src)
       src << "\n" if src[-1] == ?;
-      src << @indent << 'document.write(' << @buf << ".join(\"\"));\n"
+      if @docwrite
+        src << @indent << 'document.write(' << @bufvar << ".join(\"\"));\n"
+      else
+        src << @indent << @bufvar << ".join(\"\");\n"
+      end
     end
 
   end

data/lib/erubis/engine/enhanced.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/enhancer'
@@ -104,6 +103,11 @@ module Erubis
   end
 
 
+  class PrefixedLineEruby < Eruby
+    include PrefixedLineEnhancer
+  end
+
+
   class HeaderFooterEruby < Eruby
     include HeaderFooterEnhancer
   end

data/lib/erubis/engine/eperl.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 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/ephp.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 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/eruby.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/engine'
@@ -22,6 +21,7 @@ module Erubis
     def init_generator(properties={})
       super
       @escapefunc ||= "Erubis::XmlHelper.escape_xml"
+      @bufvar     = properties[:bufvar] || "_buf"
     end
 
     def self.supported_properties()  # :nodoc:
@@ -38,12 +38,12 @@ module Erubis
 
     #--
     #def add_preamble(src)
-    #  src << "_buf = [];"
+    #  src << "#{@bufvar} = [];"
     #end
     #++
 
     def add_text(src, text)
-      src << " _buf << '" << escape_text(text) << "';" unless text.empty?
+      src << " #{@bufvar} << '" << escape_text(text) << "';" unless text.empty?
     end
 
     def add_stmt(src, code)
@@ -53,11 +53,11 @@ module Erubis
     end
 
     def add_expr_literal(src, code)
-      src << ' _buf << (' << code << ').to_s;'
+      src << " #{@bufvar} << (" << code << ').to_s;'
     end
 
     def add_expr_escaped(src, code)
-      src << ' _buf << ' << escaped_expr(code) << ';'
+      src << " #{@bufvar} << " << escaped_expr(code) << ';'
     end
 
     def add_expr_debug(src, code)
@@ -68,7 +68,7 @@ module Erubis
 
     #--
     #def add_postamble(src)
-    #  src << "\n_buf.join\n"
+    #  src << "\n#{@bufvar}.join\n"
     #end
     #++
 

data/lib/erubis/engine/escheme.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 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,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 

data/lib/erubis/engine.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -42,21 +41,24 @@ module Erubis
 
     ##
     ## load file, write cache file, and return engine object.
-    ## this method create cache file (filename + '.cache') automatically.
+    ## this method create code cache file automatically.
+    ## cachefile name can be specified with properties[:cachename],
+    ## or filname + 'cache' is used as default.
     ##
     def self.load_file(filename, properties={})
-      cachename = filename + '.cache'
+      cachename = properties[:cachename] || (filename + '.cache')
       properties[:filename] = filename
-      if test(?f, cachename) && File.mtime(filename) <= File.mtime(cachename)
+      timestamp = File.mtime(filename)
+      if test(?f, cachename) && timestamp == File.mtime(cachename)
         engine = self.new(nil, properties)
         engine.src = File.read(cachename)
       else
-        input = File.open(filename, 'rb') { |f| f.read }
+        input = File.open(filename, 'rb') {|f| f.read }
         engine = self.new(input, properties)
-        File.open(cachename, 'w') do |f|
-          f.flock(File::LOCK_EX)
-          f.write(engine.src)
-        end
+        tmpname = cachename + rand().to_s[1,8]
+        File.open(tmpname, 'wb') {|f| f.write(engine.src) }
+        File.rename(tmpname, cachename)
+        File.utime(timestamp, timestamp, cachename)
       end
       engine.src.untaint   # ok?
       return engine