erubis 2.0.1 → 2.1.0

data/examples/{Makefile → basic/Makefile}

@@ -10,10 +10,10 @@ example.php:  example.ephp
 	erubis -l php example.ephp > example.php
 
 example.c:    example.ec
-	erubis -l c example.ec > example.c
+	erubis -bl c example.ec > example.c
 
 example.java: example.ejava
-	erubis -l java example.ejava > example.java
+	erubis -bl java example.ejava > example.java
 
 example.scm:  example.escheme
 	erubis -l scheme --func=display example.escheme > example.scm
@@ -22,31 +22,31 @@ example.scm:  example.escheme
 example.pl:   example.eperl
 	erubis -l perl example.eperl > example.pl
 
-example.js:   example.ejavascript
-	erubis -l javascript example.ejavascript > example.js
+example.js:   example.ejs
+	erubis -l javascript example.ejs > example.js
 
 
 ###----------
 
-src = example.eruby example.ephp example.ec example.ejava example.escheme example.eperl example.ejavascript Makefile
+src = example.eruby example.ephp example.ec example.ejava example.escheme example.eperl example.ejs Makefile
 
 clean:
 	rm -f `ruby -e 'puts(Dir.glob("*.*") - %w[$(src)])'`
 #	rm -f $(all)
 
-compile:  a.out example.class
+compile:  example.bin example.class
 
-a.out:   example.c
-	cc example.c
+example.bin:   example.c
+	cc -o example.bin example.c
 
 example.class:  example.java
 	jikes example.java
 
-output:  $(all) a.out example.class
+output:  $(all) example.bin example.class
 	erubis example.eruby > example.ruby.out
 	php example.php > example.php.out
-	./a.out foo bar baz > example.c.out
-	java example > example.java.out
+	./example.bin '<aaa>' 'b&b' '"ccc"' > example.c.out
+	java example > example.javexample.bin
 	gosh example.scm > example.scm.out
 #	guile example.scm > example.scm.out
 	perl example.pl > example.pl.out

data/examples/basic/example.ec

@@ -0,0 +1,42 @@
+<%
+#include <stdio.h>
+
+void escape(char *str, FILE *out);
+
+int main(int argc, char *argv[])
+{
+    int i;
+
+%>
+<p>Hello <%== argv[0] %>!</p>
+<table>
+  <tbody>
+    <% for (i = 1; i < argc; i++) { %>
+    <tr bgcolor="<%= i % 2 == 0 ? "#FFCCCC" : "#CCCCFF" %>">
+      <td><%= "%d", i %></td>
+      <td><%== argv[i] %></td>
+    </tr>
+    <% } %>
+  </tbody>
+</table>
+<%
+
+    return 0; 
+}
+
+void escape(char *str, FILE *out)
+{
+    char *pch;
+    for (pch = str; *pch != '\0'; pch++) {
+        switch (*pch) {
+        case '&':   fputs("&amp;",  out);  break;
+        case '>':   fputs("&gt;",   out);  break;
+        case '<':   fputs("&lt;",   out);  break;
+        case '"':   fputs("&quot;", out);  break;
+        case '\'':  fputs("&#039;", out);  break;
+        default:    fputc(*pch, out);
+        }
+    }
+}
+
+%>

data/examples/{example.ejava → basic/example.ejava}

@@ -8,7 +8,7 @@ public class example {
     String[] list = { "<aaa>", "b&b", "\"ccc\"" };
     StringBuffer _buf = new StringBuffer();
 %>
-<p>Hello <%= user %>!</p>
+<p>Hello <%== user %>!</p>
 <table>
   <tbody>
     <% for (int i = 0; i < list.length; i++) { %>
@@ -37,5 +37,9 @@ public class example {
     }
     return sb.toString();
   }
+
+  public static String escape(int i) {
+    return Integer.toString(i);
+  }
 }
 %>

data/examples/{example.eperl → basic/example.eperl}

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

data/examples/pi/Makefile

@@ -0,0 +1,54 @@
+all = example.rb example.php example.c example.java example.scm example.pl example.js
+
+all:  $(all)
+
+example.rb:   example.eruby
+	erubis --pi -l ruby example.eruby > example.rb
+
+
+example.php:  example.ephp
+	erubis --pi -l php example.ephp > example.php
+
+example.c:    example.ec
+	erubis --pi -bl c example.ec > example.c
+
+example.java: example.ejava
+	erubis --pi -bl java example.ejava > example.java
+
+example.scm:  example.escheme
+	erubis --pi -l scheme --func=display example.escheme > example.scm
+#	erubis --pi -l scheme example.escheme > example.scm
+
+example.pl:   example.eperl
+	erubis --pi -l perl example.eperl > example.pl
+
+example.js:   example.ejs
+	erubis --pi -l javascript example.ejs > example.js
+
+
+###----------
+
+src = example.eruby example.ephp example.ec example.ejava example.escheme example.eperl example.ejs Makefile
+
+clean:
+	rm -f `ruby -e 'puts(Dir.glob("*.*") - %w[$(src)])'`
+#	rm -f $(all)
+
+compile:  example.bin example.class
+
+example.bin:   example.c
+	cc -o example.bin example.c
+
+example.class:  example.java
+	jikes example.java
+
+output:  $(all) example.bin example.class
+	erubis --pi example.eruby > example.ruby.result
+	#ruby example.rb > example.ruby.result
+	php example.php > example.php.result
+	./example.bin '<aaa>' 'b&b' '"ccc"' > example.c.result
+	java example > example.java.result
+	gosh example.scm > example.scm.result
+	#guile example.scm > example.scm.result
+	perl example.pl > example.pl.result
+

data/examples/pi/example.ec

@@ -0,0 +1,42 @@
+<?c
+#include <stdio.h>
+
+void escape(char *str, FILE *out);
+
+int main(int argc, char *argv[])
+{
+    int i;
+
+?>
+<p>Hello @!{argv[0]}@!</p>
+<table>
+  <tbody>
+    <?c for (i = 1; i < argc; i++) { ?>
+    <tr bgcolor="@{i % 2 == 0 ? "#FFCCCC" : "#CCCCFF"}@">
+      <td>@!{"%d", i}@</td>
+      <td>@{argv[i]}@</td>
+    </tr>
+    <?c } ?>
+  </tbody>
+</table>
+<?c
+
+    return 0; 
+}
+
+void escape(char *str, FILE *out)
+{
+    char *pch;
+    for (pch = str; *pch != '\0'; pch++) {
+        switch (*pch) {
+        case '&':   fputs("&amp;",  out);  break;
+        case '>':   fputs("&gt;",   out);  break;
+        case '<':   fputs("&lt;",   out);  break;
+        case '"':   fputs("&quot;", out);  break;
+        case '\'':  fputs("&#039;", out);  break;
+        default:    fputc(*pch, out);
+        }
+    }
+}
+
+?>

data/examples/pi/example.ejava

@@ -0,0 +1,45 @@
+<?java
+import java.util.*;
+
+public class example {
+
+  public static void main(String[] args) {
+    String user = "Erubis";
+    String[] list = { "<aaa>", "b&b", "\"ccc\"" };
+    StringBuffer _buf = new StringBuffer();
+?>
+<p>Hello @{user}@!</p>
+<table>
+  <tbody>
+    <?java for (int i = 0; i < list.length; i++) { ?>
+    <tr bgcolor="@{i % 2 == 0 ? "#FFCCCC" : "#CCCCFF"}@">
+      <td>@!{i + 1}@</td>
+      <td>@{list[i]}@</td>
+    </tr>
+    <?java } ?>
+  </tbody>
+</table>
+<?java
+    System.out.print(_buf.toString());
+  }
+
+  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();
+  }
+
+  public static String escape(int i) {
+    return Integer.toString(i);
+  }
+}
+?>

data/examples/pi/example.ejs

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

data/examples/pi/example.eperl

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

data/examples/pi/example.ephp

@@ -0,0 +1,17 @@
+<?php
+   $user = "World";
+   $list = array('<aaa>', 'b&b', '"ccc"');
+?>
+<p>Hello @{$user}@!</p>
+<table>
+  <tbody>
+    <?php $i = 0 ?>
+    <?php foreach ($list as $item) { ?>
+    <?php   $i++; ?>
+    <tr bgcolor="@!{$i % 2 == 0 ? '#FFCCCC' : '#CCCCFF'}@">
+      <td>@!{$i}@</td>
+      <td>@{$item}@</td>
+    </tr>
+    <?php } ?>
+  </tbody>
+</table>

data/examples/pi/example.eruby

@@ -0,0 +1,15 @@
+<?rb
+   user = 'Erubis'
+   list = ['<aaa>', 'b&b', '"ccc"']
+ ?>
+<p>Hello @{user}@!</p>
+<table>
+  <tbody>
+    <?rb list.each_with_index do |item, i| ?>
+    <tr bgcolor="@!{i % 2 == 0 ? '#FFCCCC' : '#CCCCFF'}@">
+      <td>@!{i + 1}@</td>
+      <td>@{item}@</td>
+    </tr>
+    <?rb end ?>
+  </tbody>
+</table>

data/examples/pi/example.escheme

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

data/lib/erubis.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.1 $
+## $Rev: 36 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -24,12 +24,15 @@
 ##    </ul>
 ##   END
 ##   list = ['<aaa>', 'b&b', '"ccc"']
-##   eruby = Erubis::Eruby.new(input)
-##   puts "--- source ---"
-##   puts eruby.src
+##   eruby = Erubis::Eruby.new()
+##   code = eruby.convert(input)
+##   puts "--- code ---"
+##   puts code
 ##   puts "--- result ---"
-##   puts eruby.evaluate(:list=>list)
-##   # or puts eruby.result(binding())
+##   context = Object.new
+##   context.instance_variable_set("@list", list)
+##   puts context.instance_eval(code)
+##   # or @list = list; puts eval(code, binding())
 ##
 ## result:
 ##   --- source ---
@@ -53,6 +56,11 @@
 
 
 require 'erubis/engine'
+#require 'erubis/generator'
+#require 'erubis/converter'
+#require 'erubis/evaluator'
+#require 'erubis/error'
+#require 'erubis/context'
 require 'erubis/helper'
 require 'erubis/enhancer'
 #require 'erubis/tiny'
@@ -66,5 +74,4 @@ require 'erubis/engine/eruby'
 #require 'erubis/engine/eperl'
 #require 'erubis/engine/ejavascript'
 
-
 require 'erubis/local-setting'

data/lib/erubis/context.rb

@@ -0,0 +1,54 @@
+##
+## $Rev: 32 $
+## $Release: 2.1.0 $
+## copyright(c) 2006 kuwata-lab all rights reserved.
+##
+
+
+module Erubis
+
+
+  ##
+  ## context object for Engine#evaluate
+  ##
+  ## ex.
+  ##   template = <<'END'
+  ##   Hello <%= @user %>!
+  ##   <% for item in @list %>
+  ##    - <%= item %>
+  ##   <% end %>
+  ##   END
+  ##
+  ##   context = Erubis::Context.new(:user=>'World', :list=>['a','b','c'])
+  ##   # or
+  ##   # context = Erubis::Context.new
+  ##   # context[:user] = 'World'
+  ##   # context[:list] = ['a', 'b', 'c']
+  ##
+  ##   eruby = Erubis::Eruby.new(template)
+  ##   print eruby.evaluate(context)
+  ##
+  class Context
+
+    def initialize(hash=nil)
+      hash.each do |name, value|
+        self[name] = value
+      end if hash
+    end
+
+    def [](key)
+      return instance_variable_get("@#{key}")
+    end
+
+    def []=(key, value)
+      return instance_variable_set("@#{key}", value)
+    end
+
+    def keys
+      return instance_variables.collect { |name| name[1,name.length-1] }
+    end
+
+  end
+
+
+end