erubis 2.2.0 → 2.3.0

data/lib/erubis/local-setting.rb

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

data/lib/erubis/main.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 65 $
-### $Release: 2.2.0 $
+### $Rev: 78 $
+### $Release: 2.3.0 $
 ### copyright(c) 2006-2007 kuwata-lab all rights reserved.
 ###
 
@@ -49,21 +49,21 @@ module Erubis
     end
 
     def initialize
-      @single_options = "hvxztSbeB"
-      @arg_options    = "pcrfKIlaEC"
+      @single_options = "hvxztTSbeBXNUC"
+      @arg_options    = "pcrfKIlaE" #C
       @option_names   = {
         ?h => :help,
         ?v => :version,
         ?x => :source,
         ?z => :syntax,
-        #?T => :notrim,
-        ?t => :untabify,
+        ?T => :unexpand,
+        ?t => :untabify,      # obsolete
         ?S => :intern,
         ?b => :bodyonly,
         ?B => :binding,
         ?p => :pattern,
         ?c => :context,
-        ?C => :class,
+        #?C => :class,
         ?e => :escape,
         ?r => :requires,
         ?f => :datafiles,
@@ -72,6 +72,10 @@ module Erubis
         ?l => :lang,
         ?a => :action,
         ?E => :enhancers,
+        ?X => :notext,
+        ?N => :linenum,
+        ?U => :unique,
+        ?C => :compact,
       }
       assert unless @single_options.length + @arg_options.length == @option_names.length
       (@single_options + @arg_options).each_byte do |ch|
@@ -115,14 +119,15 @@ module Erubis
       ## action
       action = opts.action
       action ||= 'syntax'  if opts.syntax
-      action ||= 'convert' if opts.source
+      action ||= 'convert' if opts.source || opts.notext
 
       ## lang
       lang = opts.lang || 'ruby'
       action ||= 'convert' if opts.lang
 
       ## class name of Eruby
-      classname = opts.class
+      #classname = opts.class
+      classname = nil
       klass = get_classobj(classname, lang, properties[:pi])
 
       ## kanji code
@@ -153,6 +158,9 @@ module Erubis
         engine.bipattern = properties[:bipattern] if enhancer == Erubis::BiPatternEnhancer
       end
 
+      ## no-text
+      engine.extend(Erubis::NoTextEnhancer) if opts.notext
+
       ## convert and execute
       val = nil
       msg = "Syntax OK\n"
@@ -179,7 +187,7 @@ module Erubis
     def do_action(action, engine, context, filename, opts)
       case action
       when 'convert'
-        s = engine.src
+        s = manipulate_src(engine.src, opts)
       when nil, 'exec', 'execute'
         s = opts.binding ? engine.result(context.to_hash) : engine.evaluate(context)
       when 'syntax'
@@ -191,36 +199,55 @@ module Erubis
       return s
     end
 
+    def manipulate_src(source, opts)
+      flag_linenum   = opts.linenum
+      flag_unique    = opts.unique
+      flag_compact   = opts.compact
+      if flag_linenum
+        n = 0
+        source.gsub!(/^/) { n += 1; "%5d:  " % n }
+        source.gsub!(/^ *\d+:\s+?\n/, '')      if flag_compact
+        source.gsub!(/(^ *\d+:\s+?\n)+/, "\n") if flag_unique
+      else
+        source.gsub!(/^\s*?\n/, '')      if flag_compact
+        source.gsub!(/(^\s*?\n)+/, "\n") if flag_unique
+      end
+      return source
+    end
+
     def usage
       command = File.basename($0)
-      s = <<END
-erubis - embedded program converter for multi-language
-Usage: #{command} [..options..] [file ...]
-  -h, --help    : help
-  -v            : version
-  -x            : show converted code
-  -z            : syntax checking
-  -b            : body only (no preamble nor postamble)
-  -e            : escape (equal to '--E Escape')
-  -p pattern    : embedded pattern (default '<% %>')
-  -l lang       : convert but no execute (ruby/php/c/java/scheme/perl/js)
-  -E e1,e2,...  : enhancer names (Escape, PercentLine, BiPattern, ...)
-  -I path       : library include path
-  -K kanji      : kanji code (euc/sjis/utf8) (default none)
-  -c context    : context data string (yaml inline style or ruby code)
-  -f datafile   : context data file ('*.yaml', '*.yml', or '*.rb')
-  -t            : expand tab character in YAML file
-  -S            : convert mapping key from string to symbol in YAML file
-  -B            : invoke 'result(binding)' instead of 'evaluate(context)'
-  --pi=name     : parse '<?name ... ?>' instead of '<% ... %>'
-
-END
+      buf = []
+      buf << "erubis - embedded program converter for multi-language"
+      buf << "Usage: #{command} [..options..] [file ...]"
+      buf << "  -h, --help    : help"
+      buf << "  -v            : version"
+      buf << "  -x            : show converted code"
+      buf << "  -X            : show converted code, only ruby code and no text part"
+      buf << "  -N            : numbering: add line numbers            (for '-x/-X')"
+      buf << "  -U            : unique: compress empty lines to a line (for '-x/-X')"
+      buf << "  -C            : compact: remove empty lines            (for '-x/-X')"
+      buf << "  -b            : body only: no preamble nor postamble   (for '-x/-X')"
+      buf << "  -z            : syntax checking"
+      buf << "  -e            : escape (equal to '--E Escape')"
+      buf << "  -p pattern    : embedded pattern (default '<% %>')"
+      buf << "  -l lang       : convert but no execute (ruby/php/c/java/scheme/perl/js)"
+      buf << "  -E e1,e2,...  : enhancer names (Escape, PercentLine, BiPattern, ...)"
+      buf << "  -I path       : library include path"
+      buf << "  -K kanji      : kanji code (euc/sjis/utf8) (default none)"
+      buf << "  -c context    : context data string (yaml inline style or ruby code)"
+      buf << "  -f datafile   : context data file ('*.yaml', '*.yml', or '*.rb')"
+      #buf << "  -t            : expand tab characters in YAML file"
+      buf << "  -T            : don't expand tab characters in YAML file"
+      buf << "  -S            : convert mapping key from string to symbol in YAML file"
+      buf << "  -B            : invoke 'result(binding)' instead of 'evaluate(context)'"
+      buf << "  --pi=name     : parse '<?name ... ?>' instead of '<% ... %>'"
       #'
       #  -T            : don't trim spaces around '<% %>'
       #  -c class      : class name (XmlEruby/PercentLineEruby/...) (default Eruby)
       #  -r library    : require library
       #  -a            : action (convert/execute)
-      return s
+      return join("\n")
     end
 
 
@@ -385,10 +412,10 @@ END
         filename.strip!
         test(?f, filename) or raise CommandOptionError.new("#{filename}: file not found.")
         if filename =~ /\.ya?ml$/
-          if opts.untabify
-            ydoc = YAML.load(untabify(File.read(filename)))
-          else
+          if opts.unexpand
             ydoc = YAML.load_file(filename)
+          else
+            ydoc = YAML.load(untabify(File.read(filename)))
           end
           ydoc.is_a?(Hash) or raise CommandOptionError.new("#{filename}: root object is not a mapping.")
           intern_hash_keys(ydoc) if opts.intern

data/lib/erubis/tiny.rb

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

data/test/assert-text-equal.rb

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

data/test/data/users-guide/Example.ejava

@@ -0,0 +1,55 @@
+<%
+import java.util.*;
+
+public class Example {
+  private String user;
+  private String[] list;
+  public example(String user, String[] list) {
+    this.user = user;
+    this.list = list;
+  }
+
+  public String view() {
+    StringBuffer _buf = new StringBuffer();
+%>
+<html>
+ <body>
+  <p>Hello <%= user %>!</p>
+  <table>
+   <tbody>
+    <% for (int i = 0; i < list.length; i++) { %>
+    <tr bgcolor="<%= i % 2 == 0 ? "#FFCCCC" : "#CCCCFF" %>">
+     <td><%= i + 1 %></td>
+     <td><%== list[i] %></td>
+    </tr>
+    <% } %>
+   </tbody>
+  </table>
+ <body>
+</html>
+<%
+    return _buf.toString();
+  }
+
+  public static void main(String[] args) {
+    String[] list = { "<aaa>", "b&b", "\"ccc\"" };
+    Example ex = Example.new("Erubis", list);
+    System.out.print(ex.view());
+  }
+
+  public static String escape(String s) {
+    StringBuffer sb = new StringBuffer();
+    for (int i = 0; i < s.length(); i++) {
+      char ch = s.charAt(i);
+      switch (ch) {
+      case '<':   sb.append("&lt;"); break;
+      case '>':   sb.append("&gt;"); break;
+      case '&':   sb.append("&amp;"); break;
+      case '"':   sb.append("&quot;"); break;
+      default:    sb.append(ch);
+      }
+    }
+    return sb.toString();
+  }
+}
+%>

data/test/data/users-guide/array_example.result

@@ -0,0 +1,9 @@
+$ erubis -xE Array example.eruby
+_buf = []; _buf << '<div>
+'; for item in list 
+ _buf << '  <p>'; _buf << ( item ).to_s; _buf << '</p>
+  <p>'; _buf << Erubis::XmlHelper.escape_xml( item ); _buf << '</p>
+'; end 
+ _buf << '</div>
+';
+_buf

data/test/data/users-guide/arraybuffer_example.result

@@ -0,0 +1,9 @@
+$ erubis -xE ArrayBuffer example.eruby
+_buf = []; _buf << '<div>
+'; for item in list 
+ _buf << '  <p>'; _buf << ( item ).to_s; _buf << '</p>
+  <p>'; _buf << Erubis::XmlHelper.escape_xml( item ); _buf << '</p>
+'; end 
+ _buf << '</div>
+';
+_buf.join

data/test/data/users-guide/bipattern-example.rhtml

@@ -0,0 +1,4 @@
+<% for item in list %>
+  <b>[= item =]</b>
+  <b>[== item =]</b>
+<% end %>

data/test/data/users-guide/bipattern_example.result

@@ -0,0 +1,6 @@
+$ erubis -xE BiPattern bipattern-example.rhtml
+_buf = ''; for item in list 
+ _buf << '  <b>'; _buf << ( item ).to_s; _buf << '</b>
+  <b>'; _buf << Erubis::XmlHelper.escape_xml( item ); _buf << '</b>
+'; end 
+_buf.to_s

data/test/data/users-guide/context.rb

@@ -0,0 +1,6 @@
+@title = 'Users List'
+@users = [
+   { 'name'=>'foo', 'mail'=>'foo@mail.com' },
+   { 'name'=>'bar', 'mail'=>'bar@mail.net' },
+   { 'name'=>'baz', 'mail'=>'baz@mail.org' },
+]

data/test/data/users-guide/context.yaml

@@ -0,0 +1,8 @@
+title: Users List
+users:
+  - name:  foo
+    mail:  foo@mail.com
+  - name:  bar
+    mail:  bar@mail.net
+  - name:  baz
+    mail:  baz@mail.org

data/test/data/users-guide/escape_example.result

@@ -0,0 +1,9 @@
+$ erubis -xE Escape example.eruby
+_buf = ''; _buf << '<div>
+'; for item in list 
+ _buf << '  <p>'; _buf << Erubis::XmlHelper.escape_xml( item ); _buf << '</p>
+  <p>'; _buf << ( item ).to_s; _buf << '</p>
+'; end 
+ _buf << '</div>
+';
+_buf.to_s

data/test/data/users-guide/example.ec

@@ -0,0 +1,27 @@
+<%
+#include <stdio.h>
+
+int main(int argc, char *argv[])
+{
+    int i;
+
+%>
+<html>
+ <body>
+  <p>Hello <%= "%s", argv[0] %>!</p>
+  <table>
+   <tbody>
+    <% for (i = 1; i < argc; i++) { %>
+    <tr bgcolor="<%= i % 2 == 0 ? "#FFCCCC" : "#CCCCFF" %>">
+      <td><%= "%d", i %></td>
+      <td><%= "%s", argv[i] %></td>
+    </tr>
+    <% } %>
+   </tbody>
+  </table>
+ </body>
+</html>
+<%
+    return 0; 
+}
+%>

data/test/data/users-guide/example.ejs

@@ -0,0 +1,20 @@
+<%
+   var user = 'Erubis';
+   var list = ['<aaa>', 'b&b', '"ccc"'];
+ %>
+<html>
+ <body>
+  <p>Hello <%= user %>!</p>
+  <table>
+   <tbody>
+    <% var i; %>
+    <% for (i = 0; i < list.length; i++) { %>
+    <tr bgcolor="<%= i % 2 == 0 ? '#FFCCCC' : '#CCCCFF' %>">
+     <td><%= i + 1 %></td>
+     <td><%= list[i] %></td>
+    </tr>
+    <% } %>
+   </tbody>
+  </table>
+ </body>
+</html>

data/test/data/users-guide/example.eperl

@@ -0,0 +1,18 @@
+<%
+   my $user = 'Erubis';
+   my @list = ('<aaa>', 'b&b', '"ccc"');
+%>
+<html>
+ <body>
+  <p>Hello <%= $user %>!</p>
+  <table>
+   <% $i = 0; %>
+   <% for $item (@list) { %>
+   <tr bgcolor=<%= ++$i % 2 == 0 ? '#FFCCCC' : '#CCCCFF' %>">
+    <td><%= $i %></td>
+    <td><%= $item %></td>
+   </tr>
+   <% } %>
+  </table>
+ </body>
+</html>

data/test/data/users-guide/example.ephp

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<html>
+ <body>
+  <p>Hello <%= $user %>!</p>
+  <table>
+   <tbody>
+    <% $i = 0; %>
+    <% foreach ($list as $item) { %>
+    <%   $i++; %>
+    <tr bgcolor="<%= $i % 2 == 0 ? '#FFCCCC' : '#CCCCFF' %>">
+     <td><%= $i %></td>
+     <td><%== $item %></td>
+    </tr>
+    <% } %>
+   </tbody>
+  </table>
+ </body>
+</html>

data/test/data/users-guide/example.eruby

@@ -0,0 +1,6 @@
+<div>
+<% for item in list %>
+  <p><%= item %></p>
+  <p><%== item %></p>
+<% end %>
+</div>

data/test/data/users-guide/example.escheme

@@ -0,0 +1,28 @@
+<html>
+ <body>
+<%
+(let ((user "Erubis")
+      (items '("<aaa>" "b&b" "\"ccc\""))
+      (i 0))
+ %>
+  <p>Hello <%= user %>!</p>
+  <table>
+<%
+  (for-each
+   (lambda (item)
+     (set! i (+ i 1))
+ %>
+   <tr bgcolor="<%= (if (= (modulo i 2) 0) "#FFCCCC" "#CCCCFF") %>">
+    <td><%= i %></td>
+    <td><%= item %></td>
+   </tr>
+<%
+   ) ; lambda end
+   items) ; for-each end
+ %>
+  </table>
+<%
+) ; let end
+%>
+ </body>
+</html>