erubis 2.0.1 → 2.1.0

data/lib/erubis/tiny.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.1 $
+## $Rev: 35 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -17,16 +17,21 @@ module Erubis
   ##
   class TinyEruby
 
-    def initialize(input)
-      @src = compile(input)
+    def initialize(input=nil)
+      @src = convert(input) if input
     end
     attr_reader :src
 
-    EMBEDDED_PATTERN = /(.*?)<%(=+|\#)?(.*?)-?%>/m
+    EMBEDDED_PATTERN = /<%(=+|\#)?(.*?)-?%>/m
 
-    def compile(input)
+    def convert(input)
       src = "_buf = [];"           # preamble
-      input.scan(EMBEDDED_PATTERN) do |text, indicator, code|
+      pos = 0
+      input.scan(EMBEDDED_PATTERN) do |indicator, code|
+        match = Regexp.last_match
+        index = match.begin(0)
+        text  = input[pos, index - pos]
+        pos   = match.end(0)
         src << " _buf << '" << escape_text(text) << "';"
         if !indicator              # <% %>
           src << code << ";"
@@ -62,4 +67,73 @@ module Erubis
 
   end
 
+
+
+  module PI
+  end
+
+  class PI::TinyEruby
+
+    def initialize(input=nil, options={})
+      @escape  = options[:escape] || 'Erubis::XmlHelper.escape_xml'
+      @src = convert(input) if input
+    end
+
+    attr_reader :src
+
+    EMBEDDED_PATTERN = /(^[ \t]*)?<\?rb(\s.*?)\?>([ \t]*\r?\n)?|\$(!*)?\{(.*?)\}/
+
+    def convert(input)
+      src = "_buf = [];"           # preamble
+      pos = 0
+      input.scan(EMBEDDED_PATTERN) do |lspace, stmtcode, rspace, indicator, exprcode|
+        match = Regexp.last_match
+        index = match.begin(0)
+        text  = input[pos, index - pos]
+        pos   = match.end(0)
+        if stmtcode                # <?rb ... ?>
+          code = stmtcode
+          src << " _buf << '" << escape_text(text) << "';"
+          if lspace && rspace
+            src << "#{lspace}#{code}#{rspace}"
+          else
+            src << " _buf << '#{lspace}';" if lspace
+            src << code << ";"
+            src << " _buf << '#{rspace}';" if rspace
+          end
+        else                       # ${...}, $!{...}
+          code = exprcode
+          if indicator.nil? || indicator.empty?
+            src << " _buf << #{@escape}(" << code << ");"
+          elsif indicator == '!'
+            src << " _buf << (" << code << ").to_s;"
+          end
+        end
+      end
+      rest = $' || input
+      src << " _buf << '" << escape_text(rest) << "';"
+      src << "\n_buf.join\n"       # postamble
+      return src
+    end
+
+    def escape_text(text)
+      return text.gsub!(/['\\]/, '\\\\\&') || text
+    end
+
+    def result(binding=TOPLEVEL_BINDING)
+      eval @src, binding
+    end
+
+    def evaluate(context=Object.new)
+      if context.is_a?(Hash)
+        obj = Object.new
+        context.each do |k, v| obj.instance_variable_set("@#{k}", v) end
+        context = obj
+      end
+      context.instance_eval @src
+    end
+
+  end
+
+
 end

data/test/assert-text-equal.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 6 $
-### $Release: 2.0.1 $
+### $Release: 2.1.0 $
 ### copyright(c) 2006 kuwata-lab all rights reserved.
 ###
 

data/test/test-engines.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.1 $
+## $Rev: 40 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -17,10 +17,9 @@ require 'erubis/engine/ejavascript'
 
 
 class EnginesTest < Test::Unit::TestCase
-  extend TestEnhancer
 
   #load_yaml_documents(__FILE__)
-  testdata_list = load_yaml_document(__FILE__)
+  testdata_list = load_yaml_datafile(__FILE__)
   define_testmethods(testdata_list)
 
   def _test()
@@ -76,7 +75,7 @@ __END__
       <%
           $i = 0;
           foreach ($list as $item) {
-  	    $i++;
+            $i++;
        %>
         <tr>
          <td><%= $i %></td>
@@ -117,7 +116,7 @@ __END__
       <%  for (i = 0; i < list; i++) { %>
         <tr>
          <td><%= "%d", i %></td>
-         <td><%== "%s", list[i] %></td>
+         <td><%== list[i] %></td>
         </tr>
       <%  } %>
        </tbody>
@@ -130,7 +129,7 @@ __END__
         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"
+              "   <td>", stdout); escape(list[i], stdout); fputs("</td>\n"
               "  </tr>\n", stdout);
         } 
         fputs(" </tbody>\n"
@@ -280,7 +279,7 @@ __END__
       </table>
       <%=== $i %>
   expected: |4
-      
+      use HTML::Entities; 
          my $user = 'Erubis';
          my @list = ('<aaa>', 'b&b', '"ccc"');
       
@@ -291,7 +290,7 @@ __END__
            for $item (@list) { 
       print('    <tr bgcolor='); print(++$i % 2 == 0 ? '#FFCCCC' : '#CCCCFF'); print('">
             <td>'); print($i); print('</td>
-            <td>'); print(escape($item)); print('</td>
+            <td>'); print(encode_entities($item)); print('</td>
           </tr>
       ');      } 
       print('  </tbody>

data/test/test-erubis.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 21 $
-## $Release: 2.0.1 $
+## $Rev: 37 $
+## $Release: 2.1.0 $
 ## copyright(c) 2006 kuwata-lab all rights reserved.
 ##
 
@@ -15,16 +15,21 @@ require 'erubis/tiny'
 
 
 class ErubisTest < Test::Unit::TestCase
-  extend TestEnhancer
 
-  testdata_list = load_yaml_document(__FILE__)
+  testdata_list = load_yaml_datafile(__FILE__)
   define_testmethods(testdata_list)
 
 
   def _test()
     @src.gsub!(/\^/, ' ')
     @output.gsub!(/\^/, ' ') if @output.is_a?(String)
-    @klass = @class ? Erubis.const_get(@class) : Erubis::Eruby
+    if @class
+      k = Erubis
+      @class.split('::').each do |name| k = k.const_get(name) end
+      @klass = k
+    else
+      @klass = Erubis::Eruby
+    end
     @options ||= {}
     @chomp.each do |target|
       case target
@@ -53,14 +58,14 @@ class ErubisTest < Test::Unit::TestCase
     end
     assert_text_equal(@src, eruby.src)
 
-    return if @testopt == 'skip_bufput'
+    return if @testopt == 'skip_output'
 
     list = ['<aaa>', 'b&b', '"ccc"']
     context = @testopt == 'context' ? Erubis::Context.new : {}
     context[:list] = list
 
     case @testopt
-    when/\Aeval\(/
+    when /\Aeval\(/
       eval eruby.src
       actual = eval @testopt
       assert_text_equal(@output, actual)
@@ -109,12 +114,13 @@ __END__
        _buf << '</ul>
       ';
       _buf.join
-  output: &basic1_bufput|
+  output: &basic1_output|
       <ul>
         <li><aaa></li>
         <li>b&b</li>
         <li>"ccc"</li>
       </ul>
+
 ##
 - name:  basic2
   input: |
@@ -137,12 +143,13 @@ __END__
        _buf << '</ul>
       ';
       _buf.join
-  output: *basic1_bufput
+  output: *basic1_output
 #      <ul>
 #        <li><aaa></li>
 #        <li>b&b</li>
 #        <li>"ccc"</li>
 #      </ul>
+
 ##
 - name:  basic3
   input: |
@@ -160,6 +167,7 @@ __END__
   output: |
       <ul><li><aaa></li><li>b&b</li><li>"ccc"</li>
       </ul>
+
 ##
 - name:  context1
   testopt:  context
@@ -177,7 +185,8 @@ __END__
        _buf << '</ul>
       ';
       _buf.join
-  output: *basic1_bufput
+  output: *basic1_output
+
 ##
 - name:  ignore1
   input: |
@@ -210,6 +219,7 @@ __END__
         <li>    :  b&b  </li>
         <li>    :  "ccc"  </li>
       </ul>
+
 ##
 - name:  quotation1
   desc:  single quotation and backslash
@@ -225,6 +235,7 @@ __END__
       ';
       _buf.join
   output: *quotation1_input
+
 ##
 - name:  pattern1
   options:
@@ -243,12 +254,13 @@ __END__
        _buf << '</ul>
       ';
       _buf.join
-  output: *basic1_bufput
+  output: *basic1_output
 #      <ul>
 #        <li><aaa></li>
 #        <li>b&b</li>
 #        <li>"ccc"</li>
 #      </ul>
+
 ##
 - name:  pattern2
   options:
@@ -267,12 +279,13 @@ __END__
        _buf << '</ul>
       ';
       _buf.join
-  output: *basic1_bufput
+  output: *basic1_output
 #      <ul>
 #        <li><aaa></li>
 #        <li>b&b</li>
 #        <li>"ccc"</li>
 #      </ul>
+
 ##
 - name:  trim1
   options:
@@ -301,9 +314,10 @@ __END__
         <li>"ccc"</li>
       ^
       </ul>
+
 ##
 - name:  bodyonly1
-  testopt:  skip_bufput
+  testopt:  skip_output
   options: { :preamble: no, :postamble: no }
   input: *basic1_input
   src: |4
@@ -315,6 +329,7 @@ __END__
       ';
   chomp:  [src]
   expected: null  
+
 ##
 - name:  loadfile1
   testopt: load_file
@@ -344,6 +359,7 @@ __END__
   output:
       "<ul>\n  <li><aaa></li>\n  <li>b&b</li>\n  <li>\"ccc\"</li>\n</ul>\n"
   #    "<ul>\r\n  <li><aaa></li>\r\n  <li>b&b</li>\r\n  <li>\"ccc\"</li>\r\n</ul>\r\n"
+
 ##
 - name:  nomatch1
   desc:  bug
@@ -358,6 +374,24 @@ __END__
       ';
       _buf.join
   output: *nomatch1
+
+##
+- name:  escape1
+  options: { :escape: true }
+  input: |
+      <% str = '<>&"' %>
+      <%= str %>
+      <%== str %>
+  src: |
+      _buf = []; str = '<>&"' 
+       _buf << Erubis::XmlHelper.escape_xml( str ); _buf << '
+      '; _buf << ( str ).to_s; _buf << '
+      ';
+      _buf.join
+  output: |
+      &lt;&gt;&amp;&quot;
+      <>&"
+
 ##
 - name:  xml1
   class: XmlEruby
@@ -386,10 +420,11 @@ __END__
         &quot;ccc&quot;
         "ccc"
       </pre>
+
 ##
 - name:  xml2
   class: XmlEruby
-  testopt:  skip_bufput
+  testopt:  skip_output
   input: |
       <% for item in list %>
         <%= item["var#{n}"] %>
@@ -406,6 +441,7 @@ __END__
       '; end 
       _buf.join
   output: |
+
 ##
 - name:  printout1
   class: PrintOutEruby
@@ -418,7 +454,8 @@ __END__
       ';  end 
        print '</ul>
       ';
-  output: *basic1_bufput
+  output: *basic1_output
+
 ##
 - name:  printenabled1
   class: PrintEnabledEruby
@@ -436,12 +473,13 @@ __END__
        _buf << '</ul>
       ';
       _buf.join
-  output: *basic1_bufput
+  output: *basic1_output
 #      <ul>
 #        <li><aaa></li>
 #        <li>b&b</li>
 #        <li>"ccc"</li>
 #      </ul>
+
 ##
 - name:  stdout1
   class: StdoutEruby
@@ -460,12 +498,13 @@ __END__
        _buf << '</ul>
       ';
       ''
-  output: *basic1_bufput
+  output: *basic1_output
 #      <ul>
 #        <li><aaa></li>
 #        <li>b&b</li>
 #        <li>"ccc"</li>
 #      </ul>
+
 ##
 - name:  array1
   class: ArrayEruby
@@ -495,6 +534,7 @@ __END__
       - "\"ccc\""
       - "</li>\n"
       - "</ul>\n"
+
 ##
 - name:  stringbuffer1
   class: StringBufferEruby
@@ -512,12 +552,13 @@ __END__
        _buf << '</ul>
       ';
       _buf
-  output: *basic1_bufput
+  output: *basic1_output
 #      <ul>
 #        <li><aaa></li>
 #        <li>b&b</li>
 #        <li>"ccc"</li>
 #      </ul>
+
 ##
 - name:  notext1
   class: NoTextEruby
@@ -530,6 +571,20 @@ __END__
       
       _buf.join
   output:  '<aaa>b&b"ccc"'
+
+##
+- name:  nocode1
+  class: NoCodeEruby
+  testopt: skip_output
+  input: *basic1_input
+  src: |
+      <ul>
+
+        <li></li>
+
+      </ul>
+  output: 
+
 ##
 - name:  simplified
   class: SimplifiedEruby
@@ -567,6 +622,7 @@ __END__
         </li>
       ^
       </ul>
+
 ##
 - name:  bipattern1
   class: BiPatternEruby
@@ -589,6 +645,7 @@ __END__
         b&b = b&amp;b
         "ccc" % &quot;ccc&quot;
         "ccc" = &quot;ccc&quot;
+
 ##
 - name:  bipattern2
   class: BiPatternEruby
@@ -611,6 +668,7 @@ __END__
         b&b = b&amp;b
         "ccc" % &quot;ccc&quot;
         "ccc" = &quot;ccc&quot;
+
 ##
 - name:  percentline1
   class: PercentLineEruby
@@ -662,6 +720,7 @@ __END__
       % double percent
        % spaced percent
       </pre>
+
 ##
 - name:  headerfooter1
   class: HeaderFooterEruby
@@ -695,6 +754,7 @@ __END__
         <li>b&amp;b</li>
         <li>&quot;ccc&quot;</li>
       </ol>
+
 ##
 - name:  optimized1
   class: OptimizedEruby
@@ -736,6 +796,7 @@ __END__
         </tr>
       </table>
       <ul><li><aaa></li><li>b&b</li><li>"ccc"</li></ul>
+
 ##
 - name:  optimized2
   class: OptimizedXmlEruby
@@ -777,6 +838,7 @@ __END__
         </tr>
       </table>
       <ul><li>&lt;aaa&gt;</li><li>b&amp;b</li><li>&quot;ccc&quot;</li></ul>
+
 ##
 - name:  optimized3
   desc:  bug
@@ -798,6 +860,7 @@ __END__
         <aaa>
         b&b
         "ccc"
+
 ##
 - name:  optimized4
   desc:  single quotation and backslash
@@ -813,6 +876,7 @@ __END__
       ';
       _buf
   output: *optimized4_input
+
 ##
 - name:  tiny1
   class: TinyEruby
@@ -841,6 +905,7 @@ __END__
         <li>"ccc"</li>
       ^
       </ul>
+
 ##
 - name:  tiny2
   class: TinyEruby
@@ -869,4 +934,117 @@ __END__
         <li>"ccc"</li>
       ^
       </ul>
+
+##
+- name:  pi1
+  class:  PI::Eruby
+  testopt:  evaluate
+  input: &input_pi1|
+      <ul>
+       <?rb for item in @list ?>
+        <li>@{item}@ / @!{item}@</li>
+        <li><%= item %> / <%== item %></li>
+       <?rb end ?>
+      </ul>
+  src: &src_pi1|
+      _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
+  output: &output_pi1|
+      <ul>
+        <li>&lt;aaa&gt; / <aaa></li>
+        <li><aaa> / &lt;aaa&gt;</li>
+        <li>b&amp;b / b&b</li>
+        <li>b&b / b&amp;b</li>
+        <li>&quot;ccc&quot; / "ccc"</li>
+        <li>"ccc" / &quot;ccc&quot;</li>
+      </ul>
+
 ##
+- name:  pi2
+  class:  PI::Eruby
+  options: { :escape: false }
+  testopt:  evaluate
+  input: *input_pi1
+  src: |
+      _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
+  output: |
+      <ul>
+        <li><aaa> / &lt;aaa&gt;</li>
+        <li>&lt;aaa&gt; / <aaa></li>
+        <li>b&b / b&amp;b</li>
+        <li>b&amp;b / b&b</li>
+        <li>"ccc" / &quot;ccc&quot;</li>
+        <li>&quot;ccc&quot; / "ccc"</li>
+      </ul>
+
+##
+- name:  pi3
+  class:  PI::Eruby
+  options: { :pi: hoge, :embchar: '$' }
+  testopt:  evaluate
+  input: |
+      <ul>
+       <?hoge for item in @list ?>
+        <li>${item}$ / $!{item}$</li>
+        <li><%= item %> / <%== item %></li>
+       <?hoge end ?>
+      </ul>
+  src: *src_pi1
+  output: *output_pi1
+
+- name:  pi4
+  class:  PI::Eruby
+  testopt: evaluate
+  input: |
+      <?rb-header
+        def show(list)
+      ?>
+      <ul>
+       <?rb for item in list ?>
+         <?rb-value item ?>
+       <?rb end ?>
+       <?rb-comment
+       # comment
+       # comment
+       ?>
+      </ul>
+      <?rb-footer
+        end
+	show(@list) ?>
+
+  src: |4
+      
+        def show(list)
+      
+      _buf = []; _buf << '<ul>
+      ';  for item in list 
+       _buf << (    item 
+      ).to_s;  end 
+      
+      
+      
+
+       _buf << '</ul>
+      ';
+      _buf.join
+      
+        end
+	show(@list) 
+
+  output: |
+      <ul>
+      <aaa>b&b"ccc"</ul>
+