erubis 2.6.6 → 2.7.0

data/test/test-main.rb

@@ -1,12 +1,13 @@
 ##
 ## $Rev$
-## $Release: 2.6.6 $
+## $Release: 2.7.0 $
 ## $Date$
 ##
 
 require  "#{File.dirname(__FILE__)}/test.rb"
 
 require 'tempfile'
+require 'fileutils'
 require 'erubis/main'
 
 
@@ -25,6 +26,17 @@ class StringWriter < String
   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
@@ -175,7 +187,7 @@ END
 
   def test_version    # -v
     @options = '-v'
-    @expected = (("$Release: 2.6.6 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 2.7.0 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end
@@ -260,6 +272,17 @@ END
 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'
@@ -281,6 +304,10 @@ END
       @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
     #
@@ -295,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|
@@ -566,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
 
@@ -592,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
 

data/test/test-users-guide.rb

@@ -1,6 +1,6 @@
 ###
-### $Release: 2.6.6 $
-### copyright(c) 2006-2010 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"
@@ -28,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

data/test/test.rb

@@ -1,6 +1,6 @@
 ##
-## $Release: 2.6.6 $
-## copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 
@@ -20,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,6 +1,6 @@
 ###
-### $Release: 2.6.6 $
-### copyright(c) 2006-2010 kuwata-lab.com all rights reserved.
+### $Release: 2.7.0 $
+### copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ###
 
 require 'yaml'
@@ -17,6 +17,10 @@ def ruby19?  # :nodoc:
   RUBY_VERSION =~ /\A1.9/
 end
 
+def rubinius?  # :nodoc:
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+end
+
 
 
 class Test::Unit::TestCase
@@ -30,11 +34,7 @@ class Test::Unit::TestCase
       s = $'
     end
     # untabify
-    unless options[:tabify] == false
-      s = s.split(/^/).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|
@@ -93,4 +93,19 @@ class Test::Unit::TestCase
   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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: erubis
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 2
-  - 6
-  - 6
-  version: 2.6.6
+  - 7
+  - 0
+  version: 2.7.0
 platform: ruby
 authors: 
 - makoto kuwata
@@ -15,25 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-27 00:00:00 +09:00
+date: 2011-04-02 00:00:00 +09:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: abstract
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id001
+dependencies: []
+
 description: "  Erubis is an implementation of eRuby and has the following features:\n\n  * Very fast, almost three times faster than ERB and about 10% faster than eruby.\n  * Multi-language support (Ruby/PHP/C/Java/Scheme/Perl/Javascript)\n  * Auto escaping support\n  * Auto trimming spaces around '<% %>'\n  * Embedded pattern changeable (default '<% %>')\n  * Enable to handle Processing Instructions (PI) as embedded pattern (ex. '<?rb ... ?>')\n  * Context object available and easy to combine eRuby template with YAML datafile\n  * Print statement available\n  * Easy to extend and customize in subclass\n  * Ruby on Rails support\n"
 email: kwa(at)kuwata-lab.com
 executables: 
@@ -46,6 +31,7 @@ files:
 - lib/erubis/context.rb
 - lib/erubis/converter.rb
 - lib/erubis/engine/ec.rb
+- lib/erubis/engine/ecpp.rb
 - lib/erubis/engine/ejava.rb
 - lib/erubis/engine/ejavascript.rb
 - lib/erubis/engine/enhanced.rb
@@ -66,9 +52,11 @@ files:
 - lib/erubis/main.rb
 - lib/erubis/preprocessing.rb
 - lib/erubis/tiny.rb
+- lib/erubis/util.rb
 - lib/erubis.rb
 - bin/erubis
 - examples/basic/example.ec
+- examples/basic/example.ecpp
 - examples/basic/example.ejava
 - examples/basic/example.ejs
 - examples/basic/example.eperl
@@ -89,12 +77,15 @@ files:
 - test/data/users-guide/arraybuffer_example.result
 - test/data/users-guide/bipattern-example.rhtml
 - test/data/users-guide/bipattern_example.result
+- test/data/users-guide/bufvar-example.rb
+- test/data/users-guide/bufvar-example.result
 - test/data/users-guide/context.rb
 - test/data/users-guide/context.yaml
 - test/data/users-guide/def_method.rb
 - test/data/users-guide/def_method.result
 - test/data/users-guide/escape_example.result
 - test/data/users-guide/example.ec
+- test/data/users-guide/example.ecpp
 - test/data/users-guide/Example.ejava
 - test/data/users-guide/example.ejs
 - test/data/users-guide/example.eperl
@@ -153,6 +144,8 @@ files:
 - test/data/users-guide/example_php.result
 - test/data/users-guide/example_scheme.result
 - test/data/users-guide/example_scheme_display.result
+- test/data/users-guide/fasteruby-example.rb
+- test/data/users-guide/fasteruby-example.result
 - test/data/users-guide/fasteruby.rb
 - test/data/users-guide/fasteruby.result
 - test/data/users-guide/fasteruby.rhtml
@@ -177,6 +170,9 @@ files:
 - test/data/users-guide/notext_example.result
 - test/data/users-guide/percentline-example.rhtml
 - test/data/users-guide/percentline_example.result
+- test/data/users-guide/prefixedline-example.rb
+- test/data/users-guide/prefixedline-example.rhtml
+- test/data/users-guide/prefixedline_example.result
 - test/data/users-guide/printenable_example.result
 - test/data/users-guide/printenabled-example.eruby
 - test/data/users-guide/printenabled-example.rb
@@ -192,6 +188,7 @@ files:
 - test/test-engines.rb
 - test/test-enhancers.rb
 - test/test-erubis.rb
+- test/test-index-cgi.rb
 - test/test-main.rb
 - test/test-users-guide.rb
 - test/test.rb
@@ -229,9 +226,11 @@ files:
 - doc-api/classes/Erubis/CommandOptionError.html
 - doc-api/classes/Erubis/Context.html
 - doc-api/classes/Erubis/Converter.html
+- doc-api/classes/Erubis/CppGenerator.html
 - doc-api/classes/Erubis/DeleteIndentEnhancer.html
 - doc-api/classes/Erubis/DeleteIndentEruby.html
 - doc-api/classes/Erubis/Ec.html
+- doc-api/classes/Erubis/Ecpp.html
 - doc-api/classes/Erubis/Ejava.html
 - doc-api/classes/Erubis/Ejavascript.html
 - doc-api/classes/Erubis/Engine.html
@@ -242,6 +241,7 @@ files:
 - doc-api/classes/Erubis/ErubisError.html
 - doc-api/classes/Erubis/Eruby.html
 - doc-api/classes/Erubis/EscapedEc.html
+- doc-api/classes/Erubis/EscapedEcpp.html
 - doc-api/classes/Erubis/EscapedEjava.html
 - doc-api/classes/Erubis/EscapedEjavascript.html
 - doc-api/classes/Erubis/EscapedEperl.html
@@ -278,6 +278,7 @@ files:
 - doc-api/classes/Erubis/PhpGenerator.html
 - doc-api/classes/Erubis/PI/Converter.html
 - doc-api/classes/Erubis/PI/Ec.html
+- doc-api/classes/Erubis/PI/Ecpp.html
 - doc-api/classes/Erubis/PI/Ejava.html
 - doc-api/classes/Erubis/PI/Ejavascript.html
 - doc-api/classes/Erubis/PI/Engine.html
@@ -287,6 +288,8 @@ files:
 - doc-api/classes/Erubis/PI/Escheme.html
 - doc-api/classes/Erubis/PI/TinyEruby.html
 - doc-api/classes/Erubis/PI.html
+- doc-api/classes/Erubis/PrefixedLineEnhancer.html
+- doc-api/classes/Erubis/PrefixedLineEruby.html
 - doc-api/classes/Erubis/PreprocessingEruby.html
 - doc-api/classes/Erubis/PreprocessingHelper.html
 - doc-api/classes/Erubis/PrintEnabledEnhancer.html
@@ -309,10 +312,12 @@ files:
 - doc-api/classes/Erubis/XmlEruby.html
 - doc-api/classes/Erubis/XmlHelper.html
 - doc-api/classes/Erubis.html
+- doc-api/classes/Kernel.html
 - doc-api/created.rid
 - doc-api/files/erubis/context_rb.html
 - doc-api/files/erubis/converter_rb.html
 - doc-api/files/erubis/engine/ec_rb.html
+- doc-api/files/erubis/engine/ecpp_rb.html
 - doc-api/files/erubis/engine/ejava_rb.html
 - doc-api/files/erubis/engine/ejavascript_rb.html
 - doc-api/files/erubis/engine/enhanced_rb.html
@@ -333,6 +338,7 @@ files:
 - doc-api/files/erubis/main_rb.html
 - doc-api/files/erubis/preprocessing_rb.html
 - doc-api/files/erubis/tiny_rb.html
+- doc-api/files/erubis/util_rb.html
 - doc-api/files/erubis_rb.html
 - doc-api/files/README_txt.html
 - doc-api/fr_class_index.html
@@ -370,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: erubis
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: a fast and extensible eRuby implementation which supports multi-language