erubis 2.0.0 → 2.0.1

data/ChangeLog

@@ -1,5 +1,5 @@
 # $Rev: 21 $
-# $Release: 2.0.0 $
+# $Release: 2.0.1 $
 # copyright(c) 2006 kuwata-lab all rights reserved.
 
 - release:   2.0.0

data/README.txt

@@ -1,6 +1,6 @@
 = README
 
-release::	$Release: 2.0.0 $
+release::	$Release: 2.0.1 $
 copyright::	copyright(c) 2006 kuwata-lab all rights reserved.
 
 

data/benchmark/erubybench.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 

data/bin/erubis

@@ -2,7 +2,7 @@
 
 ###
 ### $Rev: 10 $
-### $Release: 2.0.0 $
+### $Release: 2.0.1 $
 ### copyright(c) 2006 kuwata-lab all rights reserved.
 ###
 

data/contrib/erubis

@@ -2,14 +2,14 @@
 
 ###
 ### $Rev: 10 $
-### $Release: 2.0.0 $
+### $Release: 2.0.1 $
 ### copyright(c) 2006 kuwata-lab all rights reserved.
 ###
 
 #--begin of require 'erubis/main'
 ###
 ### $Rev: 21 $
-### $Release: 2.0.0 $
+### $Release: 2.0.1 $
 ### copyright(c) 2006 kuwata-lab all rights reserved.
 ###
 
@@ -17,7 +17,7 @@ require 'yaml'
 #--begin of require 'erubis'
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -71,8 +71,8 @@ require 'yaml'
 
 #--begin of require 'erubis/engine'
 ##
-## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Rev: 24 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -209,7 +209,7 @@ module Erubis
 
 
   ##
-  ## [abstract] base engine class
+  ## .[abstract] base engine class
   ##
   class Engine
 
@@ -226,7 +226,7 @@ module Erubis
 
     def initialize(input, properties={})
       #@input    = input
-      @pattern   = properties[:pattern]  || '<% %>'
+      @pattern   = properties[:pattern]
       @filename  = properties[:filename]
       @trim      = properties[:trim] != false
       @preamble  = properties[:preamble]
@@ -246,7 +246,7 @@ module Erubis
       return engine
     end
 
-    ## eval(@src) with binding
+    ## eval(@src) with binding object
     def result(_binding_or_hash=TOPLEVEL_BINDING)
       _arg = _binding_or_hash
       if _arg.is_a?(Hash)
@@ -257,7 +257,7 @@ module Erubis
       return eval(@src, _arg, (@filename || '(erubis)'))
     end
 
-    ## call context.instance_eval(@src)
+    ## invoke context.instance_eval(@src)
     def evaluate(context=Context.new)
       context = Context.new(context) if context.is_a?(Hash)
       return context.instance_eval(@src, (@filename || '(erubis)'))
@@ -267,7 +267,7 @@ module Erubis
 
     ## return regexp of pattern to parse eRuby script
     def pattern_regexp(pattern=@pattern)
-      if pattern == '<% %>'
+      if pattern.nil? || pattern == '<% %>'
         return DEFAULT_REGEXP
       else
         prefix, postfix = pattern.split()
@@ -300,7 +300,7 @@ module Erubis
           else
             add_text(src, lspace) if lspace
             add_stmt(src, "\n" * n)
-            add_text(src, rspace) if lspace
+            add_text(src, rspace) if rspace
           end
           #flag_trim = @trim && lspace && rspace
           #add_text(src, lspace) if !flag_trim && lspace
@@ -344,20 +344,31 @@ module Erubis
 
     protected
 
-    ## escape text string
+    ## .[abstract] escape text string
+    ##
+    ## ex.
+    ##   def escape_text(text)
+    ##     return text.dump
+    ##     # or return "'" + text.gsub(/['\\]/, '\\\\\&') + "'"
+    ##   end
     def escape_text(text)
-      return text
+      not_implemented
     end
 
-    ## return escaped expression code
+    ## .[abstract] return escaped expression code
+    ##
+    ## ex.
+    ##   def escaped_expr(code)
+    ##     @escape ||= 'escape'
+    ##     return "#{@escape}(#{code.strip})"
+    ##   end
     def escaped_expr(code)
-      @escape ||= 'escape'
-      return "#{@escape}(#{code.strip})"
+      not_implemented
     end
 
-    ## .[empty] add @preamble to src
+    ## .[abstract] add @preamble to src
     def add_preamble(src)
-      # empty
+      not_implemented
     end
 
     ## .[abstract] add text string to src
@@ -392,14 +403,14 @@ module Erubis
       not_implemented
     end
 
-    ## .[empty] add expression code to src for debug. this is called by add_expr().
+    ## .[abstract] add expression code to src for debug. this is called by add_expr().
     def add_expr_debug(src, code)
-      # empty
+      not_implemented
     end
 
-    ## .[empty] add @postamble to src
+    ## .[abstract] add @postamble to src
     def add_postamble(src)
-      # empty
+      not_implemented
     end
 
   end  # end of class Engine
@@ -410,7 +421,7 @@ end
 #--begin of require 'erubis/helper'
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -465,7 +476,7 @@ end
 #--begin of require 'erubis/enhancer'
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -955,7 +966,7 @@ end
 #--begin of require 'erubis/engine/eruby'
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -1058,7 +1069,7 @@ end
 #--begin of require 'erubis/local-setting'
 ##
 ## $Rev: 13 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -1071,7 +1082,7 @@ end
 #--begin of require 'erubis/tiny'
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -1138,7 +1149,7 @@ end
 #--begin of require 'erubis/engine/enhanced'
 ##
 ## $Rev: 19 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -1242,7 +1253,7 @@ end
 #--begin of require 'erubis/engine/optimized'
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -1358,8 +1369,8 @@ end
 #--already included require 'erubis/engine/eruby'
 #--begin of require 'erubis/engine/ephp'
 ##
-## $Rev: 19 $
-## $Release: 2.0.0 $
+## $Rev: 24 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -1379,10 +1390,9 @@ module Erubis
       return super
     end
 
-    #--
-    #def add_preamble(src)
-    #end
-    #++
+    def add_preamble(src)
+      # empty
+    end
 
     def escape_text(text)
       return text.gsub!(/<\?xml\b/, '<<?php ?>?xml') || text
@@ -1422,10 +1432,9 @@ module Erubis
       end
     end
 
-    #--
-    #def add_postamble(src)
-    #end
-    #++
+    def add_postamble(src)
+      # empty
+    end
 
   end
 
@@ -1444,8 +1453,8 @@ end
 #--end of require 'erubis/engine/ephp'
 #--begin of require 'erubis/engine/ec'
 ##
-## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Rev: 24 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -1533,6 +1542,7 @@ module Erubis
     end
 
     def add_postamble(src)
+      # empty
     end
 
   end
@@ -1552,8 +1562,8 @@ end
 #--end of require 'erubis/engine/ec'
 #--begin of require 'erubis/engine/ejava'
 ##
-## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Rev: 24 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -1593,12 +1603,10 @@ module Erubis
       return text.gsub!(/[\r\n\t"\\]/) { |m| @@table_[m] } || text
     end
 
-    #--
-    #def escaped_expr(code)
-    #  @escape ||= 'escape'
-    #  return "#{@escape}(#{code.strip})"
-    #end
-    #++
+    def escaped_expr(code)
+      @escape ||= 'escape'
+      return "#{@escape}(#{code.strip})"
+    end
 
     def add_text(src, text)
       return if text.empty?
@@ -1656,7 +1664,7 @@ end
 #--begin of require 'erubis/engine/escheme'
 ##
 ## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -1753,8 +1761,8 @@ end
 #--end of require 'erubis/engine/escheme'
 #--begin of require 'erubis/engine/eperl'
 ##
-## $Rev: 19 $
-## $Release: 2.0.0 $
+## $Rev: 24 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -1782,6 +1790,7 @@ module Erubis
     end
 
     def add_preamble(src)
+      # empty
     end
 
     def escape_text(text)
@@ -1792,12 +1801,10 @@ module Erubis
       src << @func << "('" << escape_text(text) << "'); " unless text.empty?
     end
 
-    #--
-    #def escaped_expr(code)
-    #  @escape ||= 'escape'
-    #  return "escape(#{code.strip})"
-    #end
-    #++
+    def escaped_expr(code)
+      @escape ||= 'escape'
+      return "escape(#{code.strip})"
+    end
 
     def add_expr_literal(src, code)
       src << @func << "(" << code.strip << "); "
@@ -1838,8 +1845,8 @@ end
 #--end of require 'erubis/engine/eperl'
 #--begin of require 'erubis/engine/ejavascript'
 ##
-## $Rev: 21 $
-## $Release: 2.0.0 $
+## $Rev: 24 $
+## $Release: 2.0.1 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -1878,12 +1885,10 @@ module Erubis
       return text.gsub!(/[\r\n\t"\\]/) { |m| @@table_[m] } || text
     end
 
-    #--
-    #def escaped_expr(code)
-    #  @escape ||= 'escape'
-    #  return "#{@escape}(#{code.strip})"
-    #end
-    #++
+    def escaped_expr(code)
+      @escape ||= 'escape'
+      return "#{@escape}(#{code.strip})"
+    end
 
     def add_indent(src, indent)
       src << (src.empty? || src[-1] == ?\n ? indent : ' ')
@@ -2159,7 +2164,7 @@ END
     end
 
     def version
-      release = ('$Release: 2.0.0 $' =~ /([.\d]+)/) && $1
+      release = ('$Release: 2.0.1 $' =~ /([.\d]+)/) && $1
       return release
     end
 

data/contrib/inline-require

@@ -6,7 +6,7 @@
 ### usage: inline-require [-h] [-I path[,path2,..]] script
 ###
 ### copyright(c) 2006 kuwata-lab all rights reserved.
-### $Release: 2.0.0 $
+### $Release: 2.0.1 $
 ### $Rev: 2 $
 ###
 

data/doc-api/classes/Erubis.html

@@ -126,7 +126,7 @@
 
     <div id="description">
       <p>
-$Rev: 21 $ $Release: 2.0.0 $ copyright(c) 2006 kuwata-lab all rights reserved.
+$Rev: 21 $ $Release: 2.0.1 $ copyright(c) 2006 kuwata-lab all rights reserved.
 </p>
 
     </div>

data/doc-api/classes/Erubis/Context.html

@@ -81,7 +81,7 @@
     <div id="description">
       <p>
 .[abstract] context object for <a
-href="Engine.html#M000062">Engine#evaluate</a>
+href="Engine.html#M000066">Engine#evaluate</a>
 </p>
 <p>
 ex.
@@ -113,10 +113,10 @@ ex.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000101">[]</a>&nbsp;&nbsp;
-      <a href="#M000102">[]=</a>&nbsp;&nbsp;
-      <a href="#M000103">keys</a>&nbsp;&nbsp;
-      <a href="#M000100">new</a>&nbsp;&nbsp;
+      <a href="#M000106">[]</a>&nbsp;&nbsp;
+      <a href="#M000107">[]=</a>&nbsp;&nbsp;
+      <a href="#M000108">keys</a>&nbsp;&nbsp;
+      <a href="#M000105">new</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -138,19 +138,19 @@ ex.
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000100" class="method-detail">
-        <a name="M000100"></a>
+      <div id="method-M000105" class="method-detail">
+        <a name="M000105"></a>
 
         <div class="method-heading">
-          <a href="#M000100" class="method-signature">
+          <a href="#M000105" class="method-signature">
           <span class="method-name">new</span><span class="method-args">(hash=nil)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000100-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000100-source">
+            onclick="toggleCode('M000105-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000105-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/engine.rb, line 42</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">hash</span>=<span class="ruby-keyword kw">nil</span>)
@@ -165,19 +165,19 @@ ex.
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000101" class="method-detail">
-        <a name="M000101"></a>
+      <div id="method-M000106" class="method-detail">
+        <a name="M000106"></a>
 
         <div class="method-heading">
-          <a href="#M000101" class="method-signature">
+          <a href="#M000106" class="method-signature">
           <span class="method-name">[]</span><span class="method-args">(key)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000101-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000101-source">
+            onclick="toggleCode('M000106-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000106-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/engine.rb, line 48</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-operator">[]</span>(<span class="ruby-identifier">key</span>)
@@ -188,19 +188,19 @@ ex.
         </div>
       </div>
 
-      <div id="method-M000102" class="method-detail">
-        <a name="M000102"></a>
+      <div id="method-M000107" class="method-detail">
+        <a name="M000107"></a>
 
         <div class="method-heading">
-          <a href="#M000102" class="method-signature">
+          <a href="#M000107" class="method-signature">
           <span class="method-name">[]=</span><span class="method-args">(key, value)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000102-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000102-source">
+            onclick="toggleCode('M000107-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000107-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/engine.rb, line 52</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-operator">[]=</span>(<span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span>)
@@ -211,19 +211,19 @@ ex.
         </div>
       </div>
 
-      <div id="method-M000103" class="method-detail">
-        <a name="M000103"></a>
+      <div id="method-M000108" class="method-detail">
+        <a name="M000108"></a>
 
         <div class="method-heading">
-          <a href="#M000103" class="method-signature">
+          <a href="#M000108" class="method-signature">
           <span class="method-name">keys</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000103-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000103-source">
+            onclick="toggleCode('M000108-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000108-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/engine.rb, line 56</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">keys</span>