erubis 2.4.0 → 2.4.1

data/CHANGES

@@ -1,7 +1,60 @@
-# $Rev: 91 $
-# $Release: 2.4.0 $
+# $Rev: 95 $
+# $Release: 2.4.1 $
 # copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 
+#
+- release:   2.4.1
+  date:      2007-09-25
+  enhancements:
+
+    - |
+      Add new section 'evaluate(context) v.s. result(binding)' to user's guide.
+      This section describes why Erubis::Eruby#evaluate(context) is recommended
+      rather than Erubis::Eruby#result(binding).
+      User's Guide > Other Topics > evaluate(context) v.s. result(binding)
+      http://www.kuwata-lab.com/erubis/users-guide.06.html#topics-context-vs-binding
+
+    - |
+      Add new command-line property '--docwrite={true|false}' to
+      Erubis::Ejavascript.
+      If this property is true then 'document.write(_buf.join(""));' is used
+      as postamble and if it is false then '_buf.join("")' is used.
+      Default is true for compatibility reason but it will be false in the
+      future release.
+      (This feature was proposed by D.Dribin. Thank you.)
+
+  bugfix:
+
+    - |
+      When using Erubis::Eruby#evaluate(), changing local variables in
+      templates have affected to variables accessible with TOPLEVEL_BINDING.
+      It means that if you change variables in templates, it is possible to
+      change variables in main program.
+      This was a bug and is now fixed not to affect to variables in main
+      program.
+
+      ex. template.rhtml
+      --------------------
+      <% for x in @items %>
+      item = <%= x %>
+      <% end %>
+      --------------------
+
+      ex. main-program.rb
+      --------------------
+      require 'erubis'
+      x = 10
+      items = ['foo', 'bar', 'baz']
+      eruby = Erubis::Eruby.new(File.read('template.rhtml'))
+      s = eruby.evaluate(:items=>items)
+      print s
+      $stderr.puts "*** debug: x=#{x.inspect}"  #=> x="baz" (2.4.0)
+                                                #=> x=10    (2.4.1)
+      --------------------
+
+    - |
+      PercentLineEnhancer was very slow. Now performance problem is solved.
+
 
 #
 - release:   2.4.0

data/README.txt

@@ -1,6 +1,6 @@
 = README
 
-release::	2.4.0
+release::	2.4.1
 copyright::	copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 
 

data/benchmark/bench.rb

@@ -2,7 +2,7 @@
 
 ###
 ### $Rev: 77 $
-### $Release: 2.4.0 $
+### $Release: 2.4.1 $
 ### copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ###
 

data/bin/erubis

@@ -2,7 +2,7 @@
 
 ###
 ### $Rev: 77 $
-### $Release: 2.4.0 $
+### $Release: 2.4.1 $
 ### copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ###
 

data/contrib/erubis

@@ -2,14 +2,14 @@
 
 ###
 ### $Rev: 77 $
-### $Release: 2.4.0 $
+### $Release: 2.4.1 $
 ### copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ###
 
 #--begin of require 'erubis/main'
 ###
 ### $Rev: 91 $
-### $Release: 2.4.0 $
+### $Release: 2.4.1 $
 ### copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ###
 
@@ -17,7 +17,7 @@ require 'yaml'
 #--begin of require 'erubis'
 ##
 ## $Rev: 59 $
-## 2.4.0
+## 2.4.1
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -65,13 +65,13 @@ require 'yaml'
 
 
 module Erubis
-  VERSION = ('$Release: 2.4.0 $' =~ /([.\d]+)/) && $1
+  VERSION = ('$Release: 2.4.1 $' =~ /([.\d]+)/) && $1
 end
 
 #--begin of require 'erubis/engine'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -79,7 +79,7 @@ end
 #--begin of require 'erubis/generator'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -243,7 +243,7 @@ end
 #--begin of require 'erubis/converter'
 ##
 ## $Rev: 89 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -596,15 +596,15 @@ end
 #--end of require 'erubis/converter'
 #--begin of require 'erubis/evaluator'
 ##
-## $Rev: 91 $
-## $Release: 2.4.0 $
+## $Rev: 94 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
 #--begin of require 'erubis/error'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -630,7 +630,7 @@ end
 #--begin of require 'erubis/context'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -717,6 +717,8 @@ end
 
 module Erubis
 
+  EMPTY_BINDING = binding()
+
 
   ##
   ## evaluate code
@@ -771,7 +773,7 @@ module Erubis
     def evaluate(context=Context.new)
       context = Context.new(context) if context.is_a?(Hash)
       #return context.instance_eval(@src, @filename || '(erubis)')
-      @_proc ||= eval("proc { #{@src} }", TOPLEVEL_BINDING, @filename || '(erubis)')
+      @_proc ||= eval("proc { #{@src} }", Erubis::EMPTY_BINDING, @filename || '(erubis)')
       return context.instance_eval(&@_proc)
     end
 
@@ -905,7 +907,7 @@ end
 #--begin of require 'erubis/helper'
 ##
 ## $Rev: 89 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -954,8 +956,8 @@ end
 #--end of require 'erubis/helper'
 #--begin of require 'erubis/enhancer'
 ##
-## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Rev: 93 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -1398,18 +1400,33 @@ module Erubis
       "regard lines starting with '%' as program code"
     end
 
-    PERCENT_LINE_PATTERN = /(.*?)^\%(.*?\r?\n)/m
-
     def add_text(src, text)
-      text.scan(PERCENT_LINE_PATTERN) do |txt, line|
-        super(src, txt)
+      pos = 0
+      text2 = ''
+      text.scan(/^\%(.*?\r?\n)/) do
+        line  = $1
+        match = Regexp.last_match
+        len   = match.begin(0) - pos
+        str   = text[pos, len]
+        pos   = match.end(0)
+        if text2.empty?
+          text2 = str
+        else
+          text2 << str
+        end
         if line[0] == ?%
-          super(src, line)
+          text2 << line
         else
+          super(src, text2)
+          text2 = ''
           add_stmt(src, line)
         end
       end
-      rest = $' || text
+      rest = pos == 0 ? text : $'  # or $' || text
+      unless text2.empty?
+        text2 << rest if rest
+        rest = text2
+      end
       super(src, rest)
     end
 
@@ -1614,7 +1631,7 @@ end
 #--begin of require 'erubis/engine/eruby'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -1750,7 +1767,7 @@ end
 #--begin of require 'erubis/local-setting'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -1763,7 +1780,7 @@ end
 #--begin of require 'erubis/tiny'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -1909,7 +1926,7 @@ end
 #--begin of require 'erubis/engine/enhanced'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -2033,7 +2050,7 @@ end
 #--begin of require 'erubis/engine/optimized'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -2164,7 +2181,7 @@ end
 #--begin of require 'erubis/engine/ephp'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -2266,7 +2283,7 @@ end
 #--begin of require 'erubis/engine/ec'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -2386,7 +2403,7 @@ end
 #--begin of require 'erubis/engine/ejava'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -2499,7 +2516,7 @@ end
 #--begin of require 'erubis/engine/escheme'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -2616,7 +2633,7 @@ end
 #--begin of require 'erubis/engine/eperl'
 ##
 ## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -2713,8 +2730,8 @@ end
 #--end of require 'erubis/engine/eperl'
 #--begin of require 'erubis/engine/ejavascript'
 ##
-## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Rev: 95 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -2732,6 +2749,7 @@ module Erubis
       list = []
       #list << [:indent,   '',       "indent spaces (ex. '  ')"]
       #list << [:buf,      '_buf',   "output buffer name"]
+      list << [:docwrite, true,     "use 'document.write()' when true"]
       return list
     end
 
@@ -2740,6 +2758,7 @@ module Erubis
       @escapefunc ||= 'escape'
       @indent = properties[:indent] || ''
       @buf = properties[:out] || '_buf'
+      @docwrite = properties[:docwrite] != false  # '!= false' will be removed in the next release
     end
 
     def add_preamble(src)
@@ -2790,7 +2809,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(' << @buf << ".join(\"\"));\n"
+      else
+        src << @indent << @buf << ".join(\"\");\n"
+      end
     end
 
   end

data/contrib/inline-require

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

data/doc-api/classes/Erubis.html

@@ -300,6 +300,11 @@ Class <a href="Erubis/XmlEruby.html" class="link">Erubis::XmlEruby</a><br />
 
       <div class="name-list">
         <table summary="Constants">
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">EMPTY_BINDING</td>
+          <td>=</td>
+          <td class="context-item-value">binding()</td>
+        </tr>
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">Ejs</td>
           <td>=</td>
@@ -313,7 +318,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.4.0 $' =~ /([.\d]+)/) &amp;&amp; $1</td>
+          <td class="context-item-value">('$Release: 2.4.1 $' =~ /([.\d]+)/) &amp;&amp; $1</td>
         </tr>
         </table>
       </div>

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

@@ -125,7 +125,7 @@ this is language-independent.
             onclick="toggleCode('M000163-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000163-source">
 <pre>
-<span class="ruby-comment cmt"># File erubis/enhancer.rb, line 556</span>
+<span class="ruby-comment cmt"># File erubis/enhancer.rb, line 571</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>)
       <span class="ruby-identifier">input</span> = <span class="ruby-identifier">input</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-regexp re">/^[ \t]+&lt;/</span>, <span class="ruby-value str">'&lt;'</span>)
       <span class="ruby-keyword kw">super</span>(<span class="ruby-identifier">src</span>, <span class="ruby-identifier">input</span>)

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

@@ -142,7 +142,7 @@
             onclick="toggleCode('M000062-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000062-source">
 <pre>
-<span class="ruby-comment cmt"># File erubis/evaluator.rb, line 33</span>
+<span class="ruby-comment cmt"># File erubis/evaluator.rb, line 35</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">evaluate</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
       <span class="ruby-identifier">raise</span> <span class="ruby-constant">NotSupportedError</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">&quot;evaluation of code except Ruby is not supported.&quot;</span>)
     <span class="ruby-keyword kw">end</span>
@@ -165,7 +165,7 @@
             onclick="toggleCode('M000060-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000060-source">
 <pre>
-<span class="ruby-comment cmt"># File erubis/evaluator.rb, line 25</span>
+<span class="ruby-comment cmt"># File erubis/evaluator.rb, line 27</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">init_evaluator</span>(<span class="ruby-identifier">properties</span>)
       <span class="ruby-ivar">@filename</span> = <span class="ruby-identifier">properties</span>[<span class="ruby-identifier">:filename</span>]
     <span class="ruby-keyword kw">end</span>
@@ -188,7 +188,7 @@
             onclick="toggleCode('M000061-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000061-source">
 <pre>
-<span class="ruby-comment cmt"># File erubis/evaluator.rb, line 29</span>
+<span class="ruby-comment cmt"># File erubis/evaluator.rb, line 31</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">result</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
       <span class="ruby-identifier">raise</span> <span class="ruby-constant">NotSupportedError</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">&quot;evaluation of code except Ruby is not supported.&quot;</span>)
     <span class="ruby-keyword kw">end</span>

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

@@ -207,7 +207,7 @@ this is language-independent.
             onclick="toggleCode('M000094-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000094-source">
 <pre>
-<span class="ruby-comment cmt"># File erubis/enhancer.rb, line 522</span>
+<span class="ruby-comment cmt"># File erubis/enhancer.rb, line 537</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_text</span>(<span class="ruby-identifier">src</span>, <span class="ruby-identifier">text</span>)
       <span class="ruby-identifier">text</span>.<span class="ruby-identifier">scan</span>(<span class="ruby-constant">HEADER_FOOTER_PATTERN</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">txt</span>, <span class="ruby-identifier">lspace</span>, <span class="ruby-identifier">word</span>, <span class="ruby-identifier">content</span>, <span class="ruby-identifier">rspace</span><span class="ruby-operator">|</span>
         <span class="ruby-identifier">flag_trim</span> = <span class="ruby-ivar">@trim</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">lspace</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">rspace</span>
@@ -239,7 +239,7 @@ this is language-independent.
             onclick="toggleCode('M000095-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000095-source">
 <pre>
-<span class="ruby-comment cmt"># File erubis/enhancer.rb, line 537</span>
+<span class="ruby-comment cmt"># File erubis/enhancer.rb, line 552</span>
     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">convert</span>(<span class="ruby-identifier">input</span>)
       <span class="ruby-identifier">source</span> = <span class="ruby-keyword kw">super</span>
       <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@src</span> = <span class="ruby-node">&quot;#{@header}#{source}#{@footer}&quot;</span>