erubis 2.6.1 → 2.6.2

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

@@ -165,7 +165,8 @@ DEFAULT_REGEXP = /(^[ \t]*)?<%(=+|\#)?(.*?)-?%>([ \t]*\r?\n)?/m
           <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>)
         <span class="ruby-keyword kw">end</span>
       <span class="ruby-keyword kw">end</span>
-      <span class="ruby-identifier">rest</span> = <span class="ruby-identifier">$'</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">input</span>
+      <span class="ruby-comment cmt">#rest = $' || input                      # ruby1.8</span>
+      <span class="ruby-identifier">rest</span> = <span class="ruby-identifier">pos</span> <span class="ruby-operator">==</span> <span class="ruby-value">0</span> <span class="ruby-operator">?</span> <span class="ruby-identifier">input</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">input</span>[<span class="ruby-identifier">pos</span><span class="ruby-operator">..</span><span class="ruby-value">-1</span>]  <span class="ruby-comment cmt"># ruby1.9</span>
       <span class="ruby-identifier">add_text</span>(<span class="ruby-identifier">src</span>, <span class="ruby-identifier">rest</span>)
       <span class="ruby-identifier">add_postamble</span>(<span class="ruby-identifier">src</span>)
       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">src</span>

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

@@ -211,7 +211,8 @@ ex.
           <span class="ruby-identifier">src</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">&quot; _buf &lt;&lt; (&quot;</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">code</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">&quot;).to_s;&quot;</span>
         <span class="ruby-keyword kw">end</span>
       <span class="ruby-keyword kw">end</span>
-      <span class="ruby-identifier">rest</span> = <span class="ruby-identifier">$'</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">input</span>
+      <span class="ruby-comment cmt">#rest = $' || input                        # ruby1.8</span>
+      <span class="ruby-identifier">rest</span> = <span class="ruby-identifier">pos</span> <span class="ruby-operator">==</span> <span class="ruby-value">0</span> <span class="ruby-operator">?</span> <span class="ruby-identifier">input</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">input</span>[<span class="ruby-identifier">pos</span><span class="ruby-operator">..</span><span class="ruby-value">-1</span>]   <span class="ruby-comment cmt"># ruby1.9</span>
       <span class="ruby-comment cmt">#src &lt;&lt; &quot; _buf &lt;&lt; '&quot; &lt;&lt; escape_text(rest) &lt;&lt; &quot;';&quot;</span>
       <span class="ruby-identifier">rest</span>.<span class="ruby-identifier">gsub!</span>(<span class="ruby-regexp re">/['\\]/</span>, <span class="ruby-value str">'\\\\\&amp;'</span>)
       <span class="ruby-identifier">src</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">&quot; _buf &lt;&lt; '&quot;</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">rest</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">&quot;';&quot;</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">rest</span>.<span class="ruby-identifier">empty?</span>
@@ -237,7 +238,7 @@ ex.
             onclick="toggleCode('M000203-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000203-source">
 <pre>
-<span class="ruby-comment cmt"># File erubis/tiny.rb, line 62</span>
+<span class="ruby-comment cmt"># File erubis/tiny.rb, line 63</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">evaluate</span>(<span class="ruby-identifier">_context</span>=<span class="ruby-constant">Object</span>.<span class="ruby-identifier">new</span>)
       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">_context</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Hash</span>)
         <span class="ruby-identifier">_obj</span> = <span class="ruby-constant">Object</span>.<span class="ruby-identifier">new</span>
@@ -274,7 +275,7 @@ end
             onclick="toggleCode('M000202-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000202-source">
 <pre>
-<span class="ruby-comment cmt"># File erubis/tiny.rb, line 58</span>
+<span class="ruby-comment cmt"># File erubis/tiny.rb, line 59</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">result</span>(<span class="ruby-identifier">_binding</span>=<span class="ruby-constant">TOPLEVEL_BINDING</span>)
       <span class="ruby-identifier">eval</span> <span class="ruby-ivar">@src</span>, <span class="ruby-identifier">_binding</span>
     <span class="ruby-keyword kw">end</span>

data/doc-api/created.rid

@@ -1 +1 @@
-Fri, 06 Jun 2008 05:00:14 +0900
+Fri, 13 Jun 2008 08:04:36 +0900

data/doc-api/files/README_txt.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Jun 06 05:00:12 +0900 2008</td>
+      <td>Fri Jun 13 08:04:35 +0900 2008</td>
     </tr>
     </table>
   </div>
@@ -71,7 +71,7 @@
     <div id="description">
       <h1>README</h1>
 <table>
-<tr><td valign="top">release:</td><td>2.6.1
+<tr><td valign="top">release:</td><td>2.6.2
 
 </td></tr>
 <tr><td valign="top">copyright:</td><td>copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
@@ -120,7 +120,8 @@ datafile
 </ul>
 <p>
 <a href="../classes/Erubis.html">Erubis</a> is implemented in pure Ruby. It
-requires Ruby 1.8 or higher.
+requires Ruby 1.8 or higher. <a href="../classes/Erubis.html">Erubis</a>
+now supports Ruby 1.9.
 </p>
 <p>
 See doc/users-guide.html for details.

data/doc-api/files/erubis/context_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 77 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/converter_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Jun 06 04:46:06 +0900 2008</td>
+      <td>Thu Jun 12 20:22:02 +0900 2008</td>
     </tr>
     </table>
   </div>
@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 104 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 115 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/engine/ec_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 77 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/engine/ejava_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 77 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/engine/ejavascript_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 95 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 95 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/engine/enhanced_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 77 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/engine/eperl_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 77 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/engine/ephp_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 77 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/engine/eruby_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 77 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/engine/escheme_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 77 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/engine/optimized_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 77 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/engine_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 104 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 104 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/enhancer_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Tue Apr 29 22:26:32 +0900 2008</td>
+      <td>Thu Jun 12 20:22:02 +0900 2008</td>
     </tr>
     </table>
   </div>
@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 103 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 115 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/error_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 77 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/evaluator_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Tue Sep 18 17:02:49 +0900 2007</td>
+      <td>Thu Jun 12 20:22:02 +0900 2008</td>
     </tr>
     </table>
   </div>
@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 94 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 115 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/generator_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 77 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/helper_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 89 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 89 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/helpers/rails_form_helper_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 109 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 109 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/helpers/rails_helper_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 112 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 112 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/local-setting_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 77 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/main_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Thu Jul 19 13:13:21 +0900 2007</td>
+      <td>Thu Jun 12 21:08:47 +0900 2008</td>
     </tr>
     </table>
   </div>
@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 91 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 116 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/preprocessing_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 102 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 102 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis/tiny_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri May 18 16:17:19 +0900 2007</td>
+      <td>Thu Jun 12 20:22:02 +0900 2008</td>
     </tr>
     </table>
   </div>
@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 77 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 115 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis_rb.html

@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 99 $ $Release: 2.6.1 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+$Rev: 99 $ $Release: 2.6.2 $ copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc/users-guide.html

@@ -14,10 +14,10 @@
 
     <div align="left"><h1>Erubis Users' Guide</h1></div>
     <div align="left">
-      last update: $Date: 2008-05-05 18:47:05 +0900 (Mon, 05 May 2008) $<br>
+      last update: $Date: 2008-06-13 08:04:21 +0900 (Fri, 13 Jun 2008) $<br>
     </div>
 
-<p>release: 2.6.1
+<p>release: 2.6.2
 </p>
 <a name="preface"></a>
 <h2 class="section1">Preface</h2>
@@ -51,6 +51,7 @@ It has the following features.
 </li>
 </ul>
 <p>Erubis is implemented in pure Ruby.  It requires Ruby 1.8 or higher.
+Erubis now supports Ruby 1.9.
 </p>
 <a name="toc"></a>
 <h3 class="section2">Table of Contents</h3>
@@ -256,6 +257,7 @@ puts <strong>eruby.src</strong>                      # print script source
 puts "---------- result ----------"
 list = ['aaa', 'bbb', 'ccc']
 puts <strong>eruby.result(binding())</strong>        # get result
+## or puts eruby.result(<strong>:list=&gt;list</strong>)  # or pass Hash instead of Binding
 
 ## # or
 ## eruby = Erubis::Eruby.new
@@ -620,22 +622,22 @@ This means that data is passed into eRuby script via local variables when Eruby:
 </p>
 <div class="program_caption">
 definition of result(binding) and evaluate(context)</div>
-<pre class="program">def result(_binding)
+<pre class="program">def result(_binding=TOPLEVEL_BINDING)
   if _binding.is_a?(Hash)
     # load hash data as local variable
     _h = _binding
-    eval _h.keys.inject("") {|s,k| s &lt;&lt; "#{k} = _h[#{k.inspect}];"}
     _binding = binding()
+    eval _h.collect{|k,v| "#{k} = _h[#{k.inspect}];"}.join, _binding
   end
   return <strong>eval(@src, _binding)</strong>
 end
 
-def evaluate(_context)
+def evaluate(_context=Erubis::Context.new)
   if _context.is_a?(Hash)
     # convert hash object to Context object
     _hash = _context
     _context = Erubis::Context.new
-    _hash.each { |key, val| _context[key] = val }
+    _hash.each {|k, v| _context[k] = v }
   end
   return <strong>_context.instance_eval(@src)</strong>
 end
@@ -2750,7 +2752,7 @@ Result:</div>
 item = foo
 item = bar
 item = baz
-** debug: local variables=["x", "_buf"]
+** debug: local variables=["_context", "x", "_buf"]
 ** debug: x=1
 </pre>
 <br>
@@ -2984,8 +2986,8 @@ example of using NoCodeEnhancer with PHP file</div>
 <p>Thanks Andrew R Jackson, he developed 'erubis-run.rb' which enables you to use Erubis with mod_ruby.
 </p>
 <ol type="1">
-<li>Copy 'erubis-2.6.1/contrib/erubis-run.rb' to the 'RUBYLIBDIR/apache' directory (for example '/usr/local/lib/ruby/1.8/apache') which contains 'ruby-run.rb', 'eruby-run.rb', and so on.
-<pre class="terminal">$ cd erubis-2.6.1/
+<li>Copy 'erubis-2.6.2/contrib/erubis-run.rb' to the 'RUBYLIBDIR/apache' directory (for example '/usr/local/lib/ruby/1.8/apache') which contains 'ruby-run.rb', 'eruby-run.rb', and so on.
+<pre class="terminal">$ cd erubis-2.6.2/
 $ sudo copy contrib/erubis-run.rb /usr/local/lib/ruby/1.8/apache/
 </pre>
 </li>
@@ -3061,12 +3063,12 @@ p obj.render('world')          #=&gt; "hello world"
 
 <a name="topics-benchmark"></a>
 <h3 class="section2">Benchmark</h3>
-<p>A benchmark script is included in Erubis package at 'erubis-2.6.1/benchark/' directory.
+<p>A benchmark script is included in Erubis package at 'erubis-2.6.2/benchark/' directory.
 Here is an example result of benchmark.
 </p>
 <div class="terminal_caption">
 MacOS X 10.4 Tiger, Intel CoreDuo 1.83GHz, Ruby1.8.6, eruby1.0.5, gcc4.0.1</div>
-<pre class="terminal">$ cd erubis-2.6.1/benchmark/
+<pre class="terminal">$ cd erubis-2.6.2/benchmark/
 $ ruby bench.rb -n 10000 -m execute
 *** ntimes=10000, testmode=execute
                                     user     system      total        real

data/lib/erubis.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 99 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -48,7 +48,7 @@
 
 
 module Erubis
-  VERSION = ('$Release: 2.6.1 $' =~ /([.\d]+)/) && $1
+  VERSION = ('$Release: 2.6.2 $' =~ /([.\d]+)/) && $1
 end
 
 require 'erubis/engine'