erubis 2.1.0 → 2.2.0

data/test/test-erubis.rb

@@ -1,7 +1,7 @@
 ##
-## $Rev: 37 $
-## $Release: 2.1.0 $
-## copyright(c) 2006 kuwata-lab all rights reserved.
+## $Rev: 60 $
+## $Release: 2.2.0 $
+## copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ##
 
 require "#{File.dirname(__FILE__)}/test.rb"
@@ -41,20 +41,22 @@ class ErubisTest < Test::Unit::TestCase
       end
     end if @chomp
 
-    if @testopt != 'load_file'
-      if @klass == Erubis::TinyEruby
-        eruby = @klass.new(@input)
-      else
-        eruby = @klass.new(@input, @options)
-      end
-    else
+    if @testopt == 'load_file'
       filename = "tmp.#{@name}.eruby"
       begin
         File.open(filename, 'w') { |f| f.write(@input) }
         eruby = @klass.load_file(filename, @options)
       ensure
+        cachename = filename + '.cache'
+        File.unlink(cachename) if test(?f, cachename)
         File.unlink(filename) if test(?f, filename)
       end
+    else
+      if @klass == Erubis::TinyEruby
+        eruby = @klass.new(@input)
+      else
+        eruby = @klass.new(@input, @options)
+      end
     end
     assert_text_equal(@src, eruby.src)
 
@@ -96,6 +98,62 @@ class ErubisTest < Test::Unit::TestCase
     end
   end
 
+
+  def test_load_file_cache1
+    @input = <<END
+<ul>
+<% for item in @list %>
+  <li><%= item %></li>
+<% end %>
+</ul>
+END
+    @src = <<END
+_buf = ''; _buf << '<ul>
+'; for item in @list 
+ _buf << '  <li>'; _buf << ( item ).to_s; _buf << '</li>
+'; end 
+ _buf << '</ul>
+';
+_buf.to_s
+END
+    @klass = Erubis::Eruby
+    filename = 'tmp.load_file_timestamp1'
+    cachename = filename + '.cache'
+    begin
+      File.open(filename, 'w') { |f| f.write(@input) }
+      assert_block() { !test(?f, cachename) }
+      engine = @klass.load_file(filename)
+      assert_block() { test(?f, cachename) }
+      assert_block() { File.mtime(filename) <= File.mtime(cachename) }
+      assert_text_equal(@src, engine.src)
+      #
+      input2 = @input.gsub(/ul>/, 'ol>')
+      src2   = @src.gsub(/ul>/, 'ol>')
+      mtime = File.mtime(filename)
+      File.open(filename, 'w') { |f| f.write(input2) }
+      t1 = Time.now()
+      sleep(1)
+      t2 = Time.now()
+      File.utime(t1, t1, filename)
+      File.utime(t2, t2, cachename)
+      assert_block('cache should be newer') { File.mtime(filename) < File.mtime(cachename) }
+      engine = @klass.load_file(filename)
+      assert_block('cache should be newer') { File.mtime(filename) < File.mtime(cachename) }
+      assert_text_equal(@src, engine.src)
+      #
+      File.utime(t2, t2, filename)
+      File.utime(t1, t1, cachename)
+      assert_block('cache should be older') { File.mtime(filename) > File.mtime(cachename) }
+      engine = @klass.load_file(filename)
+      assert_block('cache should be newer') { File.mtime(filename) <= File.mtime(cachename) }
+      assert_text_equal(src2, engine.src)
+    ensure
+      File.unlink(cachename) if File.file?(cachename)
+      File.unlink(filename) if File.file?(filename)
+    end
+  end
+
+
 end
 
 __END__
@@ -106,14 +164,14 @@ __END__
         <li><%= item %></li>
        <% end %>
       </ul>
-  src: |
-      _buf = []; _buf << '<ul>
+  src: &basic1_src|
+      _buf = ''; _buf << '<ul>
       ';  for item in list 
        _buf << '  <li>'; _buf << ( item ).to_s; _buf << '</li>
       ';  end 
        _buf << '</ul>
       ';
-      _buf.join
+      _buf.to_s
   output: &basic1_output|
       <ul>
         <li><aaa></li>
@@ -133,7 +191,7 @@ __END__
         <% end %>
       </ul>
   src: |
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
       ';   i = 0
            for item in list
              i += 1
@@ -142,7 +200,7 @@ __END__
       ';   end 
        _buf << '</ul>
       ';
-      _buf.join
+      _buf.to_s
   output: *basic1_output
 #      <ul>
 #        <li><aaa></li>
@@ -158,12 +216,12 @@ __END__
             i += 1 %><li><%= item %></li><% end %>
       </ul>
   src: |
-      _buf = []; _buf << '<ul>'; i = 0
+      _buf = ''; _buf << '<ul>'; i = 0
           for item in list
             i += 1 ; _buf << '<li>'; _buf << ( item ).to_s; _buf << '</li>'; end ; _buf << '
       '; _buf << '</ul>
       ';
-      _buf.join
+      _buf.to_s
   output: |
       <ul><li><aaa></li><li>b&b</li><li>"ccc"</li>
       </ul>
@@ -178,13 +236,13 @@ __END__
        <% end %>
       </ul>
   src: |
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
       ';  for item in @list 
        _buf << '  <li>'; _buf << ( item ).to_s; _buf << '</li>
       ';  end 
        _buf << '</ul>
       ';
-      _buf.join
+      _buf.to_s
   output: *basic1_output
 
 ##
@@ -201,7 +259,7 @@ __END__
        <% end %>
       </ul>
   src: |
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
       ';
         for item in list 
       
@@ -212,7 +270,7 @@ __END__
       ';  end 
        _buf << '</ul>
       ';
-      _buf.join
+      _buf.to_s
   output: |
       <ul>
         <li>    :  <aaa>  </li>
@@ -229,13 +287,26 @@ __END__
       b = "\""
       c = '\''
   src: |
-      _buf = []; _buf << 'a = "\'"
+      _buf = ''; _buf << 'a = "\'"
       b = "\\""
       c = \'\\\'\'
       ';
-      _buf.join
+      _buf.to_s
   output: *quotation1_input
 
+##
+- name:  minus1
+  desc:  '<%- -%>'
+  class: Eruby
+  input: |
+      <ul>
+       <%- for item in list -%>
+        <li><%= item -%></li>
+       <% end -%>
+      </ul>
+  src: *basic1_src
+  output: *basic1_output
+
 ##
 - name:  pattern1
   options:
@@ -247,13 +318,13 @@ __END__
        [@ end @]
       </ul>
   src: |
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
       ';  for item in list 
        _buf << '  <li>'; _buf << ( item ).to_s; _buf << '</li>
       ';  end 
        _buf << '</ul>
       ';
-      _buf.join
+      _buf.to_s
   output: *basic1_output
 #      <ul>
 #        <li><aaa></li>
@@ -272,13 +343,13 @@ __END__
        <!--% end %-->
       </ul>
   src: |
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
       ';  for item in list 
        _buf << '  <li>'; _buf << ( item ).to_s; _buf << '</li>
       ';  end 
        _buf << '</ul>
       ';
-      _buf.join
+      _buf.to_s
   output: *basic1_output
 #      <ul>
 #        <li><aaa></li>
@@ -297,13 +368,13 @@ __END__
 #       <% end %>
 #      </ul>
   src: |
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
       '; _buf << ' '; for item in list ; _buf << '
       '; _buf << '  <li>'; _buf << ( item ).to_s; _buf << '</li>
       '; _buf << ' '; end ; _buf << '
       '; _buf << '</ul>
       ';
-      _buf.join
+      _buf.to_s
   output: |
       <ul>
       ^
@@ -349,7 +420,7 @@ __END__
   #    _buf << "</ul>\n"
   #    _buf
   src:
-    "_buf = []; _buf << '<ul>\r\n';  for item in list \r\n _buf << '  <li>'; _buf << ( item ).to_s; _buf << '</li>\r\n';  end \r\n _buf << '</ul>\r\n';\n_buf.join\n"
+    "_buf = ''; _buf << '<ul>\r\n';  for item in list \r\n _buf << '  <li>'; _buf << ( item ).to_s; _buf << '</li>\r\n';  end \r\n _buf << '</ul>\r\n';\n_buf.to_s\n"
   #output: |
   #    <ul>
   #      <li><aaa></li>
@@ -368,11 +439,11 @@ __END__
         <li>foo</li>
       </ul>
   src: |
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
         <li>foo</li>
       </ul>
       ';
-      _buf.join
+      _buf.to_s
   output: *nomatch1
 
 ##
@@ -383,11 +454,11 @@ __END__
       <%= str %>
       <%== str %>
   src: |
-      _buf = []; str = '<>&"' 
+      _buf = ''; str = '<>&"' 
        _buf << Erubis::XmlHelper.escape_xml( str ); _buf << '
       '; _buf << ( str ).to_s; _buf << '
       ';
-      _buf.join
+      _buf.to_s
   output: |
       &lt;&gt;&amp;&quot;
       <>&"
@@ -403,14 +474,14 @@ __END__
        <% end %>
       </pre>
   src: |
-      _buf = []; _buf << '<pre>
+      _buf = ''; _buf << '<pre>
       ';  for item in list 
        _buf << '  '; _buf << Erubis::XmlHelper.escape_xml( item ); _buf << '
       '; _buf << '  '; _buf << ( item ).to_s; _buf << '
       ';  end 
        _buf << '</pre>
       ';
-      _buf.join
+      _buf.to_s
   output: |
       <pre>
         &lt;aaa&gt;
@@ -433,13 +504,13 @@ __END__
         <%==== item["var#{n}"] %>
       <% end %>
   src: |
-      _buf = []; for item in list 
+      _buf = ''; for item in list 
        _buf << '  '; _buf << Erubis::XmlHelper.escape_xml( item["var#{n}"] ); _buf << '
       '; _buf << '  '; _buf << ( item["var#{n}"] ).to_s; _buf << '
       '; _buf << '  '; $stderr.puts("*** debug: item[\"var\#{n}\"]=#{(item["var#{n}"]).inspect}"); _buf << '
       '; _buf << '  '; _buf << '
       '; end 
-      _buf.join
+      _buf.to_s
   output: |
 
 ##
@@ -466,13 +537,13 @@ __END__
        <% end %>
       </ul>
   src: |
-      @_buf = _buf = []; _buf << '<ul>
+      @_buf = _buf = ''; _buf << '<ul>
       ';  for item in list 
        _buf << '  <li>'; print item ; _buf << '</li>
       ';  end 
        _buf << '</ul>
       ';
-      _buf.join
+      _buf.to_s
   output: *basic1_output
 #      <ul>
 #        <li><aaa></li>
@@ -536,6 +607,19 @@ __END__
       - "</ul>\n"
 
 ##
+- name:  arraybuffer1
+  class: ArrayBufferEruby
+  input: *basic1_input
+  src: |
+      _buf = []; _buf << '<ul>
+      ';  for item in list 
+       _buf << '  <li>'; _buf << ( item ).to_s; _buf << '</li>
+      ';  end 
+       _buf << '</ul>
+      ';
+      _buf.join
+  output: *basic1_output
+
 - name:  stringbuffer1
   class: StringBufferEruby
   input: *basic1_input
@@ -551,7 +635,7 @@ __END__
       ';  end 
        _buf << '</ul>
       ';
-      _buf
+      _buf.to_s
   output: *basic1_output
 #      <ul>
 #        <li><aaa></li>
@@ -564,14 +648,15 @@ __END__
   class: NoTextEruby
   input: *basic1_input
   src: |
-      _buf = [];
+      _buf = '';
         for item in list 
              _buf << ( item ).to_s;
         end 
       
-      _buf.join
+      _buf.to_s
   output:  '<aaa>b&b"ccc"'
 
+
 ##
 - name:  nocode1
   class: NoCodeEruby
@@ -597,7 +682,7 @@ __END__
        <% end %>
       </ul>
   src: |
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
        '; for item in list ; _buf << '
         <li>
          '; _buf << ( item ).to_s; _buf << '
@@ -605,7 +690,7 @@ __END__
        '; end ; _buf << '
       </ul>
       ';
-      _buf.join
+      _buf.to_s
   output: |
       <ul>
       ^
@@ -633,11 +718,11 @@ __END__
         [= item =] = [== item =]
       <% end %>
   src: |
-      _buf = []; for item in list 
+      _buf = ''; for item in list 
        _buf << '  '; _buf << ( item ).to_s; _buf << ' % '; _buf << Erubis::XmlHelper.escape_xml( item ); _buf << '
       '; _buf << '  '; _buf << ( item ).to_s; _buf << ' = '; _buf << Erubis::XmlHelper.escape_xml( item ); _buf << '
       '; end 
-      _buf.join
+      _buf.to_s
   output: |4
         <aaa> % &lt;aaa&gt;
         <aaa> = &lt;aaa&gt;
@@ -656,11 +741,11 @@ __END__
         ${item} = ${=item}
       <% end %>
   src: |
-      _buf = []; for item in list 
+      _buf = ''; for item in list 
        _buf << '  '; _buf << (item).to_s; _buf << ' % '; _buf << Erubis::XmlHelper.escape_xml(item); _buf << '
       '; _buf << '  '; _buf << (item).to_s; _buf << ' = '; _buf << Erubis::XmlHelper.escape_xml(item); _buf << '
       '; end 
-      _buf.join
+      _buf.to_s
   output: |4
         <aaa> % &lt;aaa&gt;
         <aaa> = &lt;aaa&gt;
@@ -687,7 +772,7 @@ __END__
        % spaced percent
       </pre>
   src: |
-      _buf = []; _buf << '<table>
+      _buf = ''; _buf << '<table>
       '; for item in list
        _buf << '  <tr>
           <td>'; _buf << ( item ).to_s; _buf << '</td>
@@ -700,7 +785,7 @@ __END__
       '; _buf << ' % spaced percent
       </pre>
       ';
-      _buf.join
+      _buf.to_s
   output: |
       <table>
         <tr>
@@ -740,13 +825,13 @@ __END__
       
       def ordered_list(list)
       
-      _buf = []; _buf << '<ol>
+      _buf = ''; _buf << '<ol>
       ';   for item in list 
        _buf << '  <li>'; _buf << Erubis::XmlHelper.escape_xml(item); _buf << '</li>
       ';   end 
        _buf << '</ol>
       ';
-      _buf.join
+      _buf.to_s
        end 
   output: |
       <ol>
@@ -888,13 +973,13 @@ __END__
        <% end %>
       </ul>
   src: |
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
        '; for item in list ; _buf << '
         <li>'; _buf << ( item ).to_s; _buf << '</li>
        '; end ; _buf << '
       </ul>
       ';
-      _buf.join
+      _buf.to_s
   output: |
       <ul>
       ^
@@ -917,13 +1002,13 @@ __END__
        <% end %>
       </ul>
   src: |
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
        '; for item in @list ; _buf << '
         <li>'; _buf << ( item ).to_s; _buf << '</li>
        '; end ; _buf << '
       </ul>
       ';
-      _buf.join
+      _buf.to_s
   output: |
       <ul>
       ^
@@ -947,14 +1032,14 @@ __END__
        <?rb end ?>
       </ul>
   src: &src_pi1|
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
       ';  for item in @list 
        _buf << '  <li>'; _buf << Erubis::XmlHelper.escape_xml(item); _buf << ' / '; _buf << (item).to_s; _buf << '</li>
         <li>'; _buf << ( item ).to_s; _buf << ' / '; _buf << Erubis::XmlHelper.escape_xml( item ); _buf << '</li>
       ';  end 
        _buf << '</ul>
       ';
-      _buf.join
+      _buf.to_s
   output: &output_pi1|
       <ul>
         <li>&lt;aaa&gt; / <aaa></li>
@@ -972,14 +1057,14 @@ __END__
   testopt:  evaluate
   input: *input_pi1
   src: |
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
       ';  for item in @list 
        _buf << '  <li>'; _buf << (item).to_s; _buf << ' / '; _buf << Erubis::XmlHelper.escape_xml(item); _buf << '</li>
         <li>'; _buf << Erubis::XmlHelper.escape_xml( item ); _buf << ' / '; _buf << ( item ).to_s; _buf << '</li>
       ';  end 
        _buf << '</ul>
       ';
-      _buf.join
+      _buf.to_s
   output: |
       <ul>
         <li><aaa> / &lt;aaa&gt;</li>
@@ -1029,7 +1114,7 @@ __END__
       
         def show(list)
       
-      _buf = []; _buf << '<ul>
+      _buf = ''; _buf << '<ul>
       ';  for item in list 
        _buf << (    item 
       ).to_s;  end 
@@ -1039,7 +1124,7 @@ __END__
 
        _buf << '</ul>
       ';
-      _buf.join
+      _buf.to_s
       
         end
 	show(@list) 
@@ -1048,3 +1133,28 @@ __END__
       <ul>
       <aaa>b&b"ccc"</ul>
       
+
+- name:  pitiny1
+  class:  PI::TinyEruby
+  testopt: evaluate
+  input: |
+	<ul>
+	 <?rb for item in @list ?>
+	  <li>@{item}@ / @!{item}@</li>
+	 <?rb end ?>
+	</ul>
+  src: |
+	_buf = ''; _buf << '<ul>
+	';  for item in @list 
+	 _buf << '  <li>'; _buf << Erubis::XmlHelper.escape_xml(item); _buf << ' / '; _buf << (item).to_s; _buf << '</li>
+	';  end 
+	 _buf << '</ul>
+	';
+	_buf.to_s
+  output: |
+	<ul>
+	  <li>&lt;aaa&gt; / <aaa></li>
+	  <li>b&amp;b / b&b</li>
+	  <li>&quot;ccc&quot; / "ccc"</li>
+	</ul>
+