erubis 2.3.1 → 2.7.0

data/test/test-main.rb

@@ -1,12 +1,13 @@
 ##
-## $Rev: 78 $
-## $Release: 2.3.1 $
-## $Date: 2007-05-23 06:41:27 +0900 (Wed, 23 May 2007) $
+## $Rev$
+## $Release: 2.7.0 $
+## $Date$
 ##
 
 require  "#{File.dirname(__FILE__)}/test.rb"
 
 require 'tempfile'
+require 'fileutils'
 require 'erubis/main'
 
 
@@ -22,6 +23,26 @@ class StringWriter < String
   def write(arg)
     self << arg
   end
+  def flush(*args)
+    # pass
+  end
+  def puts(arg)
+    case arg
+    when Array
+      arg.each do |item|
+        self << item << "\n"
+      end
+    else
+      self << arg.to_s
+      self << "\n" unless arg =~ /\n$/
+    end
+  end
+end
+
+class Erubis::Main
+  public :usage
+  public :show_properties
+  public :show_enhancers
 end
 
 
@@ -132,27 +153,15 @@ 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
-      #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
@@ -162,10 +171,23 @@ 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
+    @expected = m.usage() + "\n" + m.show_properties() + m.show_enhancers()
+    @filename = false
+    _test()
+  end
 
   def test_version    # -v
     @options = '-v'
-    @expected = (("$Release: 2.3.1 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 2.7.0 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end
@@ -187,11 +209,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
 
 
@@ -214,7 +260,32 @@ END
     basename = 'tmp.test_syntax2_%d.rhtml'
     filenames = [ basename % 0, basename % 1 ]
     errmsgs = []
-    errmsgs << <<'END'
+    if ruby19?
+      errmsgs << <<'END'
+3: syntax error, unexpected ']', expecting ')'
+ _buf << '  <li>'; _buf << ( item[:name]] ).to_s; _buf << '</li>
+                                         ^
+-:4: syntax error, unexpected keyword_end, expecting ')'
+'; end 
+      ^
+-:7: syntax error, unexpected $end, expecting ')'
+END
+      errmsgs << <<'END'
+7: syntax error, unexpected $end, expecting keyword_end
+END
+    elsif rubinius?
+      errmsgs << <<'END'
+3: expecting ')'
+ _buf << '  <li>'; _buf << ( item[:name]] ).to_s; _buf << '</li>
+                                        ^
+END
+      errmsgs << <<'END'
+7: missing 'end' for 'for' started on line 2
+_buf.to_s
+         ^
+END
+    else
+      errmsgs << <<'END'
 3: syntax error, unexpected ']', expecting ')'
  _buf << '  <li>'; _buf << ( item[:name]] ).to_s; _buf << '</li>
                                          ^
@@ -223,21 +294,26 @@ END
       ^
 -:7: syntax error, unexpected $end, expecting ')'
 END
-    errmsgs << <<'END'
+      errmsgs << <<'END'
 7: syntax error, unexpected $end, expecting kEND
 END
+    end
     #
     max = inputs.length
     (0...max).each do |i|
       @input    = inputs[i]
       @expected = "tmp.test_syntax2:#{errmsgs[i]}"
       @options  = '-z'
+      if rubinius?
+        @expected.sub! /unexpected kEND/, 'unexpected keyword_end'
+        @expected.sub! /expecting kEND/, 'expecting keyword_end'
+      end
       _test()
     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 = ''
@@ -246,6 +322,10 @@ END
         @expected << "#{filenames[i]}:#{errmsgs[i]}"
         @options << " #{filenames[i]}"
       end
+      if rubinius?
+        @expected.sub! /unexpected kEND/, 'unexpected keyword_end'
+        @expected.sub! /expecting kEND/, 'expecting keyword_end'
+      end
       _test()
     ensure
       (0...max).each do |i|
@@ -336,7 +416,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
@@ -355,7 +435,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
@@ -374,7 +454,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
@@ -396,11 +476,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)
@@ -466,7 +546,7 @@ list:
   - bbb
   - ccc
 END
-    File.open(yamlfile, 'w') { |f| f.write(yaml) }
+    File.open(yamlfile, 'w') {|f| f.write(yaml) }
     begin
       _test()
     ensure
@@ -517,7 +597,7 @@ END
       _test()
     ensure
       File.unlink filename if test(?f, filename)
-      Dir.rmdir dir if test(?d, dir)
+      FileUtils.rm_r dir if test(?d, dir)
     end
   end
 
@@ -543,7 +623,7 @@ END
       _test()
     ensure
       File.unlink filename if test(?f, filename)
-      Dir.rmdir dir if test(?d, dir)
+      FileUtils.rm_r dir if test(?d, dir)
     end
   end
 
@@ -585,6 +665,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
@@ -637,4 +747,6 @@ END
   end
 
 
+  self.post_definition()
+
 end

data/test/test-users-guide.rb

@@ -1,7 +1,6 @@
 ###
-### $Rev: 77 $
-### $Release: 2.3.1 $
-### copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ###
 
 require  "#{File.dirname(__FILE__)}/test.rb"
@@ -29,6 +28,22 @@ class KwarkUsersGuideTest < Test::Unit::TestCase
     s =~ /\A\$ (.*?)\n/
     command = $1
     expected = $'
+    if ruby19?
+      case @name
+      when 'test_main_program1_result'
+        expected.sub!('["eruby", "items", "x", "_buf"]', '[:_buf, :eruby, :items, :x]')
+      when 'test_main_program2_result'
+        expected.sub!('["_context", "x", "_buf"]', '[:_buf, :x, :_context]')
+      end
+    elsif rubinius?
+      command.sub!(/^ruby\b/, 'rbx')
+      case @name
+      when 'test_main_program1_result'
+        expected.sub!('["eruby", "items", "x", "_buf"]', '["_buf", "eruby", "items", "x"]')
+      when 'test_main_program2_result'
+        expected.sub!('["_context", "x", "_buf"]', '["_buf", "x", "_context"]')
+      end
+    end
     result = `#{command}`
     assert_text_equal(expected, result)
   end
@@ -53,4 +68,6 @@ class KwarkUsersGuideTest < Test::Unit::TestCase
   end
 
 
+  self.post_definition()
+
 end

data/test/test.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -21,6 +20,22 @@ require 'testutil'
 require 'erubis'
 
 
+Test::Unit::TestCase.class_eval do
+  if RUBY_VERSION >= "1.9"
+    ## minitest doesn't have 'name()' method
+    def name
+      @name || @__name__
+    end
+    def ruby19
+      yield
+    end
+  else
+    def ruby19
+    end
+  end
+end
+
+
 if $0 == __FILE__
   require "#{TESTDIR}/test-erubis.rb"
   require "#{TESTDIR}/test-engines.rb"

data/test/testutil.rb

@@ -1,7 +1,6 @@
 ###
-### $Rev: 77 $
-### $Release: 2.3.1 $
-### copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ###
 
 require 'yaml'
@@ -9,6 +8,21 @@ require 'yaml'
 require 'test/unit/testcase'
 
 
+
+def ruby18?  # :nodoc:
+  RUBY_VERSION =~ /\A1.8/
+end
+
+def ruby19?  # :nodoc:
+  RUBY_VERSION =~ /\A1.9/
+end
+
+def rubinius?  # :nodoc:
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+end
+
+
+
 class Test::Unit::TestCase
 
 
@@ -20,11 +34,7 @@ class Test::Unit::TestCase
       s = $'
     end
     # untabify
-    unless options[:tabify] == false
-      s = s.inject('') do |sb, line|
-        sb << line.gsub(/([^\t]{8})|([^\t]*)\t/n) { [$+].pack("A8") }
-      end
-    end
+    s = _untabify(s) unless options[:tabify] == false
     # load yaml document
     testdata_list = []
     YAML.load_documents(s) do |ydoc|
@@ -72,4 +82,30 @@ class Test::Unit::TestCase
   end
 
 
+  def self.post_definition
+    if ENV['TEST']
+      target = "test_#{ENV['TEST']}"
+      self.instance_methods.each do |method_name|
+        m = method_name.to_s
+        private m if m =~ /\Atest_/ && m != target
+      end
+    end
+  end
+
+
+  def self._untabify(str, width=8)
+      return str if str.nil?
+      list = str.split(/\t/, -1)   # if 2nd arg is negative then split() doesn't remove tailing empty strings
+      last = list.pop
+      sb = ''
+      list.each do |s|
+        column = (n = s.rindex(?\n)) ? s.length - n - 1 : s.length
+        n = width - (column % width)
+        sb << s << (' ' * n)
+      end
+      sb << last if last
+      return sb
+  end
+
+
 end