erubis 1.0.1 → 1.1.0

data/ChangeLog

@@ -1,7 +1,15 @@
 # $Rev$
-# $Release: 1.0.1 $
+# $Release: 1.1.0 $
 # copyright(c) 2006 kuwata-lab all rights reserved.
 
+- release:   1.1
+  date:      205-03-05
+  desc:
+    - tag:   enhance
+      text:  '<%# ... %>' is supported
+    - tag:   enhance
+      text:  PrintEnhancer, PrintEruby, and PrintXmlEruby added
+
 - release:   1.0.1
   date:      2005-02-01
   desc:

data/README

@@ -1,5 +1,5 @@
 .=title:	README
-.?release:	$Release: 1.0.1 $
+.?release:	$Release: 1.1.0 $
 .?copyright:	copyright(c) 2006 kuwata-lab all rights reserved.
 
 

data/bin/erubis

@@ -2,7 +2,7 @@
 
 ###
 ### $Rev: 4 $
-### $Release: 1.0.1 $
+### $Release: 1.1.0 $
 ### copyright(c) 2006 kuwata-lab all rights reserved.
 ###
 
@@ -113,7 +113,7 @@ END
   end
 
   def version
-    release = ('$Release: 1.0.1 $' =~ /([.\d]+)/) && $1
+    release = ('$Release: 1.1.0 $' =~ /([.\d]+)/) && $1
     return release
   end
 

data/doc/users-guide.html

@@ -23,14 +23,16 @@
 It has the following features.
 </p>
 <ul type="disc">
-<li>Auto trimming spaces around '&lt;% %&gt;'
+<li>Auto sanitizing support
 </li>
-<li>Auto sanitizing
+<li>Auto trimming spaces around '&lt;% %&gt;'
 </li>
-<li>Change embedded pattern (default '&lt;% %&gt;')
+<li>Embedded pattern changeable (default '&lt;% %&gt;')
 </li>
 <li>Context object available
 </li>
+<li>Print statement available
+</li>
 <li>Easy to expand in subclass
 </li>
 </ul>
@@ -63,6 +65,8 @@ It has the following features.
     </li>
     <li><a href="#tut-stdout">Stdout Eruby</a>
     </li>
+    <li><a href="#tut-print">Print Avairable Eruby</a>
+    </li>
   </ul>
   </li>
   <li><a href="#command">Command Reference</a>
@@ -127,11 +131,12 @@ $ contrib/inline-require -I lib bin/erubis &gt; contrib/erubis
 <div class="program_caption">
 example1.eruby</div>
 <pre class="program">&lt;ul&gt;
-  <strong>&lt;% for item in list %&gt;</strong>
+  <b>&lt;% for item in list %&gt;</b>
   &lt;li&gt;
-    <strong>&lt;%= item %&gt;</strong>
+    <b>&lt;%= item %&gt;</b>
   &lt;/li&gt;
-  <strong>&lt;% end %&gt;</strong>
+  <b>&lt;% end %&gt;</b>
+  <b>&lt;%# here is ignored because starting with '#' %&gt;</b>
 &lt;/ul&gt;
 </pre>
 <a name="example1.rb"></a>
@@ -140,16 +145,16 @@ example1.rb</div>
 <pre class="program">## create Eruby object
 require 'erubis'
 input = File.read('example1.eruby')
-eruby = <strong>Erubis::Eruby.new(input)</strong>
+eruby = <b>Erubis::Eruby.new(input)</b>
 
 ## print script source
 puts "--- script source ---"
-puts <strong>eruby.src</strong>
+puts <b>eruby.src</b>
 
 ## get result
 puts "--- result ---"
 list = ['aaa', 'bbb', 'ccc']
-puts <strong>eruby.result(binding())</strong>
+puts <b>eruby.result(binding())</b>
 </pre>
 <div class="terminal_caption">
 output</div>
@@ -161,6 +166,7 @@ _out &lt;&lt; "  &lt;li&gt;\n"
 _out &lt;&lt; "    "; _out &lt;&lt; ( item ).to_s; _out &lt;&lt; "\n"
 _out &lt;&lt; "  &lt;/li&gt;\n"
    end 
+
 _out &lt;&lt; "&lt;/ul&gt;\n"
 _out
 --- result ---
@@ -201,7 +207,7 @@ example2.rb</div>
 <pre class="program">## create Eruby object
 require 'erubis'
 input = File.read('example2.eruby')
-eruby = Erubis::Eruby.new(input<strong>, :trim=&gt;false</strong>)
+eruby = Erubis::Eruby.new(input<b>, :trim=&gt;false</b>)
 
 ## print script source
 puts "--- script source ---"
@@ -217,11 +223,11 @@ output</div>
 <pre class="terminal">$ ruby example2.rb
 --- script source ---
 _out = ''; _out &lt;&lt; "&lt;ul&gt;\n"
-<strong>_out &lt;&lt; "  ";</strong>  for item in list <strong>; _out &lt;&lt; "\n"</strong>
+<b>_out &lt;&lt; "  ";</b>  for item in list <b>; _out &lt;&lt; "\n"</b>
 _out &lt;&lt; "  &lt;li&gt;\n"
 _out &lt;&lt; "    "; _out &lt;&lt; ( item ).to_s; _out &lt;&lt; "\n"
 _out &lt;&lt; "  &lt;/li&gt;\n"
-<strong>_out &lt;&lt; "  ";</strong>  end <strong>; _out &lt;&lt; "\n"</strong>
+<b>_out &lt;&lt; "  ";</b>  end <b>; _out &lt;&lt; "\n"</b>
 _out &lt;&lt; "&lt;/ul&gt;\n"
 _out
 --- result ---
@@ -251,13 +257,13 @@ _out
 <p>Erubis::XmlEruby acts the following:
 </p>
 <ul type="disc">
-<li><code>&lt;%= <em>expr</em> %&gt;</code> will be sanitized.
+<li><code>&lt;%= <i>expr</i> %&gt;</code> will be sanitized.
 </li>
-<li><code>&lt;%== <em>expr</em> %&gt;</code> will be out as it is.
+<li><code>&lt;%== <i>expr</i> %&gt;</code> will be out as it is.
 </li>
-<li><code>&lt;%=== <em>expr</em> %&gt;</code> will be out to $stderr.
+<li><code>&lt;%=== <i>expr</i> %&gt;</code> will be out to $stderr.
 </li>
-<li><code>&lt;%==== <em>expr</em> %&gt;</code> will be ignored.
+<li><code>&lt;%==== <i>expr</i> %&gt;</code> will be ignored.
 </li>
 </ul>
 <a name="example3.eruby"></a>
@@ -265,9 +271,9 @@ _out
 example3.eruby</div>
 <pre class="program">&lt;ul&gt;
   &lt;% for item in list %&gt;
-  &lt;li&gt;<strong>&lt;%=</strong> item <strong>%&gt;</strong>&lt;/li&gt;
-  &lt;li&gt;<strong>&lt;%==</strong> item <strong>%&gt;</strong>&lt;/li&gt;
-  &lt;li&gt;<strong>&lt;%===</strong> item <strong>%&gt;</strong>&lt;/li&gt;
+  &lt;li&gt;<b>&lt;%=</b> item <b>%&gt;</b>&lt;/li&gt;
+  &lt;li&gt;<b>&lt;%==</b> item <b>%&gt;</b>&lt;/li&gt;
+  &lt;li&gt;<b>&lt;%===</b> item <b>%&gt;</b>&lt;/li&gt;
 
   &lt;% end %&gt;
 &lt;/ul&gt;
@@ -278,7 +284,7 @@ example3.rb</div>
 <pre class="program">## create Eruby object
 require 'erubis'
 input = File.read('example3.eruby')
-eruby = Erubis::<strong>XmlEruby</strong>.new(input)
+eruby = Erubis::<b>XmlEruby</b>.new(input)
 
 ## print script source
 puts "--- script source ---"
@@ -286,7 +292,7 @@ puts eruby.src
 
 ## get result
 puts "--- result ---"
-<strong>list = ['&lt;aaa&gt;', 'b&amp;b', '"ccc"']</strong>
+<b>list = ['&lt;aaa&gt;', 'b&amp;b', '"ccc"']</b>
 puts eruby.result(binding())
 </pre>
 <div class="terminal_caption">
@@ -295,24 +301,24 @@ output</div>
 --- script source ---
 _out = ''; _out &lt;&lt; "&lt;ul&gt;\n"
    for item in list 
-_out &lt;&lt; "  &lt;li&gt;"; <strong>_out &lt;&lt; Erubis::XmlEruby.escape( item )</strong>; _out &lt;&lt; "&lt;/li&gt;\n"
+_out &lt;&lt; "  &lt;li&gt;"; <b>_out &lt;&lt; Erubis::XmlEruby.escape( item )</b>; _out &lt;&lt; "&lt;/li&gt;\n"
 _out &lt;&lt; "  &lt;li&gt;"; _out &lt;&lt; ( item ).to_s; _out &lt;&lt; "&lt;/li&gt;\n"
-_out &lt;&lt; "  &lt;li&gt;"; <strong>$stderr.puts("** erubis: item = #{(item).inspect}")</strong>; _out &lt;&lt; "&lt;/li&gt;\n"
+_out &lt;&lt; "  &lt;li&gt;"; <b>$stderr.puts("** erubis: item = #{(item).inspect}")</b>; _out &lt;&lt; "&lt;/li&gt;\n"
 _out &lt;&lt; "\n"
    end 
 _out &lt;&lt; "&lt;/ul&gt;\n"
 _out
 --- result ---
 &lt;ul&gt;
-  &lt;li&gt;<strong>&amp;lt;aaa&amp;gt;</strong>&lt;/li&gt;
+  &lt;li&gt;<b>&amp;lt;aaa&amp;gt;</b>&lt;/li&gt;
   &lt;li&gt;&lt;aaa&gt;&lt;/li&gt;
   &lt;li&gt;&lt;/li&gt;
 
-  &lt;li&gt;<strong>b&amp;amp;b</strong>&lt;/li&gt;
+  &lt;li&gt;<b>b&amp;amp;b</b>&lt;/li&gt;
   &lt;li&gt;b&amp;b&lt;/li&gt;
   &lt;li&gt;&lt;/li&gt;
 
-  &lt;li&gt;<strong>&amp;quot;ccc&amp;quot;</strong>&lt;/li&gt;
+  &lt;li&gt;<b>&amp;quot;ccc&amp;quot;</b>&lt;/li&gt;
   &lt;li&gt;"ccc"&lt;/li&gt;
   &lt;li&gt;&lt;/li&gt;
 
@@ -333,9 +339,9 @@ $ cat stderr.log
 <div class="program_caption">
 example4.eruby</div>
 <pre class="program">&lt;ul&gt;
- <strong>&lt;!--%</strong> for item in list <strong>%--&gt;</strong>
-  &lt;li&gt;<strong>&lt;!--%=</strong> item <strong>%--&gt;</strong>&lt;/li&gt;
- <strong>&lt;!--%</strong> end <strong>%--&gt;</strong>
+ <b>&lt;!--%</b> for item in list <b>%--&gt;</b>
+  &lt;li&gt;<b>&lt;!--%=</b> item <b>%--&gt;</b>&lt;/li&gt;
+ <b>&lt;!--%</b> end <b>%--&gt;</b>
 &lt;/ul&gt;
 </pre>
 <a name="example4.rb"></a>
@@ -344,7 +350,7 @@ example4.rb</div>
 <pre class="program">## create Eruby object
 require 'erubis'
 input = File.read('example4.eruby')
-eruby = Erubis::Eruby.new(input<strong>, :pattern=&gt;'&lt;!--% %--&gt;'</strong>)
+eruby = Erubis::Eruby.new(input<b>, :pattern=&gt;'&lt;!--% %--&gt;'</b>)
                                       # or '&lt;(?:!--)?% %(?:--)?&gt;'
 
 ## print script source
@@ -375,7 +381,7 @@ _out
 </pre>
 <p>It is able to specify regular expression with :pattern option.
 Notice that you must use '<code>(?: )</code>' instead of '<code>( )</code>' for grouping.
-For example, '<code>&lt;(!--)?% %(--)?&gt;</code>' will not work and '<code>&lt;(?:!--)?% %(?:--)?&gt;</code>' will work.
+For example, '<code>&lt;(!--)?% %(--)?&gt;</code>' will not work while '<code>&lt;(?:!--)?% %(?:--)?&gt;</code>' will work.
 </p>
 <br>
 
@@ -408,13 +414,13 @@ eruby = Erubis::Eruby.new(input)
 
 ## create context object
 ## (key means var name, which may be string or symbol.)
-<strong>context = {}</strong>
-<strong>context[:val]   = 'Erubis Example'</strong>
-<strong>context['list'] = ['aaa', 'bbb', 'ccc']</strong>
+<b>context = {}</b>
+<b>context[:val]   = 'Erubis Example'</b>
+<b>context['list'] = ['aaa', 'bbb', 'ccc']</b>
 
 ## get result
 puts "--- result ---"
-puts <strong>eruby.evaluate(context)</strong>
+puts <b>eruby.evaluate(context)</b>
 </pre>
 <div class="terminal_caption">
 output</div>
@@ -462,11 +468,11 @@ input = File.read('example6.eruby')
 eruby = Erubis::Eruby.new(input)
 
 ## load YAML document as context object
-<strong>require 'yaml'</strong>
-<strong>context = YAML.load_file('example6.yaml')</strong>
+<b>require 'yaml'</b>
+<b>context = YAML.load_file('example6.yaml')</b>
 
 ## get result
-puts <strong>eruby.evaluate(context)</strong>
+puts <b>eruby.evaluate(context)</b>
 </pre>
 <div class="terminal_caption">
 output</div>
@@ -516,7 +522,7 @@ puts "--- script source (Eruby) ---"
 puts eruby.src
 
 ## print script source with FastEruby
-eruby = Erubis::<strong>FastEruby</strong>.new(input)
+eruby = Erubis::<b>FastEruby</b>.new(input)
 puts "--- script source (FastEruby) ---"
 puts eruby.src
 </pre>
@@ -546,6 +552,21 @@ _out &lt;&lt; "  &lt;/tbody&gt;\n&lt;/table&gt;\n"
 
 _out
 </pre>
+<p>Here is the definition of FastEruby or FastXmlEruby.
+They are subclass of Eruby and XmlEruby respectively and only include FastEnhancer module.
+It shows that Erubis is extensible.
+</p>
+<div class="program_caption">
+definition of FastEruby and FastXmlEruby</div>
+<pre class="program">module Erubis
+  class FastEruby &lt; Eruby
+    <b>include FastEnhancer</b>
+  end
+  class FastXmlEruby &lt; XmlEruby
+    <b>include FastEnhancer</b>
+  end
+end
+</pre>
 <br>
 
 
@@ -559,7 +580,7 @@ Therefore, you can use 'print' statement in embedded ruby code.
 example8.eruby</div>
 <pre class="program">&lt;ul&gt;
  &lt;% for item in list %&gt;
-  &lt;li&gt;<strong>&lt;% print item %&gt;</strong>&lt;/li&gt;
+  &lt;li&gt;<b>&lt;% print item %&gt;</b>&lt;/li&gt;
  &lt;% end %&gt;
 &lt;/ul&gt;
 </pre>
@@ -569,7 +590,7 @@ example8.rb</div>
 <pre class="program">## create Eruby object
 require 'erubis'
 input = File.read('example8.eruby')
-eruby = Erubis::<strong>StdoutEruby</strong>.new(input)
+eruby = Erubis::<b>StdoutEruby</b>.new(input)
 
 ## print script source
 puts "--- script source ---"
@@ -579,18 +600,18 @@ puts eruby.src
 puts "--- result ---"
 list = ['aaa', 'bbb', 'ccc']
 #puts eruby.result(binding())
-<strong>eruby.result(binding())</strong>  # returns nil
+<b>eruby.result(binding())</b>  # returns nil
 </pre>
 <div class="terminal_caption">
 output</div>
 <pre class="terminal">$ ruby example8.rb
 --- script source ---
-<strong>_out = $stdout</strong>; _out &lt;&lt; "&lt;ul&gt;\n"
+<b>_out = $stdout</b>; _out &lt;&lt; "&lt;ul&gt;\n"
   for item in list 
-_out &lt;&lt; "  &lt;li&gt;";  <strong>print item</strong> ; _out &lt;&lt; "&lt;/li&gt;\n"
+_out &lt;&lt; "  &lt;li&gt;";  <b>print item</b> ; _out &lt;&lt; "&lt;/li&gt;\n"
   end 
 _out &lt;&lt; "&lt;/ul&gt;\n"
-nil
+<b>nil</b>
 --- result ---
 &lt;ul&gt;
   &lt;li&gt;aaa&lt;/li&gt;
@@ -598,6 +619,101 @@ nil
   &lt;li&gt;ccc&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
+<p>Here is the definition of StdoutEruby or StdoutXmlEruby.
+They are subclass of Eruby and XmlEruby respectively and only include StdoutEnhancer module.
+It shows that Erubis is extensible.
+</p>
+<div class="program_caption">
+definition of StdoutEruby and StdoutXmlEruby</div>
+<pre class="program">module Erubis
+  class StdoutEruby &lt; Eruby
+    <b>include StdoutEnhancer</b>
+  end
+  class StdoutXmlEruby &lt; XmlEruby
+    <b>include StdoutEnhancer</b>
+  end
+end
+</pre>
+<br>
+
+
+<a name="tut-print"></a>
+<h3 class="section2">Print Avairable Eruby</h3>
+<p>Erubis::PrintEruby and Erubis::PrintXmlEruby enables you to use print statement.
+You can get output as String because Erubis::PrintEruby and Erubis::PrintXmlEruby doesn't use $stdout.
+</p>
+<p>Notice:
+</p>
+ <ul type="disc">
+ <li>Use evaluate() and don't use result().
+ </li>
+ <li>Only print() is available, put() or p() are not available.
+ </li>
+ <li>PrintEruby and PrintXmlEruby has instance method 'print()'.
+    It means that print statement invokes PrintEruby#print() or PrintXmlEruby#print(),
+    and Kernel#print() is not invoked.
+ </li>
+ <li>PrintEruby#print() and PrintXmlEruby#print() can take just an argument.
+ </li>
+ </ul>
+<a name="example9.eruby"></a>
+<div class="program_caption">
+example9.eruby</div>
+<pre class="program">&lt;ul&gt;
+ &lt;% for item in list %&gt;
+  &lt;li&gt;<b>&lt;% print item %&gt;</b>&lt;/li&gt;
+ &lt;% end %&gt;
+&lt;/ul&gt;
+</pre>
+<a name="example9.rb"></a>
+<div class="program_caption">
+example9.rb</div>
+<pre class="program">## create Eruby object
+require 'erubis'
+input = File.read('example9.eruby')
+eruby = Erubis::<b>PrintEruby</b>.new(input)
+
+## print script source
+puts "--- script source ---"
+puts eruby.src
+
+## get result
+puts "--- result ---"
+list = ['aaa', 'bbb', 'ccc']
+puts <b>eruby.evaluate(:list =&gt; list)</b>   # don't use result()!
+</pre>
+<div class="terminal_caption">
+output</div>
+<pre class="terminal">$ ruby example9.rb
+--- script source ---
+<b>@_out =</b> _out = ''; _out &lt;&lt; "&lt;ul&gt;\n"
+  for item in list 
+_out &lt;&lt; "  &lt;li&gt;";  <b>print item</b> ; _out &lt;&lt; "&lt;/li&gt;\n"
+  end 
+_out &lt;&lt; "&lt;/ul&gt;\n"
+_out
+--- result ---
+&lt;ul&gt;
+  &lt;li&gt;aaa&lt;/li&gt;
+  &lt;li&gt;bbb&lt;/li&gt;
+  &lt;li&gt;ccc&lt;/li&gt;
+&lt;/ul&gt;
+</pre>
+<p>Here is the definition of PrintEruby or PrintXmlEruby.
+They are subclass of Eruby and XmlEruby respectively and only include PrintEnhancer module.
+It shows that Erubis is extensible.
+</p>
+<div class="program_caption">
+definition of PrintEruby and PrintXmlEruby</div>
+<pre class="program">module Erubis
+  class PrintEruby &lt; Eruby
+    <b>include PrintEnhancer</b>
+  end
+  class PrintXmlEruby &lt; XmlEruby
+    <b>include PrintEnhancer</b>
+  end
+end
+</pre>
 <br>
 
 
@@ -608,7 +724,7 @@ nil
 <h2 class="section1">Command Reference</h2>
 <a name="command-usage"></a>
 <h3 class="section2">Usage</h3>
-<p>erubis [-hvsT] [-p <em>pattern</em>] [-c <em>class</em>] [-K <em>kanji</em>] [-f <em>file.yaml</em>] [<em>file</em> ...]
+<p>erubis [-hvsT] [-p <i>pattern</i>] [-c <i>class</i>] [-K <i>kanji</i>] [-f <i>file.yaml</i>] [<i>file</i> ...]
 </p>
 <br>
 

data/lib/erubis.rb

@@ -1,12 +1,18 @@
 ##
-## $Rev: 4 $
-## $Release: 1.0.1 $
+## $Rev: 5 $
+## $Release: 1.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
 ##
 ## an implementation of eRuby
 ##
+## * class Eruby - normal eRuby class
+## * class XmlEruby - eRuby class which escape '&<>"' into '&amp;&lt;&gt;&quot;'
+## * module FastEnhancer - make eRuby faster
+## * module StdoutEnhance - use $stdout instead of String as output
+## * module PrintEnhance - enable to write print statement in <% ... %>
+##
 ## example:
 ##   list = ['<aaa>', 'b&b', '"ccc"']
 ##   input = <<-END
@@ -22,6 +28,7 @@
 ##   puts eruby.src
 ##   puts "--- result ---"
 ##   puts eruby.result(binding())
+##   # or puts eruby.evaluate(:list=>list)
 ##
 ## result:
 ##   --- source ---
@@ -88,19 +95,27 @@ module Erubis
       src = ""
       initialize_src(src)
       prefix, postfix = @pattern.split()
-      regexp = /(.*?)(^[ \t]*)?#{prefix}(=*)(.*?)#{postfix}([ \t]*\r?\n)?/m
+      regexp = /(.*?)(^[ \t]*)?#{prefix}(=+|\#)?(.*?)#{postfix}([ \t]*\r?\n)?/m
       input.scan(regexp) do |text, head_space, indicator, code, tail_space|
         ## * when '<%= %>', do nothing
-        ## * when '<% %>', delete spaces iff only spaces are around '<% %>'
-        flag_trim = @trim && indicator.empty? && head_space && tail_space
+        ## * when '<% %>' or '<%# %>', delete spaces iff only spaces are around '<% %>'
+        if indicator && indicator[0] == ?=
+          flag_trim = false
+        else
+          flag_trim = @trim && head_space && tail_space
+        end
+        #flag_trim = @trim && !(indicator && indicator[0]==?=) && head_space && tail_space
         add_src_text(src, text)
         add_src_text(src, head_space) if !flag_trim && head_space
-        if indicator.empty?   # <% %>
+        if !indicator             # <% %>
           code = "#{head_space}#{code}#{tail_space}" if flag_trim
-          #code = "#{head_space}#{code}#\n" if flag_trim
           add_src_code(src, code)
-        else                  # <%=  %>
+        elsif indicator[0] == ?=  # <%= %>
           add_src_expr(src, code, indicator)
+        else                      # <%# %>
+          n = code.count("\n")
+          n += tail_space.count("\n") if tail_space
+          add_src_code(src, "\n" * n)
         end
         add_src_text(src, tail_space) if !flag_trim && tail_space
       end
@@ -208,6 +223,30 @@ module Erubis
   end
 
 
+  ##
+  ## print function is available.
+  ## 
+  ## Notice: use Eruby#evaluate() and don't use Eruby#result()
+  ## to be enable print function.
+  ##
+  module PrintEnhancer
+
+    def initialize_src(src)
+      src << "@_out = _out = ''; "
+    end
+
+    def print(arg)
+      @_out << arg.to_s
+    end
+
+    def result(binding=TOPLEVEL_BINDING)
+      filename = @filename || '(erubis)'
+      eval @src, binding, filename
+    end
+
+  end
+
+
   class FastEruby < Eruby
     include FastEnhancer
   end
@@ -218,6 +257,11 @@ module Erubis
   end
 
 
+  class PrintEruby < Eruby
+    include PrintEnhancer
+  end
+
+
   class FastXmlEruby < XmlEruby
     include FastEnhancer
   end
@@ -228,6 +272,11 @@ module Erubis
   end
 
 
+  class PrintXmlEruby < XmlEruby
+    include PrintEnhancer
+  end
+
+
 end
 
 
@@ -247,6 +296,7 @@ END
   puts "--- source ---"
   puts eruby.src
   puts "--- result ---"
-  puts eruby.result(binding())
+  #puts eruby.result(binding())
+  puts eruby.evaluate(:list=>list)
 
 end

data/test/test-bin.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 3 $
-## $Release: 1.0.1 $
+## $Release: 1.1.0 $
 ## $Date: 2006-01-31 12:54:23 +0900 (Tue, 31 Jan 2006) $
 ##
 
@@ -20,7 +20,7 @@ end
 
 require 'test/unit'
 #require 'test/unit/ui/console/testrunner'
-require 'assert-diff'
+require 'assert-text-equal'
 require 'yaml'
 require 'tempfile'
 
@@ -69,13 +69,13 @@ END
     ensure
       File.unlink(@filename) if @filename && test(?f, @filename)
     end
-    assert_equal_with_diff(@expected, output)
+    assert_text_equal(@expected, output)
   end
 
 
   def test_version
     @options = '-v'
-    @expected = (("$Release: 1.0.1 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 1.1.0 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end

data/test/test-erubis.rb

@@ -1,7 +1,7 @@
 ##
-## $Rev: 3 $
-## $Release: 1.0.1 $
-## $Date: 2006-01-31 12:54:23 +0900 (Tue, 31 Jan 2006) $
+## $Rev: 5 $
+## $Release: 1.1.0 $
+## $Date: 2006-03-04 22:21:26 +0900 (Sat, 04 Mar 2006) $
 ##
 
 testdir = File.dirname(__FILE__)
@@ -11,7 +11,7 @@ $: << libdir
 
 require 'test/unit'
 #require 'test/unit/ui/console/testrunner'
-require 'assert-diff'
+require 'assert-text-equal'
 require 'yaml'
 require 'stringio'
 
@@ -22,7 +22,7 @@ class ErubisTest < Test::Unit::TestCase
   #str = DATA.read()
   str = File.read(__FILE__)
   str.gsub!(/.*^__END__$/m, '')
-  
+
   @@ydocs = {}
   YAML.load_documents(str) do |ydoc|
     name = ydoc['name']
@@ -47,12 +47,12 @@ class ErubisTest < Test::Unit::TestCase
   def _test()
     ydoc = @@ydocs[@name]
     input   = ydoc['input']
-    src     = ydoc['src'].gsub(/@/, ' ')
-    output  = ydoc['output'].gsub(/@/, ' ')
+    src     = ydoc['src'].gsub(/\^/, ' ')
+    output  = ydoc['output'].gsub(/\^/, ' ')
     klass   = ydoc['class'] ? (eval "Erubis::#{ydoc['class']}") : Erubis::Eruby
     options = ydoc['options'] || {}
     testopt = ydoc['testopt']
-    
+
     if testopt != 'load_file'
       eruby = klass.new(input, options)
     else
@@ -64,16 +64,16 @@ class ErubisTest < Test::Unit::TestCase
         File.unlink(filename) if test(?f, filename)
       end
     end
-    assert_equal_with_diff(src, eruby.src)
-    
+    assert_text_equal(src, eruby.src)
+
     return if testopt == 'skip_output'
-    
+
     context = {}
     context[:list] = ['<aaa>', 'b&b', '"ccc"']
-    
+
     if testopt != 'stdout'
       actual = eruby.evaluate(context)
-      assert_equal_with_diff(output, actual)
+      assert_text_equal(output, actual)
     else
       begin
         orig = $stdout
@@ -83,7 +83,7 @@ class ErubisTest < Test::Unit::TestCase
         $stdout = orig if orig
       end
       assert_nil(actual)
-      assert_equal_with_diff(output, stringio.string)
+      assert_text_equal(output, stringio.string)
     end
   end
 
@@ -128,7 +128,7 @@ src: |
       i = 0
         for item in list
           i += 1
-    @@
+    ^^
     _out << "  <li>"; _out << ( item ).to_s; _out << "</li>\n"
       end 
     _out << "</ul>\n"
@@ -224,13 +224,45 @@ src: |
     _out
 output: |
     <ul>
-    @
+    ^
       <li><aaa></li>
-    @
+    ^
       <li>b&b</li>
-    @
+    ^
       <li>"ccc"</li>
-    @
+    ^
+    </ul>
+##
+---
+name:  ignore1
+input: |
+    <ul>
+     <%# i = 0 %>
+     <% for item in list %>
+      <%#
+         i += 1
+         color = i % 2 == 0 ? '#FFCCCC' : '#CCCCFF'
+       %>
+      <li>  <%#= i %>  :  <%= item %>  </li>
+     <% end %>
+    </ul>
+src: |
+    _out = ''; _out << "<ul>\n"
+    
+      for item in list 
+    
+    
+    
+    
+    _out << "  <li>  "; ; _out << "  :  "; _out << ( item ).to_s; _out << "  </li>\n"
+      end 
+    _out << "</ul>\n"
+    _out
+output: |
+    <ul>
+      <li>    :  <aaa>  </li>
+      <li>    :  b&b  </li>
+      <li>    :  "ccc"  </li>
     </ul>
 ##
 ---
@@ -301,7 +333,7 @@ src: |
     _out << "  <tr>\n    <td>"
     _out << ( item ).to_s; _out << "</td>\n    <td>"
     _out << ( item ).to_s; _out << "</td>\n  </tr>\n"
-    
+
       end 
     _out << "</table>\n<ul>"
      for item in list ; _out << "<li>"; _out << ( item ).to_s; _out << "</li>";  end ; _out << "</ul>\n"
@@ -342,7 +374,7 @@ src: |
     _out << "  <tr>\n    <td>"
     _out << Erubis::XmlEruby.escape( item ); _out << "</td>\n    <td>"
     _out << ( item ).to_s; _out << "</td>\n  </tr>\n"
-    
+
       end 
     _out << "</table>\n<ul>"
      for item in list ; _out << "<li>"; _out << Erubis::XmlEruby.escape( item ); _out << "</li>";  end ; _out << "</ul>\n"
@@ -380,9 +412,9 @@ src: |
      end 
     _out
 #    _out = ''; _out << "user = "; _out << ( "Foo" ).to_s; _out << "\n"
-#    _out << "";  for item in list 
+#    _out << "";  for item in list
 #    _out << ""; _out << "  "; _out << ( item ).to_s; _out << "\n"
-#    _out << "";  end 
+#    _out << "";  end
 #    _out << ""; _out
 output: |
     user = Foo
@@ -414,6 +446,50 @@ output: |
       <li>"ccc"</li>
     </ul>
 ---
+name:  print1
+class: PrintEruby
+input: |
+    <ul>
+     <% for item in list %>
+      <li><% print item %></li>
+     <% end %>
+    </ul>
+src: |
+    @_out = _out = ''; _out << "<ul>\n"
+      for item in list 
+    _out << "  <li>";  print item ; _out << "</li>\n"
+      end 
+    _out << "</ul>\n"
+    _out
+output: |
+    <ul>
+      <li><aaa></li>
+      <li>b&b</li>
+      <li>"ccc"</li>
+    </ul>
+---
+name:  print2
+class: PrintXmlEruby
+input: |
+    <ul>
+     <% for item in list %>
+      <li><% print item %></li>
+     <% end %>
+    </ul>
+src: |
+    @_out = _out = ''; _out << "<ul>\n"
+      for item in list 
+    _out << "  <li>";  print item ; _out << "</li>\n"
+      end 
+    _out << "</ul>\n"
+    _out
+output: |
+    <ul>
+      <li><aaa></li>
+      <li>b&b</li>
+      <li>"ccc"</li>
+    </ul>
+---
 name:  loadfile1
 testopt: load_file
 #input: |
@@ -422,13 +498,13 @@ testopt: load_file
 #      <li><%= item %></li>
 #     <% end %>
 #    </ul>
-input: 
+input:
     "<ul>\r\n <% for item in list %>\r\n  <li><%= item %></li>\r\n <% end %>\r\n</ul>\r\n"
 #src: |
 #    _out = ''; _out << "<ul>\n"
-#      for item in list 
+#      for item in list
 #    _out << "  <li>"; _out << ( item ).to_s; _out << "</li>\n"
-#      end 
+#      end
 #    _out << "</ul>\n"
 #    _out
 src:
@@ -439,7 +515,7 @@ src:
 #      <li>b&b</li>
 #      <li>"ccc"</li>
 #    </ul>
-output: 
+output:
     "<ul>\r\n  <li><aaa></li>\r\n  <li>b&b</li>\r\n  <li>\"ccc\"</li>\r\n</ul>\r\n"
 ##
 ---

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: erubis
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2006-02-01
+  version: 1.1.0
+date: 2006-03-05 00:00:00 +09:00
 summary: an implementation of eRuby
 require_paths: 
 - lib
@@ -23,13 +23,15 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
       version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
 - kwatch
 files: 
 - lib/erubis.rb
 - bin/erubis
-- test/test-erubis.rb
 - test/test-bin.rb
+- test/test-erubis.rb
 - doc/users-guide.html
 - doc/docstyle.css
 - README