erubis 2.0.1 → 2.1.0

data/test/{test-bin.rb → test-main.rb}

@@ -1,29 +1,23 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.1 $
-## $Date: 2006-05-20 08:57:39 +0900 (Sat, 20 May 2006) $
+## $Rev: 37 $
+## $Release: 2.1.0 $
+## $Date: 2006-09-19 05:28:57 +0900 (Tue, 19 Sep 2006) $
 ##
 
 require  "#{File.dirname(__FILE__)}/test.rb"
 
-bindir  = File.dirname(TESTDIR) + '/bin'
-$script = bindir + '/erubis'
-if test(?f, 'bin/erubis')
-  $script = 'bin/erubis'
-elsif test(?f, '../bin/erubis')
-  $script = '../bin/erubis'
-end
-
-
-require 'test/unit'
-require 'assert-text-equal'
-require 'yaml'
 require 'tempfile'
-
-require 'erubis'
 require 'erubis/main'
 
 
+$script = File.dirname(TESTDIR) + '/bin/erubis'
+#if test(?f, 'bin/erubis')
+#  $script = 'bin/erubis'
+#elsif test(?f, '../bin/erubis')
+#  $script = '../bin/erubis'
+#end
+
+
 class StringWriter < String
   def write(arg)
     self << arg
@@ -46,9 +40,9 @@ END
 #  SRC = <<'END'
 #_buf = ''; _buf << "list:\n"
 # list = ['<aaa>', 'b&b', '"ccc"']
-#   for item in list 
+#   for item in list
 #_buf << "  - "; _buf << ( item ).to_s; _buf << "\n"
-# end 
+# end
 #_buf << "user: "; _buf << ( defined?(user) ? user : "(none)" ).to_s; _buf << "\n"
 #_buf
 #END
@@ -81,12 +75,68 @@ user: (none)
 END
 
 
+  PI_INPUT = <<'END'
+<ul>
+  <?rb @list = ['<aaa>', 'b&b', '"ccc"']
+   for item in @list ?>
+  <li>@{item}@ / @!{item}@
+      <%= item %> / <%== item %></li>
+  <?rb end ?>
+<ul>
+END
+
+  PI_SRC = <<'END'
+_buf = []; _buf << '<ul>
+';   @list = ['<aaa>', 'b&b', '"ccc"']
+   for item in @list 
+ _buf << '  <li>'; _buf << Erubis::XmlHelper.escape_xml(item); _buf << ' / '; _buf << (item).to_s; _buf << '
+      '; _buf << ( item ).to_s; _buf << ' / '; _buf << Erubis::XmlHelper.escape_xml( item ); _buf << '</li>
+';   end 
+ _buf << '<ul>
+';
+_buf.join
+END
+
+  PI_ESCAPED_SRC = <<'END'
+_buf = []; _buf << '<ul>
+';   @list = ['<aaa>', 'b&b', '"ccc"']
+   for item in @list 
+ _buf << '  <li>'; _buf << (item).to_s; _buf << ' / '; _buf << Erubis::XmlHelper.escape_xml(item); _buf << '
+      '; _buf << Erubis::XmlHelper.escape_xml( item ); _buf << ' / '; _buf << ( item ).to_s; _buf << '</li>
+';   end 
+ _buf << '<ul>
+';
+_buf.join
+END
+
+  PI_OUTPUT = <<'END'
+<ul>
+  <li>&lt;aaa&gt; / <aaa>
+      <aaa> / &lt;aaa&gt;</li>
+  <li>b&amp;b / b&b
+      b&b / b&amp;b</li>
+  <li>&quot;ccc&quot; / "ccc"
+      "ccc" / &quot;ccc&quot;</li>
+<ul>
+END
+
+  PI_ESCAPED_OUTPUT = <<'END'
+<ul>
+  <li><aaa> / &lt;aaa&gt;
+      &lt;aaa&gt; / <aaa></li>
+  <li>b&b / b&amp;b
+      b&amp;b / b&b</li>
+  <li>"ccc" / &quot;ccc&quot;
+      &quot;ccc&quot; / "ccc"</li>
+<ul>
+END
+
   def _test()
     if $target
       name = (caller()[0] =~ /in `test_(.*?)'/) && $1
       return unless name == $target
     end
-    if @filename == nil
+    if @filename.nil?
       method = (caller[0] =~ /in `(.*)'/) && $1    #'
       @filename = "tmp.#{method}"
     end
@@ -115,7 +165,7 @@ END
 
   def test_version    # -v
     @options = '-v'
-    @expected = (("$Release: 2.0.1 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 2.1.0 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end
@@ -403,4 +453,56 @@ END
   end
 
 
+  def test_pi1  # --pi -x
+    @input = PI_INPUT
+    @expected = PI_SRC
+    @options = '-x --pi'
+    _test()
+  end
+
+  def test_pi2  # --pi -x --escape=false
+    @input = PI_INPUT
+    @expected = PI_ESCAPED_SRC
+    @options = '-x --pi --escape=false'
+    _test()
+  end
+
+  def test_pi3  # --pi
+    @input = PI_INPUT
+    @expected = PI_OUTPUT
+    @options = '--pi'
+    _test()
+  end
+
+  def test_pi4  # --pi --escape=false
+    @input = PI_INPUT
+    @expected = PI_ESCAPED_OUTPUT
+    @options = '--pi --escape=false'
+    _test()
+  end
+
+  def test_pi5  # --pi=ruby -x
+    @input = PI_INPUT.gsub(/<\?rb/, '<?ruby')
+    @expected = PI_SRC
+    @options = '--pi=ruby -x'
+    _test()
+  end
+
+  def test_pi6  # --pi -xl java
+    @input = <<'END'
+<?java for (int i = 0; i < arr.length; i++) { ?>
+  - @{arr[i]}@ / @!{arr[i]}@
+<?java } ?>
+END
+    @expected = <<'END'
+StringBuffer _buf = new StringBuffer(); for (int i = 0; i < arr.length; i++) { 
+_buf.append("  - "); _buf.append(escape(arr[i])); _buf.append(" / "); _buf.append(arr[i]); _buf.append("\n");
+ } 
+return _buf.toString();
+END
+    @options = '--pi -xl java'
+    _test()
+  end
+
+
 end

data/test/test-notext.rb

@@ -0,0 +1,27 @@
+##
+## $Rev: 31 $
+## $Release: 2.1.0 $
+## copyright(c) 2006 kuwata-lab all rights reserved.
+##
+
+require File.dirname(__FILE__) + '/test'
+
+
+class NoTextTest < Test::Unit::TestCase
+
+  filename = __FILE__.sub(/\.\w+$/, '.yaml')
+  testdata_list = load_yaml_datafile(filename)
+  define_testmethods(testdata_list)
+
+  def _test
+    File.open(@filename, 'w') { |f| f.write(@input) }
+    begin
+      result = `notext #{@options} #{@filename}`
+      expected = @output.gsub(/^\./, '')
+      assert_text_equal(expected, result)
+    ensure
+      File.unlink @filename if test(?f, @filename)
+    end
+  end
+
+end

data/test/test.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev$
-## $Release: 2.0.1 $
+## $Rev: 30 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -18,10 +18,12 @@ require 'test/unit'
 require 'assert-text-equal'
 require 'yaml'
 require 'testutil'
+require 'erubis'
 
 
 if $0 == __FILE__
   require "#{TESTDIR}/test-erubis.rb"
   require "#{TESTDIR}/test-engines.rb"
-  require "#{TESTDIR}/test-bin.rb"
+  require "#{TESTDIR}/test-main.rb"
+  require "#{TESTDIR}/test-notext.rb"
 end

data/test/testutil.rb

@@ -1,70 +1,60 @@
 ###
-### $Rev: 103 $
-### $Release: 2.0.1 $
+### $Rev: 30 $
+### $Release: 2.1.0 $
 ### copyright(c) 2006 kuwata-lab all rights reserved.
 ###
 
 require 'yaml'
 
+require 'test/unit/testcase'
 
-module TestEnhancer
 
+class Test::Unit::TestCase
 
-  module_function
 
-
-  def load_testdata(filename, options={}, &block)
-    _load_yaml(filename, :doc, options, &block)
-  end
-
-
-  def load_yaml_document(filename, options={}, &block)
-    _load_yaml(filename, :doc, options, &block)
-  end
-
-
-  def load_yaml_documents(filename, options={}, &block)
-    _load_yaml(filename, :docs, options, &block)
-  end
-
-
-  def _load_yaml(filename, type, options={}, &block) # :nodoc:
+  def self.load_yaml_datafile(filename, options={}, &block)  # :nodoc:
+    # read datafile
     s = File.read(filename)
     if filename =~ /\.rb$/
       s =~ /^__END__$/   or raise "*** error: __END__ is not found in '#{filename}'."
       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
-    #
-    case type
-    when :docs
-      hash_list = []
-      YAML.load_documents(s) do |hash| hash_list << hash end
-    when :doc
-      hash_list = YAML.load(s)
-    else
-      raise "*** internal error"
+    # load yaml document
+    testdata_list = []
+    YAML.load_documents(s) do |ydoc|
+      if ydoc.is_a?(Hash)
+        testdata_list << ydoc
+      elsif ydoc.is_a?(Array)
+        ydoc.each do |hash|
+          raise "testdata should be a mapping." unless hash.is_a?(Hash)
+          testdata_list << hash
+        end
+      else
+        raise "testdata should be a mapping."
+      end
     end
-    #
+    # data check
     identkey = options[:identkey] || 'name'
     table = {}
-    hash_list.each do |hash|
+    testdata_list.each do |hash|
       ident = hash[identkey]
-      ident          or  raise "*** #{identkey} is not found."
+      ident          or  raise "*** key '#{identkey}' is required but not found."
       table[ident]   and raise "*** #{identkey} '#{ident}' is duplicated."
       table[ident] = hash
       yield(hash) if block
     end
     #
-    return hash_list
+    return testdata_list
   end
 
 
-  def define_testmethods(testdata_list, options={}, &block)
+  def self.define_testmethods(testdata_list, options={}, &block)
     identkey   = options[:identkey]   || 'name'
     testmethod = options[:testmethod] || '_test'
     testdata_list.each do |hash|
@@ -72,7 +62,6 @@ module TestEnhancer
       ident = hash[identkey]
       s  =   "def test_#{ident}\n"
       hash.each do |key, val|
-        code = "  @#{key} = #{val.inspect}\n"
         s << "  @#{key} = #{val.inspect}\n"
       end
       s  <<  "  #{testmethod}\n"

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: erubis
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
-date: 2006-05-21 00:00:00 +09:00
+  version: 2.1.0
+date: 2006-09-24 00:00:00 +09:00
 summary: a fast and extensible eRuby implementation which supports multi-language
 require_paths: 
 - lib
 email: 
 homepage: http://rubyforge.org/projects/erubis
 rubyforge_project: 
-description: "Erubis is an implementation of eRuby and has the following features: * Very fast (about three times faster than ERB) * Multi-language support (Ruby/PHP/C/Java/Scheme/Perl/Javascript) * Auto trimming spaces around '<% %>' * Auto sanitizing * Change embedded pattern (default '<% %>') * Context object available * Easy to expand in subclass"
+description: "Erubis is an implementation of eRuby and has the following features:  * Very fast, almost three times faster than ERB and even as fast as eruby. * Multi-language support (Ruby/PHP/C/Java/Scheme/Perl/Javascript) * Auto escaping support * Auto trimming spaces around '<% %>' * Embedded pattern changeable (default '<% %>') * Enable to handle Processing Instructions (PI) as embedded pattern (ex. '<?rb ... ?>') * Context object available and easy to combine eRuby template with YAML datafile * Print statement available * Easy to extend and customize in subclass * Ruby on Rails support"
 autorequire: 
 default_executable: 
 bindir: bin
@@ -30,9 +30,15 @@ authors:
 files: 
 - lib/erubis
 - lib/erubis.rb
+- lib/erubis/context.rb
+- lib/erubis/converter.rb
 - lib/erubis/engine
 - lib/erubis/engine.rb
 - lib/erubis/enhancer.rb
+- lib/erubis/error.rb
+- lib/erubis/evaluator.rb
+- lib/erubis/generator.rb
+- lib/erubis/helper
 - lib/erubis/helper.rb
 - lib/erubis/local-setting.rb
 - lib/erubis/main.rb
@@ -46,26 +52,39 @@ files:
 - lib/erubis/engine/eruby.rb
 - lib/erubis/engine/escheme.rb
 - lib/erubis/engine/optimized.rb
+- lib/erubis/helper/rails.rb
 - bin/erubis
-- examples/example.ec
-- examples/example.ejava
-- examples/example.ejavascript
-- examples/example.eperl
-- examples/example.ephp
-- examples/example.eruby
-- examples/example.escheme
-- examples/Makefile
+- bin/notext
+- examples/basic
+- examples/pi
+- examples/basic/example.ec
+- examples/basic/example.ejava
+- examples/basic/example.ejs
+- examples/basic/example.eperl
+- examples/basic/example.ephp
+- examples/basic/example.eruby
+- examples/basic/example.escheme
+- examples/basic/Makefile
+- examples/pi/example.ec
+- examples/pi/example.ejava
+- examples/pi/example.ejs
+- examples/pi/example.eperl
+- examples/pi/example.ephp
+- examples/pi/example.eruby
+- examples/pi/example.escheme
+- examples/pi/Makefile
 - test/assert-text-equal.rb
-- test/test-bin.rb
 - test/test-engines.rb
 - test/test-erubis.rb
+- test/test-main.rb
+- test/test-notext.rb
 - test/test.rb
 - test/testutil.rb
 - doc/users-guide.html
 - doc/docstyle.css
 - README.txt
 - ChangeLog
-- COPYING
+- LGPL
 - setup.rb
 - contrib/erubis
 - contrib/inline-require
@@ -87,10 +106,14 @@ files:
 - doc-api/classes/Erubis/ArrayBufferEruby.html
 - doc-api/classes/Erubis/ArrayEnhancer.html
 - doc-api/classes/Erubis/ArrayEruby.html
+- doc-api/classes/Erubis/Basic
+- doc-api/classes/Erubis/Basic.html
 - doc-api/classes/Erubis/BiPatternEnhancer.html
 - doc-api/classes/Erubis/BiPatternEruby.html
+- doc-api/classes/Erubis/CGenerator.html
 - doc-api/classes/Erubis/CommandOptionError.html
 - doc-api/classes/Erubis/Context.html
+- doc-api/classes/Erubis/Converter.html
 - doc-api/classes/Erubis/Ec.html
 - doc-api/classes/Erubis/Ejava.html
 - doc-api/classes/Erubis/Ejavascript.html
@@ -108,20 +131,37 @@ files:
 - doc-api/classes/Erubis/EscapedEscheme.html
 - doc-api/classes/Erubis/EscapeEnhancer.html
 - doc-api/classes/Erubis/Escheme.html
+- doc-api/classes/Erubis/Evaluator.html
+- doc-api/classes/Erubis/Generator.html
 - doc-api/classes/Erubis/HeaderFooterEnhancer.html
 - doc-api/classes/Erubis/HeaderFooterEruby.html
+- doc-api/classes/Erubis/Helper
+- doc-api/classes/Erubis/Helper.html
+- doc-api/classes/Erubis/JavaGenerator.html
+- doc-api/classes/Erubis/JavascriptGenerator.html
 - doc-api/classes/Erubis/Main.html
+- doc-api/classes/Erubis/NoCodeEnhancer.html
+- doc-api/classes/Erubis/NoCodeEruby.html
 - doc-api/classes/Erubis/NoTextEnhancer.html
 - doc-api/classes/Erubis/NoTextEruby.html
+- doc-api/classes/Erubis/NotSupportedError.html
 - doc-api/classes/Erubis/OptimizedEruby.html
+- doc-api/classes/Erubis/OptimizedGenerator.html
 - doc-api/classes/Erubis/OptimizedXmlEruby.html
 - doc-api/classes/Erubis/PercentLineEnhancer.html
 - doc-api/classes/Erubis/PercentLineEruby.html
+- doc-api/classes/Erubis/PerlGenerator.html
+- doc-api/classes/Erubis/PhpGenerator.html
+- doc-api/classes/Erubis/PI
+- doc-api/classes/Erubis/PI.html
 - doc-api/classes/Erubis/PrintEnabledEnhancer.html
 - doc-api/classes/Erubis/PrintEnabledEruby.html
 - doc-api/classes/Erubis/PrintOutEnhancer.html
 - doc-api/classes/Erubis/PrintOutEruby.html
 - doc-api/classes/Erubis/PrintOutSimplifiedEruby.html
+- doc-api/classes/Erubis/RubyEvaluator.html
+- doc-api/classes/Erubis/RubyGenerator.html
+- doc-api/classes/Erubis/SchemeGenerator.html
 - doc-api/classes/Erubis/SimplifiedEruby.html
 - doc-api/classes/Erubis/SimplifyEnhancer.html
 - doc-api/classes/Erubis/StdoutEnhancer.html
@@ -133,13 +173,33 @@ files:
 - doc-api/classes/Erubis/TinyEruby.html
 - doc-api/classes/Erubis/XmlEruby.html
 - doc-api/classes/Erubis/XmlHelper.html
+- doc-api/classes/Erubis/Basic/Converter.html
+- doc-api/classes/Erubis/Basic/Engine.html
+- doc-api/classes/Erubis/Helper/CachedRailsTemplate.html
+- doc-api/classes/Erubis/Helper/RailsTemplate.html
+- doc-api/classes/Erubis/PI/Converter.html
+- doc-api/classes/Erubis/PI/Ec.html
+- doc-api/classes/Erubis/PI/Ejava.html
+- doc-api/classes/Erubis/PI/Ejavascript.html
+- doc-api/classes/Erubis/PI/Engine.html
+- doc-api/classes/Erubis/PI/Eperl.html
+- doc-api/classes/Erubis/PI/Ephp.html
+- doc-api/classes/Erubis/PI/Eruby.html
+- doc-api/classes/Erubis/PI/Escheme.html
+- doc-api/classes/Erubis/PI/TinyEruby.html
 - doc-api/files/__
 - doc-api/files/erubis
 - doc-api/files/erubis_rb.html
 - doc-api/files/__/README_txt.html
+- doc-api/files/erubis/context_rb.html
+- doc-api/files/erubis/converter_rb.html
 - doc-api/files/erubis/engine
 - doc-api/files/erubis/engine_rb.html
 - doc-api/files/erubis/enhancer_rb.html
+- doc-api/files/erubis/error_rb.html
+- doc-api/files/erubis/evaluator_rb.html
+- doc-api/files/erubis/generator_rb.html
+- doc-api/files/erubis/helper
 - doc-api/files/erubis/helper_rb.html
 - doc-api/files/erubis/local-setting_rb.html
 - doc-api/files/erubis/main_rb.html
@@ -153,6 +213,7 @@ files:
 - doc-api/files/erubis/engine/eruby_rb.html
 - doc-api/files/erubis/engine/escheme_rb.html
 - doc-api/files/erubis/engine/optimized_rb.html
+- doc-api/files/erubis/helper/rails_rb.html
 test_files: 
 - test/test.rb
 rdoc_options: []
@@ -161,6 +222,7 @@ extra_rdoc_files: []
 
 executables: 
 - erubis
+- notext
 extensions: []
 
 requirements: []