erubis 2.6.4 → 2.6.5

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>Thu Jun 12 20:22:02 +0900 2008</td>
+      <td>Tue Jul 14 09:47:22 +0900 2009</td>
     </tr>
     </table>
   </div>
@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 115 $ $Release: 2.6.4 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+$Release: 2.6.5 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 </p>
 
     </div>

data/doc-api/files/erubis_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jan 30 23:27:58 +0900 2008</td>
+      <td>Tue Jul 14 09:47:22 +0900 2009</td>
     </tr>
     </table>
   </div>
@@ -70,7 +70,7 @@
 
     <div id="description">
       <p>
-$Rev: 99 $ $Release: 2.6.4 $ copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
+$Release: 2.6.5 $ copyright(c) 2006-2009 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-06-13 08:04:21 +0900 (Fri, 13 Jun 2008) $<br>
+      last update: $Date$<br>
     </div>
 
-<p>release: 2.6.4
+<p>release: 2.6.5
 </p>
 <a name="preface"></a>
 <h2 class="section1">Preface</h2>
@@ -2986,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.4/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.4/
+<li>Copy 'erubis-2.6.5/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.5/
 $ sudo copy contrib/erubis-run.rb /usr/local/lib/ruby/1.8/apache/
 </pre>
 </li>
@@ -3063,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.4/benchark/' directory.
+<p>A benchmark script is included in Erubis package at 'erubis-2.6.5/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.4/benchmark/
+<pre class="terminal">$ cd erubis-2.6.5/benchmark/
 $ ruby bench.rb -n 10000 -m execute
 *** ntimes=10000, testmode=execute
                                     user     system      total        real

data/lib/erubis.rb

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

data/lib/erubis/context.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/converter.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 115 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 104 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/ec.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/ejava.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/ejavascript.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 95 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/enhanced.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/eperl.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/ephp.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/eruby.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/escheme.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/engine/optimized.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/enhancer.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 115 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/error.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/evaluator.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 115 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/generator.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/helper.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 89 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/helpers/rails_form_helper.rb

@@ -1,6 +1,5 @@
 ###
-### $Rev: 109 $
-### $Release: 2.6.4 $
+### $Release: 2.6.5 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

data/lib/erubis/helpers/rails_helper.rb

@@ -1,6 +1,5 @@
 ###
-### $Rev: 127 $
-### $Release: 2.6.4 $
+### $Release: 2.6.5 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

data/lib/erubis/local-setting.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 77 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/main.rb

@@ -1,6 +1,5 @@
 ###
-### $Rev: 122 $
-### $Release: 2.6.4 $
+### $Release: 2.6.5 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 
@@ -90,7 +89,7 @@ module Erubis
       filenames = argv
       options['h'] = true if properties[:help]
       opts = Object.new
-      arr = @option_names.collect { |ch, name| "def #{name}; @#{name}; end\n" }
+      arr = @option_names.collect {|ch, name| "def #{name}; @#{name}; end\n" }
       opts.instance_eval arr.join
       options.each do |ch, val|
         name = @option_names[ch]
@@ -166,7 +165,8 @@ module Erubis
       msg = "Syntax OK\n"
       if filenames && !filenames.empty?
         filenames.each do |filename|
-          test(?f, filename)  or raise CommandOptionError.new("#{filename}: file not found.")
+          File.file?(filename)  or
+            raise CommandOptionError.new("#{filename}: file not found.")
           engine.filename = filename
           engine.convert!(File.read(filename))
           val = do_action(action, engine, context, filename, opts)
@@ -284,14 +284,13 @@ module Erubis
     end
 
     def show_enhancers
+      dict = {}
+      ObjectSpace.each_object(Module) do |mod|
+        dict[$1] = mod if mod.name =~ /\AErubis::(.*)Enhancer\z/
+      end
       s = "enhancers:\n"
-      list = []
-      ObjectSpace.each_object(Module) do |m| list << m end
-      list.sort_by { |m| m.name.to_s }.each do |m|
-        next unless m.name =~ /\AErubis::(.*)Enhancer\z/
-        name = $1
-        desc = m.desc
-        s << ("  %-13s : %s\n" % [name, desc])
+      dict.sort_by {|name, mod| name }.each do |name, mod|
+        s << ("  %-13s : %s\n" % [name, mod.desc])
       end
       return s
     end
@@ -308,10 +307,9 @@ module Erubis
         optstr = optstr[1, optstr.length-1]
         #
         if optstr[0] == ?-    # context
-          unless optstr =~ /\A\-([-\w]+)(?:=(.*))?/
+          optstr =~ /\A\-([-\w]+)(?:=(.*))?/  or
             raise CommandOptionError.new("-#{optstr}: invalid context value.")
-          end
-          name = $1;  value = $2
+          name, value = $1, $2
           name  = name.gsub(/-/, '_').intern
           #value = value.nil? ? true : YAML.load(value)   # error, why?
           value = value.nil? ? true : YAML.load("---\n#{value}\n")
@@ -320,15 +318,12 @@ module Erubis
         else                  # options
           while optstr && !optstr.empty?
             optchar = optstr[0].chr
-            optstr[0,1] = ""
+            optstr = optstr[1..-1]
             if arg_none.include?(optchar)
               options[optchar] = true
             elsif arg_required.include?(optchar)
-              arg = optstr.empty? ? argv.shift : optstr
-              unless arg
-                mesg = "-#{optchar}: #{@option_names[optchar]} required."
-                raise CommandOptionError.new(mesg)
-              end
+              arg = optstr.empty? ? argv.shift : optstr  or
+                raise CommandOptionError.new("-#{optchar}: #{@option_names[optchar]} required.")
               options[optchar] = arg
               optstr = nil
             elsif arg_optional.include?(optchar)
@@ -473,7 +468,9 @@ module Erubis
 
     def check_syntax(filename, src)
       require 'open3'
-      command = (ENV['_'] || 'ruby') + ' -wc'   # ENV['_'] stores command name
+      #command = (ENV['_'] || 'ruby') + ' -wc'   # ENV['_'] stores command name
+      bin = ENV['_'] && File.basename(ENV['_']) =~ /^ruby/ ? ENV['_'] : 'ruby'
+      command = bin + ' -wc'
       stdin, stdout, stderr = Open3.popen3(command)
       stdin.write(src)
       stdin.close

data/lib/erubis/preprocessing.rb

@@ -1,6 +1,5 @@
 ###
-### $Rev: 102 $
-### $Release: 2.6.4 $
+### $Release: 2.6.5 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

data/lib/erubis/tiny.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 115 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
@@ -28,10 +27,9 @@ module Erubis
       src = "_buf = '';"           # preamble
       pos = 0
       input.scan(EMBEDDED_PATTERN) do |indicator, code|
-        match = Regexp.last_match
-        len   = match.begin(0) - pos
-        text  = input[pos, len]
-        pos   = match.end(0)
+        m = Regexp.last_match
+        text = input[pos...m.begin(0)]
+        pos  = m.end(0)
         #src << " _buf << '" << escape_text(text) << "';"
         text.gsub!(/['\\]/, '\\\\\&')
         src << " _buf << '" << text << "';" unless text.empty?

data/test/assert-text-equal.rb

@@ -1,6 +1,5 @@
 ###
-### $Rev: 77 $
-### $Release: 2.6.4 $
+### $Release: 2.6.5 $
 ### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 

data/test/test-engines.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 115 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/test/test-enhancers.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 115 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/test/test-erubis.rb

@@ -1,6 +1,5 @@
 ##
-## $Rev: 115 $
-## $Release: 2.6.4 $
+## $Release: 2.6.5 $
 ## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 

data/test/test-main.rb

@@ -1,7 +1,7 @@
 ##
-## $Rev: 122 $
-## $Release: 2.6.4 $
-## $Date: 2009-02-07 18:10:01 +0900 (Sat, 07 Feb 2009) $
+## $Rev$
+## $Release: 2.6.5 $
+## $Date$
 ##
 
 require  "#{File.dirname(__FILE__)}/test.rb"
@@ -141,16 +141,12 @@ END
 END
 
   def _test()
-    if $target
-      name = (caller()[0] =~ /in `test_(.*?)'/) && $1
-      return unless name == $target
-    end
     if @filename.nil?
       method = (caller[0] =~ /in `(.*)'/) && $1    #'
       method =~ /block in (.*)/ and method = $1    # for Ruby 1.9
       @filename = "tmp.#{method}"
     end
-    File.open(@filename, 'w') { |f| f.write(@input) } if @filename
+    File.open(@filename, 'w') {|f| f.write(@input) } if @filename
     begin
       argv = @options.is_a?(Array) ? @options.dup : @options.split
       argv << @filename if @filename
@@ -179,7 +175,7 @@ END
 
   def test_version    # -v
     @options = '-v'
-    @expected = (("$Release: 2.6.4 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 2.6.5 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end
@@ -201,11 +197,35 @@ END
   end
 
 
+  def _with_dummy_file
+    bindir = File.join(File.dirname(File.dirname(__FILE__)), 'bin')
+    env_path = ENV['PATH']
+    env__    = ENV['_']
+    begin
+      ENV['PATH'] = bindir + File::PATH_SEPARATOR + ENV['PATH']
+      ENV['_'] = 'erubis'
+      Tempfile.open(self.name.gsub(/[^\w]/,'_')) do |f|
+        f.write(INPUT)
+        f.flush
+        yield(f.path)
+      end
+    ensure
+      ENV['PATH'] = env_path
+      ENV['_']    = env__    if env__
+    end
+  end
+
+
   def test_syntax1    # -z (syntax ok)
     @input    = INPUT
     @expected = "Syntax OK\n"
     @options  = '-z'
     _test()
+    #
+    _with_dummy_file do |filepath|
+      actual = `erubis #{@options} #{filepath}`
+      assert_equal @expected, actual
+    end
   end
 
 
@@ -266,7 +286,7 @@ END
     #
     begin
       (0...max).each do |i|
-        File.open(filenames[i], 'w') { |f| f.write(inputs[i]) }
+        File.open(filenames[i], 'w') {|f| f.write(inputs[i]) }
       end
       @input = '<ok/>'
       @expected = ''
@@ -365,7 +385,7 @@ END
     user:  Hello
     password:  world
     END
-    File.open(datafile, 'w') { |f| f.write(str) }
+    File.open(datafile, 'w') {|f| f.write(str) }
     begin
       _test()
     ensure
@@ -384,7 +404,7 @@ END
     @user = 'Hello'
     @password = 'world'
     END
-    File.open(datafile, 'w') { |f| f.write(str) }
+    File.open(datafile, 'w') {|f| f.write(str) }
     begin
       _test()
     ensure
@@ -403,7 +423,7 @@ END
     user:	Hello
     password:	world
     END
-    File.open(yamlfile, 'w') { |f| f.write(yaml) }
+    File.open(yamlfile, 'w') {|f| f.write(yaml) }
     begin
       _test()
     ensure
@@ -425,11 +445,11 @@ END
 	- bbb
 	- ccc
     END
-    File.open(yamlfile, 'w') { |f| f.write(yaml) }
+    File.open(yamlfile, 'w') {|f| f.write(yaml) }
     assert_raise(ArgumentError) do
       _test()
     end
-    File.open(yamlfile, 'w') { |f| f.write(yaml.gsub(/\t/, ' '*8)) }
+    File.open(yamlfile, 'w') {|f| f.write(yaml.gsub(/\t/, ' '*8)) }
     _test()
   ensure
       File.unlink(yamlfile) if test(?f, yamlfile)
@@ -495,7 +515,7 @@ list:
   - bbb
   - ccc
 END
-    File.open(yamlfile, 'w') { |f| f.write(yaml) }
+    File.open(yamlfile, 'w') {|f| f.write(yaml) }
     begin
       _test()
     ensure