- [change] 'simplest.rb' is renamed to 'tiny.rb'

- [enhance] add Context class
- [enahnce] Engine#enhacne() now support Context object
- [enhance] new command-line option '-X' (convert to context obj) added

2 files changed, 58 insertions, 6 deletions

diff --git a/test/test-bin.rb b/test/test-bin.rb
index 23537c3..f01632b 100644
--- a/test/test-bin.rb
+++ b/test/test-bin.rb
@@ -263,6 +263,39 @@ END
   end
 
 
+  def test_context1   # -X
+    yamlfile = "test.context4.yaml"
+    #
+    @input = <<'END'
+user = <%= @user %>
+<% for item in @list %>
+ - <%= item %>
+<% end %>
+END
+    @expected = <<'END'
+user = World
+ - aaa
+ - bbb
+ - ccc
+END
+    @options = "-f #{yamlfile} -X "
+    #
+    yaml = <<-END
+user: World
+list:
+  - aaa
+  - bbb
+  - ccc
+END
+    File.open(yamlfile, 'w') { |f| f.write(yaml) }
+    begin
+      _test()
+    ensure
+      File.unlink(yamlfile) if test(?f, yamlfile)
+    end
+  end
+
+
   def test_include1   # -I
     dir = 'foo'
     lib = 'bar'
diff --git a/test/test-erubis.rb b/test/test-erubis.rb
index 5c59ec2..3c6665b 100644
--- a/test/test-erubis.rb
+++ b/test/test-erubis.rb
@@ -11,7 +11,7 @@ require 'stringio'
 require 'erubis'
 require 'erubis/engine/enhanced'
 require 'erubis/engine/optimized'
-require 'erubis/simplest'
+require 'erubis/tiny'
 
 
 class ErubisTest < Test::Unit::TestCase
@@ -37,7 +37,7 @@ class ErubisTest < Test::Unit::TestCase
     end if @chomp
 
     if @testopt != 'load_file'
-      if @klass == Erubis::SimplestEruby
+      if @klass == Erubis::TinyEruby
         eruby = @klass.new(@input)
       else
         eruby = @klass.new(@input, @options)
@@ -55,8 +55,9 @@ class ErubisTest < Test::Unit::TestCase
 
     return if @testopt == 'skip_output'
 
-    context = {}
-    context[:list] = list = ['<aaa>', 'b&b', '"ccc"']
+    list = ['<aaa>', 'b&b', '"ccc"']
+    context = @testopt == 'context' ? Erubis::Context.new : {}
+    context[:list] = list
 
     case @testopt
     when/\Aeval\(/
@@ -156,6 +157,24 @@ __END__
       <ul><li><aaa></li><li>b&b</li><li>"ccc"</li>
       </ul>
 ##
+- name:  context1
+  testopt:  context
+  input: |
+      <ul>
+       <% for item in @list %>
+        <li><%= item %></li>
+       <% end %>
+      </ul>
+  src: |
+      _out = []; _out << '<ul>
+      ';  for item in @list 
+      ; _out << '  <li>'; _out << ( item ).to_s; _out << '</li>
+      ';  end 
+      ; _out << '</ul>
+      ';
+      _out.join
+  output: *basic1_output
+##
 - name:  ignore1
   input: |
       <ul>
@@ -782,8 +801,8 @@ __END__
       _out
   output: *optimized4_input
 ##
-- name:  simplest1
-  class: SimplestEruby
+- name:  tiny1
+  class: TinyEruby
   testopt:  result
   input: |
       <ul>