erubis 2.6.2 → 2.6.3

data/doc/users-guide.html

@@ -17,7 +17,7 @@
       last update: $Date: 2008-06-13 08:04:21 +0900 (Fri, 13 Jun 2008) $<br>
     </div>
 
-<p>release: 2.6.2
+<p>release: 2.6.3
 </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.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/
+<li>Copy 'erubis-2.6.3/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.3/
 $ 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.2/benchark/' directory.
+<p>A benchmark script is included in Erubis package at 'erubis-2.6.3/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.2/benchmark/
+<pre class="terminal">$ cd erubis-2.6.3/benchmark/
 $ ruby bench.rb -n 10000 -m execute
 *** ntimes=10000, testmode=execute
                                     user     system      total        real

data/lib/erubis.rb

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

data/lib/erubis/context.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 

data/lib/erubis/converter.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require 'abstract'

data/lib/erubis/engine.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 104 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 

data/lib/erubis/engine/ec.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/ejava.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/ejavascript.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 95 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/enhanced.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/enhancer'

data/lib/erubis/engine/eperl.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/ephp.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/eruby.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/escheme.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/engine'

data/lib/erubis/engine/optimized.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 

data/lib/erubis/enhancer.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 

data/lib/erubis/error.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 module Erubis

data/lib/erubis/evaluator.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require 'erubis/error'

data/lib/erubis/generator.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require 'abstract'

data/lib/erubis/helper.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 89 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 

data/lib/erubis/helpers/rails_form_helper.rb

@@ -1,7 +1,7 @@
 ###
 ### $Rev: 109 $
-### $Release: 2.6.2 $
-### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+### $Release: 2.6.3 $
+### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 
 

data/lib/erubis/helpers/rails_helper.rb

@@ -1,7 +1,7 @@
 ###
 ### $Rev: 112 $
-### $Release: 2.6.2 $
-### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+### $Release: 2.6.3 $
+### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 
 

data/lib/erubis/local-setting.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 ##

data/lib/erubis/main.rb

@@ -1,7 +1,7 @@
 ###
-### $Rev: 116 $
-### $Release: 2.6.2 $
-### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+### $Rev: 122 $
+### $Release: 2.6.3 $
+### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 
 require 'yaml'
@@ -326,7 +326,7 @@ module Erubis
             elsif arg_required.include?(optchar)
               arg = optstr.empty? ? argv.shift : optstr
               unless arg
-                mesg = "-#{optchar.chr}: #{@option_args[optchar]} required."
+                mesg = "-#{optchar}: #{@option_names[optchar]} required."
                 raise CommandOptionError.new(mesg)
               end
               options[optchar] = arg
@@ -336,7 +336,7 @@ module Erubis
               options[optchar] = arg
               optstr = nil
             else
-              raise CommandOptionError.new("-#{optchar.chr}: unknown option.")
+              raise CommandOptionError.new("-#{optchar}: unknown option.")
             end
           end
         end
@@ -395,11 +395,12 @@ module Erubis
       enhancers = []
       shortname = nil
       begin
-        enhancer_names.split(/,/).each do |shortname|
+        enhancer_names.split(/,/).each do |name|
+          shortname = name
           enhancers << Erubis.const_get("#{shortname}Enhancer")
         end
       rescue NameError
-        raise CommandOptionError.new("#{shortname}: no such Enhancer (try '-E' to show all enhancers).")
+        raise CommandOptionError.new("#{shortname}: no such Enhancer (try '-h' to show all enhancers).")
       end
       return enhancers
     end

data/lib/erubis/preprocessing.rb

@@ -1,7 +1,7 @@
 ###
 ### $Rev: 102 $
-### $Release: 2.6.2 $
-### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+### $Release: 2.6.3 $
+### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 
 require 'cgi'

data/lib/erubis/tiny.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 module Erubis

data/test/assert-text-equal.rb

@@ -1,7 +1,7 @@
 ###
 ### $Rev: 77 $
-### $Release: 2.6.2 $
-### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+### $Release: 2.6.3 $
+### copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ###
 
 require 'test/unit'

data/test/data/users-guide/stderr.log

@@ -0,0 +1,3 @@
+*** debug: item="<aaa>"
+*** debug: item="b&b"
+*** debug: item="\"ccc\""

data/test/test-engines.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require "#{File.dirname(__FILE__)}/test.rb"

data/test/test-enhancers.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require "#{File.dirname(__FILE__)}/test.rb"

data/test/test-erubis.rb

@@ -1,7 +1,7 @@
 ##
 ## $Rev: 115 $
-## $Release: 2.6.2 $
-## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+## $Release: 2.6.3 $
+## copyright(c) 2006-2009 kuwata-lab.com all rights reserved.
 ##
 
 require "#{File.dirname(__FILE__)}/test.rb"

data/test/test-main.rb

@@ -1,7 +1,7 @@
 ##
-## $Rev: 116 $
-## $Release: 2.6.2 $
-## $Date: 2008-06-12 21:08:47 +0900 (Thu, 12 Jun 2008) $
+## $Rev: 122 $
+## $Release: 2.6.3 $
+## $Date: 2009-02-07 18:10:01 +0900 (Sat, 07 Feb 2009) $
 ##
 
 require  "#{File.dirname(__FILE__)}/test.rb"
@@ -152,17 +152,8 @@ END
     end
     File.open(@filename, 'w') { |f| f.write(@input) } if @filename
     begin
-      #if @options.is_a?(Array)
-      #  command = "ruby #{$script} #{@options.join(' ')} #{@filename}"
-      #else
-      #  command = "ruby #{$script} #{@options} #{@filename}"
-      #end
-      #output = `#{command}`
-      if @options.is_a?(Array)
-        argv = @options + [ @filename ]
-      else
-        argv = "#{@options} #{@filename}".split
-      end
+      argv = @options.is_a?(Array) ? @options.dup : @options.split
+      argv << @filename if @filename
       $stdout = output = StringWriter.new
       Erubis::Main.new.execute(argv)
     ensure
@@ -172,6 +163,12 @@ END
     assert_text_equal(@expected, output)
   end
 
+  def _error_test(errclass, errmsg)
+    ex = assert_raise(errclass) { _test() }
+    assert_equal(errmsg, ex.message)
+  end
+
+
   def test_help      # -h
     @options = '-h'
     m = Erubis::Main.new
@@ -182,7 +179,7 @@ END
 
   def test_version    # -v
     @options = '-v'
-    @expected = (("$Release: 2.6.2 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 2.6.3 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end
@@ -242,7 +239,7 @@ END
 -:7: syntax error, unexpected $end, expecting ')'
 END
       errmsgs << <<'END'
-7: syntax error, unexpected $end, expecting keyword_end or keyword_endfor
+7: syntax error, unexpected $end, expecting keyword_end
 END
     else
       errmsgs << <<'END'
@@ -617,6 +614,36 @@ END
   end
 
 
+  def test_invalid_option  # -1 (invalid option)
+    @input = INPUT
+    @options = '-1'
+    _error_test(Erubis::CommandOptionError, "-1: unknown option.")
+  end
+
+
+  def test_invalid_enhancer  # -E hoge
+    @options = '-E hoge'
+    errmsg = "hoge: no such Enhancer (try '-h' to show all enhancers)."
+    _error_test(Erubis::CommandOptionError, errmsg)
+  end
+
+
+  def test_invalid_lang  # -l hoge
+    @options = '-l hoge'
+    errmsg = "-l hoge: invalid language name (class Erubis::Ehoge not found)."
+    _error_test(Erubis::CommandOptionError, errmsg)
+  end
+
+
+  def test_missing_argument  # -E
+    @filename = false
+    @options = '-E'
+    _error_test(Erubis::CommandOptionError, "-E: enhancers required.")
+    @options = '-l'
+    _error_test(Erubis::CommandOptionError, "-l: lang required.")
+  end
+
+
   def test_pi1  # --pi -x
     @input = PI_INPUT
     @expected = PI_SRC