erubis 2.2.0 → 2.3.0

data/test/test-users-guide.rb

@@ -0,0 +1,56 @@
+###
+### $Rev: 77 $
+### $Release: 2.3.0 $
+### copyright(c) 2006-2007 kuwata-lab all rights reserved.
+###
+
+require  "#{File.dirname(__FILE__)}/test.rb"
+
+
+class KwarkUsersGuideTest < Test::Unit::TestCase
+
+  DIR = File.expand_path(File.dirname(__FILE__) + '/data/users-guide')
+  CWD = Dir.pwd()
+
+
+  def setup
+    Dir.chdir DIR
+  end
+
+
+  def teardown
+    Dir.chdir CWD
+  end
+
+
+  def _test
+    @name = (caller()[0] =~ /`(.*?)'/) && $1
+    s = File.read(@filename)
+    s =~ /\A\$ (.*?)\n/
+    command = $1
+    expected = $'
+    result = `#{command}`
+    assert_text_equal(expected, result)
+  end
+
+
+  Dir.chdir DIR do
+    filenames = []
+    filenames += Dir.glob('*.result')
+    filenames += Dir.glob('*.source')
+    filenames.each do |filename|
+      name = filename.gsub(/[^\w]/, '_')
+      s = <<-END
+        def test_#{name}
+          # $stderr.puts "*** debug: test_#{name}"
+          @name = '#{name}'
+          @filename = '#{filename}'
+          _test()
+        end
+      END
+      eval s
+    end
+  end
+
+
+end

data/test/test.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 30 $
-## $Release: 2.2.0 $
+## $Rev: 77 $
+## $Release: 2.3.0 $
 ## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
@@ -24,6 +24,7 @@ require 'erubis'
 if $0 == __FILE__
   require "#{TESTDIR}/test-erubis.rb"
   require "#{TESTDIR}/test-engines.rb"
+  require "#{TESTDIR}/test-enhancers.rb"
   require "#{TESTDIR}/test-main.rb"
-  require "#{TESTDIR}/test-notext.rb"
+  require "#{TESTDIR}/test-users-guide.rb"
 end

data/test/testutil.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 30 $
-### $Release: 2.2.0 $
+### $Rev: 77 $
+### $Release: 2.3.0 $
 ### copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ###
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.2
 specification_version: 1
 name: erubis
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
-date: 2007-02-12 00:00:00 +09:00
+  version: 2.3.0
+date: 2007-05-23 00:00:00 +09:00
 summary: a fast and extensible eRuby implementation which supports multi-language
 require_paths: 
 - lib
@@ -25,24 +25,14 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - makoto kuwata
 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.rb
-- lib/erubis/helpers
-- lib/erubis/local-setting.rb
-- lib/erubis/main.rb
-- lib/erubis/tiny.rb
 - lib/erubis/engine/ec.rb
 - lib/erubis/engine/ejava.rb
 - lib/erubis/engine/ejavascript.rb
@@ -52,11 +42,20 @@ files:
 - lib/erubis/engine/eruby.rb
 - lib/erubis/engine/escheme.rb
 - lib/erubis/engine/optimized.rb
+- lib/erubis/engine.rb
+- lib/erubis/enhancer.rb
+- lib/erubis/error.rb
+- lib/erubis/evaluator.rb
+- lib/erubis/generator.rb
+- lib/erubis/helper.rb
+- lib/erubis/helpers
 - lib/erubis/helpers/rails_helper.rb
+- lib/erubis/local-setting.rb
+- lib/erubis/main.rb
+- lib/erubis/tiny.rb
+- lib/erubis.rb
 - bin/erubis
-- bin/notext
 - examples/basic
-- examples/pi
 - examples/basic/example.ec
 - examples/basic/example.ejava
 - examples/basic/example.ejs
@@ -65,6 +64,7 @@ files:
 - examples/basic/example.eruby
 - examples/basic/example.escheme
 - examples/basic/Makefile
+- examples/pi
 - examples/pi/example.ec
 - examples/pi/example.ejava
 - examples/pi/example.ejs
@@ -75,40 +75,137 @@ files:
 - examples/pi/Makefile
 - test/assert-text-equal.rb
 - test/test-engines.rb
+- test/test-enhancers.rb
 - test/test-erubis.rb
 - test/test-main.rb
-- test/test-notext.rb
+- test/test-users-guide.rb
 - test/test.rb
 - test/testutil.rb
-- doc/users-guide.html
+- test/data/users-guide
+- test/data/users-guide/array_example.result
+- 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/context.rb
+- test/data/users-guide/context.yaml
+- test/data/users-guide/escape_example.result
+- test/data/users-guide/example.ec
+- test/data/users-guide/Example.ejava
+- test/data/users-guide/example.ejs
+- test/data/users-guide/example.eperl
+- test/data/users-guide/example.ephp
+- test/data/users-guide/example.eruby
+- test/data/users-guide/example.escheme
+- test/data/users-guide/example1.eruby
+- test/data/users-guide/example1.rb
+- test/data/users-guide/example1.result
+- test/data/users-guide/example10.rb
+- test/data/users-guide/example10.result
+- test/data/users-guide/example10.xhtml
+- test/data/users-guide/example10_x.result
+- test/data/users-guide/example11.php
+- test/data/users-guide/example11.result
+- test/data/users-guide/example11.rhtml
+- test/data/users-guide/example11_C.result
+- test/data/users-guide/example11_N.result
+- test/data/users-guide/example11_php.result
+- test/data/users-guide/example11_U.result
+- test/data/users-guide/example1_x.result
+- test/data/users-guide/example2.eruby
+- test/data/users-guide/example2.rb
+- test/data/users-guide/example2.result
+- test/data/users-guide/example2_trim.result
+- test/data/users-guide/example2_x.result
+- test/data/users-guide/example3.eruby
+- test/data/users-guide/example3.rb
+- test/data/users-guide/example31.result
+- test/data/users-guide/example32.result
+- test/data/users-guide/example3_e.result
+- test/data/users-guide/example4.eruby
+- test/data/users-guide/example4.rb
+- test/data/users-guide/example4.result
+- test/data/users-guide/example4_x.result
+- test/data/users-guide/example5.eruby
+- test/data/users-guide/example5.rb
+- test/data/users-guide/example5.result
+- test/data/users-guide/example6.rb
+- test/data/users-guide/example6.result
+- test/data/users-guide/example7.eruby
+- test/data/users-guide/example71.result
+- test/data/users-guide/example72.result
+- test/data/users-guide/example8.eruby
+- test/data/users-guide/example8_ruby.result
+- test/data/users-guide/example8_yaml.result
+- test/data/users-guide/example9.eruby
+- test/data/users-guide/example9.rb
+- test/data/users-guide/example9.result
+- test/data/users-guide/example91.result
+- test/data/users-guide/example92.result
+- test/data/users-guide/example_c.result
+- test/data/users-guide/example_java.result
+- test/data/users-guide/example_js.result
+- test/data/users-guide/example_perl.result
+- 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.rb
+- test/data/users-guide/fasteruby.result
+- test/data/users-guide/fasteruby.rhtml
+- test/data/users-guide/headerfooter-example.eruby
+- test/data/users-guide/headerfooter-example2.rb
+- test/data/users-guide/headerfooter-example2.rhtml
+- test/data/users-guide/headerfooter_example.result
+- test/data/users-guide/headerfooter_example2.result
+- test/data/users-guide/interpolation_example.result
+- test/data/users-guide/nocode-example.eruby
+- test/data/users-guide/nocode-php.result
+- test/data/users-guide/nocode_example.result
+- test/data/users-guide/normal-eruby-test.eruby
+- test/data/users-guide/normal_eruby_test.result
+- test/data/users-guide/notext-example.eruby
+- test/data/users-guide/notext-example.php
+- test/data/users-guide/notext-php.result
+- 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/printenable_example.result
+- test/data/users-guide/printenabled-example.eruby
+- test/data/users-guide/printenabled-example.rb
+- test/data/users-guide/printstatement_example.result
+- test/data/users-guide/simplify_example.result
+- test/data/users-guide/stdout_exmple.result
+- test/data/users-guide/stringbuffer_example.result
 - doc/docstyle.css
+- doc/users-guide.html
 - README.txt
 - CHANGES
 - MIT-LICENSE
 - setup.rb
 - contrib/action_view_base_rb.patch
 - contrib/erubis
+- contrib/erubis-run.rb
 - contrib/inline-require
-- benchmark/erubybench-lib.rb
-- benchmark/erubybench.rb
-- benchmark/erubybench.rhtml
-- benchmark/erubybench.yaml
+- benchmark/bench.rb
+- benchmark/bench_context.yaml
+- benchmark/Makefile
+- benchmark/templates
+- benchmark/templates/_footer.html
+- benchmark/templates/_header.html
+- benchmark/templates/bench_erb.rhtml
+- benchmark/templates/bench_erubis.rhtml
+- benchmark/templates/bench_eruby.rhtml
 - doc-api/classes
-- doc-api/created.rid
-- doc-api/files
-- doc-api/fr_class_index.html
-- doc-api/fr_file_index.html
-- doc-api/fr_method_index.html
-- doc-api/index.html
-- doc-api/rdoc-style.css
-- doc-api/classes/ERB.html
+- doc-api/classes/ActionView
+- doc-api/classes/ActionView/Base
+- doc-api/classes/ActionView/Base/ERB.html
 - doc-api/classes/Erubis
-- doc-api/classes/Erubis.html
 - doc-api/classes/Erubis/ArrayBufferEnhancer.html
 - 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/Converter.html
+- doc-api/classes/Erubis/Basic/Engine.html
 - doc-api/classes/Erubis/Basic.html
 - doc-api/classes/Erubis/BiPatternEnhancer.html
 - doc-api/classes/Erubis/BiPatternEruby.html
@@ -116,12 +213,16 @@ files:
 - doc-api/classes/Erubis/CommandOptionError.html
 - doc-api/classes/Erubis/Context.html
 - doc-api/classes/Erubis/Converter.html
+- doc-api/classes/Erubis/DeleteIndentEnhancer.html
+- doc-api/classes/Erubis/DeleteIndentEruby.html
 - doc-api/classes/Erubis/Ec.html
 - doc-api/classes/Erubis/Ejava.html
 - doc-api/classes/Erubis/Ejavascript.html
 - doc-api/classes/Erubis/Engine.html
 - doc-api/classes/Erubis/Eperl.html
 - doc-api/classes/Erubis/Ephp.html
+- doc-api/classes/Erubis/ErboutEnhancer.html
+- doc-api/classes/Erubis/ErboutEruby.html
 - doc-api/classes/Erubis/ErubisError.html
 - doc-api/classes/Erubis/Eruby.html
 - doc-api/classes/Erubis/EscapedEc.html
@@ -134,11 +235,15 @@ files:
 - doc-api/classes/Erubis/EscapeEnhancer.html
 - doc-api/classes/Erubis/Escheme.html
 - doc-api/classes/Erubis/Evaluator.html
+- doc-api/classes/Erubis/FastEruby.html
 - doc-api/classes/Erubis/Generator.html
 - doc-api/classes/Erubis/HeaderFooterEnhancer.html
 - doc-api/classes/Erubis/HeaderFooterEruby.html
 - doc-api/classes/Erubis/Helpers
+- doc-api/classes/Erubis/Helpers/RailsHelper.html
 - doc-api/classes/Erubis/Helpers.html
+- doc-api/classes/Erubis/InterpolationEnhancer.html
+- doc-api/classes/Erubis/InterpolationEruby.html
 - doc-api/classes/Erubis/JavaGenerator.html
 - doc-api/classes/Erubis/JavascriptGenerator.html
 - doc-api/classes/Erubis/Main.html
@@ -155,6 +260,16 @@ files:
 - doc-api/classes/Erubis/PerlGenerator.html
 - doc-api/classes/Erubis/PhpGenerator.html
 - doc-api/classes/Erubis/PI
+- 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/classes/Erubis/PI.html
 - doc-api/classes/Erubis/PrintEnabledEnhancer.html
 - doc-api/classes/Erubis/PrintEnabledEruby.html
@@ -175,35 +290,13 @@ 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/Helpers/RailsHelper.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/classes/Erubis.html
+- doc-api/created.rid
+- 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_rb.html
-- doc-api/files/erubis/helpers
-- doc-api/files/erubis/local-setting_rb.html
-- doc-api/files/erubis/main_rb.html
-- doc-api/files/erubis/tiny_rb.html
 - doc-api/files/erubis/engine/ec_rb.html
 - doc-api/files/erubis/engine/ejava_rb.html
 - doc-api/files/erubis/engine/ejavascript_rb.html
@@ -213,7 +306,24 @@ 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/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_rb.html
+- doc-api/files/erubis/helpers
 - doc-api/files/erubis/helpers/rails_helper_rb.html
+- doc-api/files/erubis/local-setting_rb.html
+- doc-api/files/erubis/main_rb.html
+- doc-api/files/erubis/tiny_rb.html
+- doc-api/files/erubis_rb.html
+- doc-api/files/README_txt.html
+- doc-api/fr_class_index.html
+- doc-api/fr_file_index.html
+- doc-api/fr_method_index.html
+- doc-api/index.html
+- doc-api/rdoc-style.css
 test_files: 
 - test/test.rb
 rdoc_options: []
@@ -222,7 +332,6 @@ extra_rdoc_files: []
 
 executables: 
 - erubis
-- notext
 extensions: []
 
 requirements: []

data/benchmark/erubybench-lib.rb

@@ -1,189 +0,0 @@
-
-module Erubis
-
-  class Eruby2 < Eruby
-    def finalize_src(src)
-      #src << "\nprint _buf.join; nil\n"
-      src << "\n_buf.join; ''\n"
-    end
-  end
-
-  class ExprStrippedEruby < Eruby
-    def add_expr(src, code, indicator)
-      super(src, code.strip! || code, indicator)
-    end
-  end
-
-
-  ##
-  ## use $stdout
-  ##
-  class TinyStdoutEruby
-
-    def initialize(input)
-      @src = compile(input)
-    end
-    attr_reader :src
-
-    def result(binding=TOPLEVEL_BINDING)
-      eval @src, binding
-    end
-
-    EMBEDDED_PATTERN = /(.*?)<%(=+|\#)?(.*?)-?%>/m
-
-    def compile(input)
-      src = "_buf = $stdout;"           # preamble
-      input.scan(EMBEDDED_PATTERN) do |text, indicator, code|
-        src << " _buf << '" << escape_text(text) << "';"
-        if !indicator              # <% %>
-          src << code << ";"
-        elsif indicator[0] == ?\#  # <%# %>
-          n = code.count("\n")
-          add_stmt(src, "\n" * n)
-        else                       # <%= %>
-          src << " _buf << (" << code << ").to_s;"
-        end
-      end
-      rest = $' || input
-      src << " _buf << '" << escape_text(rest) << "';"
-      src << "\nnil\n"       # postamble
-      return src
-    end
-
-    def escape_text(text)
-      return text.gsub!(/['\\]/, '\\\\\&') || text
-    end
-
-  end
-
-
-  ##
-  ## use print statement
-  ##
-  class TinyPrintEruby
-
-    def initialize(input)
-      @src = compile(input)
-    end
-    attr_reader :src
-
-    def result(binding=TOPLEVEL_BINDING)
-      eval @src, binding
-    end
-
-    EMBEDDED_PATTERN = /(.*?)<%(=+|\#)?(.*?)-?%>/m
-
-    def compile(input)
-      src = ""
-      input.scan(EMBEDDED_PATTERN) do |text, indicator, code|
-        src << " print '" << escape_text(text) << "';"
-        if !indicator              # <% %>
-          src << code << ";"
-        elsif indicator[0] == ?\#  # <%# %>
-          n = code.count("\n")
-          add_stmt(src, "\n" * n)
-        else                       # <%= %>
-          src << " print((" << code << ").to_s);"
-        end
-      end
-      rest = $' || input
-      src << " print '" << escape_text(rest) << "';"
-      src << "\nnil\n"
-      return src
-    end
-
-    def escape_text(text)
-      return text.gsub!(/['\\]/, '\\\\\&') || text
-    end
-
-  end
-
-
-  ##
-  ## for test
-  ##
-  class Optimized2Eruby < Eruby   # :nodoc:
-
-    def self.supported_properties()  # :nodoc:
-      return super
-    end
-
-    def initialize(input, properties={})
-      @initialized = false
-      #@prev_is_expr = false
-      super
-    end
-
-    protected
-
-    def escape_text(text)
-      text.gsub(/['\\]/, '\\\\\&')   # "'" => "\\'",  '\\' => '\\\\'
-    end
-
-    def escaped_expr(code)
-      return "Erubis::XmlHelper.escape_xml(#{code})"
-    end
-
-    #def switch_to_expr(src)
-    #  return if @prev_is_expr
-    #  @prev_is_expr = true
-    #  src << ' _buf'
-    #end
-
-    #def switch_to_stmt(src)
-    #  return unless @prev_is_expr
-    #  @prev_is_expr = false
-    #  src << ';'
-    #end
-
-    def add_preamble(src)
-      @initialized = false
-      #@prev_is_expr = false
-    end
-
-    def add_text(src, text)
-      return if text.empty?
-      if @initialized
-        #switch_to_expr(src)
-        #src << " << '" << escape_text(text) << "'"
-        src << "_buf << '" << escape_text(text) << "';"
-      else
-        src << "_buf = '" << escape_text(text) << "';"
-        @initialized = true
-      end
-    end
-
-    def add_stmt(src, code)
-      #switch_to_stmt(src) if @initialized
-      #super
-      src << code << ';'
-    end
-
-    def add_expr_literal(src, code)
-      unless @initialized; src << "_buf = ''"; @initialized = true; end
-      #switch_to_expr(src)
-      #src << " << (" << code << ").to_s"
-      src << " _buf << (" << code << ").to_s;"
-    end
-
-    def add_expr_escaped(src, code)
-      unless @initialized; src << "_buf = ''"; @initialized = true; end
-      #switch_to_expr(src)
-      #src << " << " << escaped_expr(code)
-      src << " _buf << " << escaped_expr(code) << ';'
-    end
-
-    def add_expr_debug(src, code)
-      code.strip!
-      s = (code.dump =~ /\A"(.*)"\z/) && $1
-      src << ' $stderr.puts("*** debug: ' << s << '=#{(' << code << ').inspect}");'
-    end
-
-    def add_postamble(src)
-      #super if @initialized
-      src << "\n_buf\n" if @initialized
-    end
-
-  end
-
-end