erubis 2.6.3 → 2.6.4

data/CHANGES.txt

@@ -1,9 +1,18 @@
 # -*- coding: utf-8 -*-
-# $Rev: 123 $
-# $Release: 2.6.3 $
+# $Rev: 129 $
+# $Release: 2.6.4 $
 # copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 
 
+- release:   2.6.4
+  date: 2009-02-18
+  enhancemens:
+
+    - |
+	Rails 2.2 and 2.3 support.
+
+
+
 - release:   2.6.3
   date: 2009-02-07
   bugfixes:

data/README.txt

@@ -1,6 +1,6 @@
 = README
 
-release::	2.6.3
+release::	2.6.4
 copyright::	copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 
 

data/benchmark/bench.rb

@@ -2,7 +2,7 @@
 
 ###
 ### $Rev: 101 $
-### $Release: 2.6.3 $
+### $Release: 2.6.4 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

data/bin/erubis

@@ -2,7 +2,7 @@
 
 ###
 ### $Rev: 121 $
-### $Release: 2.6.3 $
+### $Release: 2.6.4 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

data/contrib/erubis

@@ -2,14 +2,14 @@
 
 ###
 ### $Rev: 121 $
-### $Release: 2.6.3 $
+### $Release: 2.6.4 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 
 #--begin of require 'erubis/main'
 ###
 ### $Rev: 122 $
-### $Release: 2.6.3 $
+### $Release: 2.6.4 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 
@@ -17,7 +17,7 @@ require 'yaml'
 #--begin of require 'erubis'
 ##
 ## $Rev: 99 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -65,13 +65,13 @@ require 'yaml'
 
 
 module Erubis
-  VERSION = ('$Release: 2.6.3 $' =~ /([.\d]+)/) && $1
+  VERSION = ('$Release: 2.6.4 $' =~ /([.\d]+)/) && $1
 end
 
 #--begin of require 'erubis/engine'
 ##
 ## $Rev: 104 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -79,7 +79,7 @@ end
 #--begin of require 'erubis/generator'
 ##
 ## $Rev: 77 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -243,7 +243,7 @@ end
 #--begin of require 'erubis/converter'
 ##
 ## $Rev: 115 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -603,14 +603,14 @@ end
 #--begin of require 'erubis/evaluator'
 ##
 ## $Rev: 115 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 #--begin of require 'erubis/error'
 ##
 ## $Rev: 77 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -636,7 +636,7 @@ end
 #--begin of require 'erubis/context'
 ##
 ## $Rev: 77 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -921,7 +921,7 @@ end
 #--begin of require 'erubis/helper'
 ##
 ## $Rev: 89 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -971,7 +971,7 @@ end
 #--begin of require 'erubis/enhancer'
 ##
 ## $Rev: 115 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -1655,7 +1655,7 @@ end
 #--begin of require 'erubis/engine/eruby'
 ##
 ## $Rev: 77 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -1791,7 +1791,7 @@ end
 #--begin of require 'erubis/local-setting'
 ##
 ## $Rev: 77 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -1804,7 +1804,7 @@ end
 #--begin of require 'erubis/tiny'
 ##
 ## $Rev: 115 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -1952,7 +1952,7 @@ end
 #--begin of require 'erubis/engine/enhanced'
 ##
 ## $Rev: 77 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2076,7 +2076,7 @@ end
 #--begin of require 'erubis/engine/optimized'
 ##
 ## $Rev: 77 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2207,7 +2207,7 @@ end
 #--begin of require 'erubis/engine/ephp'
 ##
 ## $Rev: 77 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2309,7 +2309,7 @@ end
 #--begin of require 'erubis/engine/ec'
 ##
 ## $Rev: 77 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2429,7 +2429,7 @@ end
 #--begin of require 'erubis/engine/ejava'
 ##
 ## $Rev: 77 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2542,7 +2542,7 @@ end
 #--begin of require 'erubis/engine/escheme'
 ##
 ## $Rev: 77 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2659,7 +2659,7 @@ end
 #--begin of require 'erubis/engine/eperl'
 ##
 ## $Rev: 77 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -2757,7 +2757,7 @@ end
 #--begin of require 'erubis/engine/ejavascript'
 ##
 ## $Rev: 95 $
-## $Release: 2.6.3 $
+## $Release: 2.6.4 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/contrib/inline-require

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

data/doc-api/classes/ActionView/TemplateHandlers/ErubisHandler.html

@@ -88,6 +88,7 @@
       <div class="name-list">
       <a href="#M000001">compile</a>&nbsp;&nbsp;
       <a href="#M000002">compile</a>&nbsp;&nbsp;
+      <a href="#M000003">compile</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -99,6 +100,9 @@
       <h3 class="section-bar">Included Modules</h3>
 
       <div id="includes-list">
+        <span class="include-name">Compilable</span>
+        <span class="include-name"><a href="../../Erubis/Helpers/RailsHelper/TemplateConverter.html">::Erubis::Helpers::RailsHelper::TemplateConverter</a></span>
+        <span class="include-name"><a href="../../Erubis/PreprocessingHelper.html">::Erubis::PreprocessingHelper</a></span>
         <span class="include-name">Compilable</span>
         <span class="include-name"><a href="../../Erubis/Helpers/RailsHelper/TemplateConverter.html">Erubis::Helpers::RailsHelper::TemplateConverter</a></span>
         <span class="include-name"><a href="../../Erubis/PreprocessingHelper.html">Erubis::PreprocessingHelper</a></span>
@@ -134,9 +138,10 @@
             onclick="toggleCode('M000001-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000001-source">
 <pre>
-<span class="ruby-comment cmt"># File erubis/helpers/rails_helper.rb, line 150</span>
+<span class="ruby-comment cmt"># File erubis/helpers/rails_helper.rb, line 154</span>
           <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">compile</span>(<span class="ruby-identifier">template</span>)
-            <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">_convert_template</span>(<span class="ruby-identifier">template</span>.<span class="ruby-identifier">source</span>)   <span class="ruby-comment cmt"># template.is_a?(ActionView::Template)</span>
+            <span class="ruby-comment cmt">#src = ::ERB.new(&quot;&lt;% __in_erb_template=true %&gt;#{template.source}&quot;, nil, erb_trim_mode, '@output_buffer').src</span>
+            <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">_convert_template</span>(<span class="ruby-node">&quot;&lt;% __in_erb_template=true %&gt;#{template.source}&quot;</span>)
           <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
@@ -158,6 +163,29 @@
           <div class="method-source-code" id="M000002-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/helpers/rails_helper.rb, line 180</span>
+          <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">compile</span>(<span class="ruby-identifier">template</span>)
+            <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">_convert_template</span>(<span class="ruby-identifier">template</span>.<span class="ruby-identifier">source</span>)   <span class="ruby-comment cmt"># template.is_a?(ActionView::Template)</span>
+          <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000003" class="method-detail">
+        <a name="M000003"></a>
+
+        <div class="method-heading">
+          <a href="#M000003" class="method-signature">
+          <span class="method-name">compile</span><span class="method-args">(template)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000003-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000003-source">
+<pre>
+<span class="ruby-comment cmt"># File erubis/helpers/rails_helper.rb, line 210</span>
           <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">compile</span>(<span class="ruby-identifier">template</span>)
             <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">_convert_template</span>(<span class="ruby-identifier">template</span>)     <span class="ruby-comment cmt"># template.is_a?(String)</span>
           <span class="ruby-keyword kw">end</span>

data/doc-api/classes/Erubis.html

@@ -328,7 +328,7 @@ Class <a href="Erubis/XmlEruby.html" class="link">Erubis::XmlEruby</a><br />
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">VERSION</td>
           <td>=</td>
-          <td class="context-item-value">('$Release: 2.6.3 $' =~ /([.\d]+)/) &amp;&amp; $1</td>
+          <td class="context-item-value">('$Release: 2.6.4 $' =~ /([.\d]+)/) &amp;&amp; $1</td>
         </tr>
         </table>
       </div>

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

@@ -90,8 +90,8 @@ this is only for <a href="Eruby.html">Eruby</a>.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000009">add_postamble</a>&nbsp;&nbsp;
-      <a href="#M000008">add_preamble</a>&nbsp;&nbsp;
+      <a href="#M000010">add_postamble</a>&nbsp;&nbsp;
+      <a href="#M000009">add_preamble</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -113,19 +113,19 @@ this is only for <a href="Eruby.html">Eruby</a>.
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000009" class="method-detail">
-        <a name="M000009"></a>
+      <div id="method-M000010" class="method-detail">
+        <a name="M000010"></a>
 
         <div class="method-heading">
-          <a href="#M000009" class="method-signature">
+          <a href="#M000010" class="method-signature">
           <span class="method-name">add_postamble</span><span class="method-args">(src)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000009-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000009-source">
+            onclick="toggleCode('M000010-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000010-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/enhancer.rb, line 192</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_postamble</span>(<span class="ruby-identifier">src</span>)
@@ -137,19 +137,19 @@ this is only for <a href="Eruby.html">Eruby</a>.
         </div>
       </div>
 
-      <div id="method-M000008" class="method-detail">
-        <a name="M000008"></a>
+      <div id="method-M000009" class="method-detail">
+        <a name="M000009"></a>
 
         <div class="method-heading">
-          <a href="#M000008" class="method-signature">
+          <a href="#M000009" class="method-signature">
           <span class="method-name">add_preamble</span><span class="method-args">(src)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000008-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000008-source">
+            onclick="toggleCode('M000009-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000009-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/enhancer.rb, line 188</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_preamble</span>(<span class="ruby-identifier">src</span>)

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

@@ -89,8 +89,8 @@ this is only for <a href="Eruby.html">Eruby</a>.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000191">add_postamble</a>&nbsp;&nbsp;
-      <a href="#M000190">add_preamble</a>&nbsp;&nbsp;
+      <a href="#M000194">add_postamble</a>&nbsp;&nbsp;
+      <a href="#M000193">add_preamble</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -112,19 +112,19 @@ this is only for <a href="Eruby.html">Eruby</a>.
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000191" class="method-detail">
-        <a name="M000191"></a>
+      <div id="method-M000194" class="method-detail">
+        <a name="M000194"></a>
 
         <div class="method-heading">
-          <a href="#M000191" class="method-signature">
+          <a href="#M000194" class="method-signature">
           <span class="method-name">add_postamble</span><span class="method-args">(src)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000191-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000191-source">
+            onclick="toggleCode('M000194-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000194-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/enhancer.rb, line 169</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_postamble</span>(<span class="ruby-identifier">src</span>)
@@ -136,19 +136,19 @@ this is only for <a href="Eruby.html">Eruby</a>.
         </div>
       </div>
 
-      <div id="method-M000190" class="method-detail">
-        <a name="M000190"></a>
+      <div id="method-M000193" class="method-detail">
+        <a name="M000193"></a>
 
         <div class="method-heading">
-          <a href="#M000190" class="method-signature">
+          <a href="#M000193" class="method-signature">
           <span class="method-name">add_preamble</span><span class="method-args">(src)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000190-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000190-source">
+            onclick="toggleCode('M000193-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000193-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/enhancer.rb, line 165</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_preamble</span>(<span class="ruby-identifier">src</span>)

data/doc-api/classes/Erubis/Basic/Converter.html

@@ -86,10 +86,10 @@ basic converter which supports ’<% … %>’ notation.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000138">add_expr</a>&nbsp;&nbsp;
-      <a href="#M000137">convert_input</a>&nbsp;&nbsp;
-      <a href="#M000135">init_converter</a>&nbsp;&nbsp;
-      <a href="#M000136">pattern_regexp</a>&nbsp;&nbsp;
+      <a href="#M000141">add_expr</a>&nbsp;&nbsp;
+      <a href="#M000140">convert_input</a>&nbsp;&nbsp;
+      <a href="#M000138">init_converter</a>&nbsp;&nbsp;
+      <a href="#M000139">pattern_regexp</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -156,11 +156,11 @@ DEFAULT_REGEXP = /&lt;%(=+|\#)?(.*?)-?%&gt;([ \t]*\r?\n)?/m
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000138" class="method-detail">
-        <a name="M000138"></a>
+      <div id="method-M000141" class="method-detail">
+        <a name="M000141"></a>
 
         <div class="method-heading">
-          <a href="#M000138" class="method-signature">
+          <a href="#M000141" class="method-signature">
           <span class="method-name">add_expr</span><span class="method-args">(src, code, indicator)</span>
           </a>
         </div>
@@ -170,8 +170,8 @@ DEFAULT_REGEXP = /&lt;%(=+|\#)?(.*?)-?%&gt;([ \t]*\r?\n)?/m
 add expression code to src
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000138-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000138-source">
+            onclick="toggleCode('M000141-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000141-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/converter.rb, line 177</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_expr</span>(<span class="ruby-identifier">src</span>, <span class="ruby-identifier">code</span>, <span class="ruby-identifier">indicator</span>)
@@ -189,19 +189,19 @@ add expression code to src
         </div>
       </div>
 
-      <div id="method-M000137" class="method-detail">
-        <a name="M000137"></a>
+      <div id="method-M000140" class="method-detail">
+        <a name="M000140"></a>
 
         <div class="method-heading">
-          <a href="#M000137" class="method-signature">
+          <a href="#M000140" class="method-signature">
           <span class="method-name">convert_input</span><span class="method-args">(src, input)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000137-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000137-source">
+            onclick="toggleCode('M000140-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000140-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/converter.rb, line 128</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">convert_input</span>(<span class="ruby-identifier">src</span>, <span class="ruby-identifier">input</span>)
@@ -256,19 +256,19 @@ add expression code to src
         </div>
       </div>
 
-      <div id="method-M000135" class="method-detail">
-        <a name="M000135"></a>
+      <div id="method-M000138" class="method-detail">
+        <a name="M000138"></a>
 
         <div class="method-heading">
-          <a href="#M000135" class="method-signature">
+          <a href="#M000138" class="method-signature">
           <span class="method-name">init_converter</span><span class="method-args">(properties={})</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000135-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000135-source">
+            onclick="toggleCode('M000138-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000138-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/converter.rb, line 104</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">init_converter</span>(<span class="ruby-identifier">properties</span>={})
@@ -283,11 +283,11 @@ add expression code to src
 
       <h3 class="section-bar">Protected Instance methods</h3>
 
-      <div id="method-M000136" class="method-detail">
-        <a name="M000136"></a>
+      <div id="method-M000139" class="method-detail">
+        <a name="M000139"></a>
 
         <div class="method-heading">
-          <a href="#M000136" class="method-signature">
+          <a href="#M000139" class="method-signature">
           <span class="method-name">pattern_regexp</span><span class="method-args">(pattern)</span>
           </a>
         </div>
@@ -297,8 +297,8 @@ add expression code to src
 return regexp of pattern to parse eRuby script
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000136-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000136-source">
+            onclick="toggleCode('M000139-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000139-source">
 <pre>
 <span class="ruby-comment cmt"># File erubis/converter.rb, line 113</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">pattern_regexp</span>(<span class="ruby-identifier">pattern</span>)