erubis 1.1.0 → 2.0.0

data/test/assert-text-equal.rb

@@ -0,0 +1,45 @@
+###
+### $Rev: 6 $
+### $Release: 2.0.0 $
+### copyright(c) 2006 kuwata-lab all rights reserved.
+###
+
+require 'test/unit'
+require 'tempfile'
+
+
+module Test
+  module Unit
+    class TestCase
+
+      def assert_text_equal(expected, actual, message=nil, diffopt='-u', flag_cut=true)
+        if expected == actual
+          assert(true)
+          return
+        end
+        if expected[-1] != ?\n || actual[-1] != ?\n
+          expected += "\n"
+          actual   += "\n"
+        end
+        begin
+          expfile = Tempfile.new(".expected.")
+          expfile.write(expected); expfile.flush()
+          actfile = Tempfile.new(".actual.")
+          actfile.write(actual);   actfile.flush()
+          diff = `diff #{diffopt} #{expfile.path} #{actfile.path}`
+        ensure
+          expfile.close(true) if expfile
+          actfile.close(true) if actfile
+        end
+        # cut 1st & 2nd lines
+        message = (flag_cut ? diff.gsub(/\A.*\n.*\n/, '') : diff) unless message
+        #raise Test::Unit::AssertionFailedError.new(message)
+        assert_block(message) { false }  # or assert(false, message)
+      end
+
+      alias assert_equal_with_diff assert_text_equal    # for compatibility
+      alias assert_text_equals     assert_text_equal    # for typo
+
+    end
+  end
+end

data/test/test-bin.rb

@@ -1,15 +1,12 @@
 ##
-## $Rev: 3 $
-## $Release: 1.1.0 $
-## $Date: 2006-01-31 12:54:23 +0900 (Tue, 31 Jan 2006) $
+## $Rev: 21 $
+## $Release: 2.0.0 $
+## $Date: 2006-05-20 08:57:39 +0900 (Sat, 20 May 2006) $
 ##
 
-testdir = File.dirname(File.expand_path(__FILE__))
-libdir  = File.dirname(testdir) + '/lib'
-$: << testdir
-$: << libdir
+require  "#{File.dirname(__FILE__)}/test.rb"
 
-bindir  = File.dirname(testdir) + '/bin'
+bindir  = File.dirname(TESTDIR) + '/bin'
 $script = bindir + '/erubis'
 if test(?f, 'bin/erubis')
   $script = 'bin/erubis'
@@ -19,12 +16,19 @@ end
 
 
 require 'test/unit'
-#require 'test/unit/ui/console/testrunner'
 require 'assert-text-equal'
 require 'yaml'
 require 'tempfile'
 
 require 'erubis'
+require 'erubis/main'
+
+
+class StringWriter < String
+  def write(arg)
+    self << arg
+  end
+end
 
 
 class BinTest < Test::Unit::TestCase
@@ -37,16 +41,28 @@ list:
 <% end %>
 user: <%= defined?(user) ? user : "(none)" %>
 END
-
+  INPUT2 = INPUT.gsub(/\blist([^:])/, '@list\1').gsub(/\buser([^:])/, '@user\1')
+
+#  SRC = <<'END'
+#_buf = ''; _buf << "list:\n"
+# list = ['<aaa>', 'b&b', '"ccc"']
+#   for item in list 
+#_buf << "  - "; _buf << ( item ).to_s; _buf << "\n"
+# end 
+#_buf << "user: "; _buf << ( defined?(user) ? user : "(none)" ).to_s; _buf << "\n"
+#_buf
+#END
   SRC = <<'END'
-_out = ''; _out << "list:\n"
- list = ['<aaa>', 'b&b', '"ccc"']
+_buf = []; _buf << 'list:
+'; list = ['<aaa>', 'b&b', '"ccc"']
    for item in list 
-_out << "  - "; _out << ( item ).to_s; _out << "\n"
- end 
-_out << "user: "; _out << ( defined?(user) ? user : "(none)" ).to_s; _out << "\n"
-_out
+ _buf << '  - '; _buf << ( item ).to_s; _buf << '
+'; end 
+ _buf << 'user: '; _buf << ( defined?(user) ? user : "(none)" ).to_s; _buf << '
+';
+_buf.join
 END
+#  SRC2 = SRC.gsub(/\blist /, '@list ').gsub(/\buser /, '@user ')
 
   OUTPUT = <<'END'
 list:
@@ -56,26 +72,50 @@ list:
 user: (none)
 END
 
+  ESCAPED_OUTPUT = <<'END'
+list:
+  - &lt;aaa&gt;
+  - b&amp;b
+  - &quot;ccc&quot;
+user: (none)
+END
+
 
   def _test()
+    if $target
+      name = (caller()[0] =~ /in `test_(.*?)'/) && $1
+      return unless name == $target
+    end
     if @filename == nil
       method = (caller[0] =~ /in `(.*)'/) && $1    #'
       @filename = "tmp.#{method}"
     end
     File.open(@filename, 'w') { |f| f.write(@input) } if @filename
     begin
-      command = "ruby #{$script} #{@options} #{@filename}"
-      output = `#{command}`
+      #if @options.is_a?(Array)
+      #  command = "ruby #{$script} #{@options.join(' ')} #{@filename}"
+      #else
+      #  command = "ruby #{$script} #{@options} #{@filename}"
+      #end
+      #output = `#{command}`
+      if @options.is_a?(Array)
+        argv = @options + [ @filename ]
+      else
+        argv = "#{@options} #{@filename}".split
+      end
+      $stdout = output = StringWriter.new
+      Erubis::Main.new.execute(argv)
     ensure
+      $stdout = STDOUT
       File.unlink(@filename) if @filename && test(?f, @filename)
     end
     assert_text_equal(@expected, output)
   end
 
 
-  def test_version
+  def test_version    # -v
     @options = '-v'
-    @expected = (("$Release: 1.1.0 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 2.0.0 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end
@@ -89,23 +129,24 @@ END
   end
 
 
-  def test_source1
+  def test_source1    # -x
     @input    = INPUT
     @expected = SRC
-    @options  = '-s'
+    @options  = '-x'
     _test()
   end
 
 
-  def test_pattern1
+  def test_pattern1   # -p
     @input    = INPUT.gsub(/<%/, '<!--%').gsub(/%>/, '%-->')
     @expected = OUTPUT
-    @options  = "-p '<!--% %-->'"
+    #@options  = "-p '<!--% %-->'"
+    @options  = ["-p", "<!--% %-->"]
     _test()
   end
 
 
-  def test_class1
+  def test_class1     # -c
     @input    = INPUT
     @expected = OUTPUT.gsub(/<aaa>/, '&lt;aaa&gt;').gsub(/b&b/, 'b&amp;b').gsub(/"ccc"/, '&quot;ccc&quot;')
     @options  = "-c XmlEruby"
@@ -113,7 +154,7 @@ END
   end
 
 
-  def test_notrim1
+  def test_notrim1    # -T
     @input   = INPUT
     @expected = <<'END'
 list:
@@ -131,33 +172,45 @@ END
   end
 
 
-  def test_notrim2
+  def test_notrim2    # -T
     @input    = INPUT
+#    @expected = <<'END'
+#_buf = ''; _buf << "list:\n"
+# list = ['<aaa>', 'b&b', '"ccc"']
+#   for item in list ; _buf << "\n"
+#_buf << "  - "; _buf << ( item ).to_s; _buf << "\n"
+# end ; _buf << "\n"
+#_buf << "user: "; _buf << ( defined?(user) ? user : "(none)" ).to_s; _buf << "\n"
+#_buf
+#END
     @expected = <<'END'
-_out = ''; _out << "list:\n"
- list = ['<aaa>', 'b&b', '"ccc"']
-   for item in list ; _out << "\n"
-_out << "  - "; _out << ( item ).to_s; _out << "\n"
- end ; _out << "\n"
-_out << "user: "; _out << ( defined?(user) ? user : "(none)" ).to_s; _out << "\n"
-_out
+_buf = []; _buf << 'list:
+'; list = ['<aaa>', 'b&b', '"ccc"']
+   for item in list ; _buf << '
+'; _buf << '  - '; _buf << ( item ).to_s; _buf << '
+'; end ; _buf << '
+'; _buf << 'user: '; _buf << ( defined?(user) ? user : "(none)" ).to_s; _buf << '
+';
+_buf.join
 END
-    @options = "-sT"
+    @options = "-xT"
     _test()
   end
 
 
-  def test_context1
-    @input    = INPUT
-    @expected = OUTPUT.gsub(/\(none\)/, 'Hello')
-    @options  = '--user=Hello'
-    _test()
-  end
+  #--
+  #def test_context1
+  #  @input    = INPUT
+  #  @expected = OUTPUT.gsub(/\(none\)/, 'Hello')
+  #  @options  = '--user=Hello'
+  #  _test()
+  #end
+  #++
 
 
-  def test_yaml1
+  def test_yaml1      # -f
     yamlfile = "test.context1.yaml"
-    @input    = INPUT
+    @input    = INPUT2
     @expected = OUTPUT.gsub(/\(none\)/, 'Hello')
     @options  = "-f #{yamlfile}"
     #
@@ -174,7 +227,94 @@ END
   end
 
 
-  def test_include1
+  def test_untabify1  # -t
+    yamlfile = "test.context2.yaml"
+    @input    = INPUT2
+    @expected = OUTPUT.gsub(/\(none\)/, 'Hello')
+    @options  = "-tf #{yamlfile}"
+    #
+    yaml = <<-END
+    user:	Hello
+    password:	world
+    END
+    File.open(yamlfile, 'w') { |f| f.write(yaml) }
+    begin
+      _test()
+    ensure
+      File.unlink(yamlfile) if test(?f, yamlfile)
+    end
+  end
+
+
+  def test_symbolify1 # -S
+    yamlfile = "test.context3.yaml"
+    @input    = <<END
+<% for h in @list %>
+<tr>
+ <td><%= h[:name] %></td><td><%= h[:mail] %></td>
+</tr>
+<% end %>
+END
+    @expected = <<END
+<tr>
+ <td>foo</td><td>foo@mail.com</td>
+</tr>
+<tr>
+ <td>bar</td><td>bar@mail.org</td>
+</tr>
+END
+    @options  = "-f #{yamlfile} -S"
+    #
+    yaml = <<-END
+list:
+  - name:  foo
+    mail:  foo@mail.com
+  - name:  bar
+    mail:  bar@mail.org
+END
+    File.open(yamlfile, 'w') { |f| f.write(yaml) }
+    begin
+      _test()
+    ensure
+      File.unlink(yamlfile) if test(?f, yamlfile)
+    end
+  end
+
+
+  def test_context1   # -B
+    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} -B "
+    #
+    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'
     Dir.mkdir dir unless test(?d, dir)
@@ -200,7 +340,7 @@ END
   end
 
 
-  def test_require1
+  def test_require1   # -r
     dir = 'foo'
     lib = 'bar'
     Dir.mkdir dir unless test(?d, dir)
@@ -226,4 +366,41 @@ END
   end
 
 
+  def test_enhancers1 # -E
+    @input   = <<END
+<% list = %w[<aaa> b&b "ccc"] %>
+% for item in list
+ - <%= item %> : <%== item %>
+ - [= item =] : [== item =]
+% end
+END
+    @expected = <<END
+ - &lt;aaa&gt; : <aaa>
+ - &lt;aaa&gt; : <aaa>
+ - b&amp;b : b&b
+ - b&amp;b : b&b
+ - &quot;ccc&quot; : "ccc"
+ - &quot;ccc&quot; : "ccc"
+END
+    @options = "-E Escape,PercentLine,HeaderFooter,BiPattern"
+    _test()
+  end
+
+
+  def test_bodyonly1  # -b
+    @input = INPUT
+    @expected = SRC.sub(/\A_buf = \[\];/,'').sub(/\n_buf.join\n\z/,'')
+    @options = '-b -x'
+    _test()
+  end
+
+
+  def test_escape1  # -e
+    @input = INPUT
+    @expected = SRC.gsub(/<< \((.*?)\).to_s;/, '<< Erubis::XmlHelper.escape_xml(\1);')
+    @options = '-ex'
+    _test()
+  end
+
+
 end

data/test/test-engines.rb

@@ -0,0 +1,343 @@
+##
+## $Rev: 21 $
+## $Release: 2.0.0 $
+## copyright(c) 2006 kuwata-lab all rights reserved.
+##
+
+require "#{File.dirname(__FILE__)}/test.rb"
+
+require 'erubis'
+require 'erubis/engine/eruby'
+require 'erubis/engine/ephp'
+require 'erubis/engine/ec'
+require 'erubis/engine/ejava'
+require 'erubis/engine/escheme'
+require 'erubis/engine/eperl'
+require 'erubis/engine/ejavascript'
+
+
+class EnginesTest < Test::Unit::TestCase
+  extend TestEnhancer
+
+  #load_yaml_documents(__FILE__)
+  testdata_list = load_yaml_document(__FILE__)
+  define_testmethods(testdata_list)
+
+  def _test()
+    klass = Erubis.const_get(@class)
+    engine = klass.new(@input, @options || {})
+    actual = engine.src
+    assert_text_equal(@expected, actual)
+  end
+
+end
+
+__END__
+- name:  ruby1
+  lang:  ruby
+  class: Eruby
+  options:
+  input: |
+      <table>
+       <tbody>
+        <% i = 0
+           list.each_with_index do |item, i| %>
+        <tr>
+         <td><%= i+1 %></td>
+         <td><%== list %></td>
+        </tr>
+       <% end %>
+       </tbody>
+      </table>
+      <%=== i+1 %>
+  expected: |
+      _buf = []; _buf << '<table>
+       <tbody>
+      ';   i = 0
+           list.each_with_index do |item, i| 
+       _buf << '  <tr>
+         <td>'; _buf << ( i+1 ).to_s; _buf << '</td>
+         <td>'; _buf << Erubis::XmlHelper.escape_xml( list ); _buf << '</td>
+        </tr>
+      ';  end 
+       _buf << ' </tbody>
+      </table>
+      '; $stderr.puts("*** debug: i+1=#{(i+1).inspect}"); _buf << '
+      ';
+      _buf.join
+##
+- name:  php1
+  lang:  php
+  class: Ephp
+  options:
+  input: |
+      <table>
+       <tbody>
+      <%
+          $i = 0;
+          foreach ($list as $item) {
+  	    $i++;
+       %>
+        <tr>
+         <td><%= $i %></td>
+         <td><%== $item %></td>
+        </tr>
+      <%
+          }
+       %>
+       </tbody>
+      </table>
+      <%=== $i %>
+  expected: |
+      <table>
+       <tbody>
+      <?php 
+          $i = 0;
+          foreach ($list as $item) {
+            $i++;
+       ?>
+        <tr>
+         <td><?php echo $i; ?></td>
+         <td><?php echo htmlspecialchars($item); ?></td>
+        </tr>
+      <?php 
+          }
+       ?>
+       </tbody>
+      </table>
+      <?php error_log('*** debug: $i='.($i), 0); ?>
+##
+- name:  c1
+  lang:  c
+  class: Ec
+  options: { :filename: foo.html, :indent: '  ' }
+  input: |4
+      <table>
+       <tbody>
+      <%  for (i = 0; i < list; i++) { %>
+        <tr>
+         <td><%= "%d", i %></td>
+         <td><%== "%s", list[i] %></td>
+        </tr>
+      <%  } %>
+       </tbody>
+      </table>
+      <%=== "%d", i %>
+  expected: |
+      #line 1 "foo.html"
+        fputs("<table>\n"
+              " <tbody>\n", stdout);
+        for (i = 0; i < list; i++) { 
+        fputs("  <tr>\n"
+              "   <td>", stdout); fprintf(stdout, "%d", i); fputs("</td>\n"
+              "   <td>", stdout); fprintf(stdout, "%s", escape(list[i])); fputs("</td>\n"
+              "  </tr>\n", stdout);
+        } 
+        fputs(" </tbody>\n"
+              "</table>\n", stdout);
+         fprintf(stderr, "*** debug: i=" "%d", i); fputs("\n", stdout);
+##
+- name:  java1
+  lang:  java
+  class: Ejava
+  options: { :buf: _buf, :bufclass: StringBuilder, :indent: '    ' }
+  input: |
+      <table>
+       <tbody>
+      <%
+          int i = 0;
+          for (Iterator it = list.iterator(); it.hasNext(); ) {
+              String s = (String)it.next();
+              i++;
+      %>
+        <tr class="<%= i%2==0 ? "even" : "odd" %>">
+         <td><%= i %></td>
+         <td><%== s %></td>
+        </tr>
+      <%
+          }
+      %>
+       <tbody>
+      </table>
+      <%=== i %>
+  expected: |4
+          StringBuilder _buf = new StringBuilder(); _buf.append("<table>\n"
+                    + " <tbody>\n");
+           
+          int i = 0;
+          for (Iterator it = list.iterator(); it.hasNext(); ) {
+              String s = (String)it.next();
+              i++;
+             
+          _buf.append("  <tr class=\""); _buf.append(i%2==0 ? "even" : "odd"); _buf.append("\">\n"
+                    + "   <td>"); _buf.append(i); _buf.append("</td>\n"
+                    + "   <td>"); _buf.append(escape(s)); _buf.append("</td>\n"
+                    + "  </tr>\n");
+           
+          }
+          
+          _buf.append(" <tbody>\n"
+                    + "</table>\n");
+           System.err.println("*** debug: i="+(i)); _buf.append("\n");
+          return _buf.toString();
+##
+- name:  scheme1
+  lang:  scheme
+  class: Escheme
+  options:
+  input: &scheme1_input|
+      <% (let ((i 0)) %>
+      <table>
+       <tbody>
+      <%
+        (for-each
+         (lambda (item)
+           (set! i (+ i 1))
+      %>
+        <tr>
+         <td><%= i %></td>
+         <td><%== item %></td>
+        </tr>
+      <%
+          ); lambda end
+         list); for-each end
+      %>
+       </tbody>
+      </table>
+      <%=== i %>
+      <% ); let end %>
+  expected: |4
+      (let ((_buf '())) (define (_add x) (set! _buf (cons x _buf)))  (let ((i 0)) 
+      (_add "<table>
+       <tbody>\n")
+      
+        (for-each
+         (lambda (item)
+           (set! i (+ i 1))
+      
+      (_add "  <tr>
+         <td>")(_add i)(_add "</td>
+         <td>")(_add (escape item))(_add "</td>
+        </tr>\n")
+      
+          ); lambda end
+         list); for-each end
+      
+      (_add " </tbody>
+      </table>\n")
+      (display "*** debug: i=")(display i)(display "\n")(_add "\n")
+       ); let end 
+        (reverse _buf))
+  
+##
+- name:  scheme2
+  lang:  scheme
+  class: Escheme
+  options: { :func: 'display' }
+  input: *scheme1_input
+  expected: |4
+       (let ((i 0)) 
+      (display "<table>
+       <tbody>\n")
+      
+        (for-each
+         (lambda (item)
+           (set! i (+ i 1))
+      
+      (display "  <tr>
+         <td>")(display i)(display "</td>
+         <td>")(display (escape item))(display "</td>
+        </tr>\n")
+      
+          ); lambda end
+         list); for-each end
+      
+      (display " </tbody>
+      </table>\n")
+      (display "*** debug: i=")(display i)(display "\n")(display "\n")
+       ); let end 
+##
+- name:  perl1
+  lang:  perl
+  class: Eperl
+  options:
+  input: |
+      <%
+         my $user = 'Erubis';
+         my @list = ('<aaa>', 'b&b', '"ccc"');
+      %>
+      <p>Hello <%= $user %>!</p>
+      <table>
+        <tbody>
+          <% $i = 0; %>
+          <% for $item (@list) { %>
+          <tr bgcolor=<%= ++$i % 2 == 0 ? '#FFCCCC' : '#CCCCFF' %>">
+            <td><%= $i %></td>
+            <td><%== $item %></td>
+          </tr>
+          <% } %>
+        </tbody>
+      </table>
+      <%=== $i %>
+  expected: |4
+      
+         my $user = 'Erubis';
+         my @list = ('<aaa>', 'b&b', '"ccc"');
+      
+      print('<p>Hello '); print($user); print('!</p>
+      <table>
+        <tbody>
+      ');      $i = 0; 
+           for $item (@list) { 
+      print('    <tr bgcolor='); print(++$i % 2 == 0 ? '#FFCCCC' : '#CCCCFF'); print('">
+            <td>'); print($i); print('</td>
+            <td>'); print(escape($item)); print('</td>
+          </tr>
+      ');      } 
+      print('  </tbody>
+      </table>
+      '); print('*** debug: $i=', $i, "\n");print('
+      '); 
+##
+- name:  javascript
+  lang:  javascript
+  class: Ejavascript
+  options:
+  input: |
+      <%
+         var user = 'Erubis';
+         var list = ['<aaa>', 'b&b', '"ccc"'];
+      %>
+      <p>Hello <%= user %>!</p>
+      <table>
+        <tbody>
+          <% var i; %>
+          <% for (i = 0; i < list.length; i++) { %>
+          <tr bgcolor=<%= ++i % 2 == 0 ? '#FFCCCC' : '#CCCCFF' %>">
+            <td><%= i %></td>
+            <td><%= list[i] %></td>
+          </tr>
+          <% } %>
+        </tbody>
+      </table>
+      <%=== i %>
+  expected: |4
+      var _buf = [];
+         var user = 'Erubis';
+         var list = ['<aaa>', 'b&b', '"ccc"'];
+      
+      _buf.push("<p>Hello "); _buf.push(user); _buf.push("!</p>\n\
+      <table>\n\
+        <tbody>\n");
+           var i; 
+           for (i = 0; i < list.length; i++) { 
+      _buf.push("    <tr bgcolor="); _buf.push(++i % 2 == 0 ? '#FFCCCC' : '#CCCCFF'); _buf.push("\">\n\
+            <td>"); _buf.push(i); _buf.push("</td>\n\
+            <td>"); _buf.push(list[i]); _buf.push("</td>\n\
+          </tr>\n");
+           } 
+      _buf.push("  </tbody>\n\
+      </table>\n");
+      alert("*** debug: i="+(i)); _buf.push("\n");
+      document.write(_buf.join(""));
+ ##