erubis 2.3.1 → 2.7.0

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

@@ -1,7 +1,9 @@
 $ erubis -xE PercentLine percentline-example.rhtml
-_buf = ''; for item in list
- _buf << '  <b>'; _buf << ( item ).to_s; _buf << '</b>
+_buf = ''; _buf << '<ul>
+'; for item in list
+ _buf << '  <li>'; _buf << ( item ).to_s; _buf << '</li>
 '; end
- _buf << '% lines with \'%%\'
+ _buf << '</ul>
+% lines with \'%%\'
 ';
 _buf.to_s

data/test/data/users-guide/prefixedline-example.rb

@@ -0,0 +1,9 @@
+require 'erubis'
+
+class PrefixedLineEruby < Erubis::Eruby
+  include Erubis::PrefixedLineEnhancer
+end
+
+input = File.read('prefixedline-example.rhtml')
+eruby = PrefixedLineEruby.new(input, :prefixchar=>'!')  # default '%'
+print eruby.src

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

@@ -0,0 +1,6 @@
+<ul>
+  ! for item in list
+  <li><%= item %></li>
+  ! end
+</ul>
+  !! lines with '!!'

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

@@ -0,0 +1,9 @@
+$ ruby prefixedline-example.rb
+_buf = ''; _buf << '<ul>
+';   for item in list
+ _buf << '  <li>'; _buf << ( item ).to_s; _buf << '</li>
+';   end
+ _buf << '</ul>
+  ! lines with \'!!\'
+';
+_buf.to_s

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

@@ -0,0 +1,4 @@
+$ erubis -c '{var: "AAA\n"}' tailnewline.rhtml
+<div>
+AAA
+</div>

data/test/data/users-guide/tailnewline.rhtml

@@ -0,0 +1,3 @@
+<div>
+<%= @var -%>
+</div>

data/test/data/users-guide/template1.rhtml

@@ -0,0 +1,4 @@
+<% for x in items %>
+item = <%= x %>
+<% end %>
+** debug: local variables=<%= local_variables().inspect() %>

data/test/data/users-guide/template2.rhtml

@@ -0,0 +1,4 @@
+<% for x in @items %>
+item = <%= x %>
+<% end %>
+** debug: local variables=<%= local_variables().inspect() %>

data/test/test-engines.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 require "#{File.dirname(__FILE__)}/test.rb"
@@ -10,6 +9,7 @@ require 'erubis'
 require 'erubis/engine/eruby'
 require 'erubis/engine/ephp'
 require 'erubis/engine/ec'
+require 'erubis/engine/ecpp'
 require 'erubis/engine/ejava'
 require 'erubis/engine/escheme'
 require 'erubis/engine/eperl'
@@ -29,6 +29,9 @@ class EnginesTest < Test::Unit::TestCase
     assert_text_equal(@expected, actual)
   end
 
+
+  self.post_definition()
+
 end
 
 __END__
@@ -65,6 +68,31 @@ __END__
       ';
       _buf.to_s
 ##
+- name:  ruby2_options
+  lang:  ruby
+  class: Eruby
+  options: { :bufvar: '@_out_buf' }
+  input: |
+      <table>
+        <% for item in @items %>
+        <tr>
+          <td><%= i+1 %></td>
+          <td><%== list %></td>
+        </tr>
+        <% end %>
+      </table>
+  expected: |
+      @_out_buf = ''; @_out_buf << '<table>
+      ';   for item in @items 
+       @_out_buf << '  <tr>
+          <td>'; @_out_buf << ( i+1 ).to_s; @_out_buf << '</td>
+          <td>'; @_out_buf << Erubis::XmlHelper.escape_xml( list ); @_out_buf << '</td>
+        </tr>
+      ';   end 
+       @_out_buf << '</table>
+      ';
+      @_out_buf.to_s
+##
 - name:  php1
   lang:  php
   class: Ephp
@@ -136,6 +164,36 @@ __END__
               "</table>\n", stdout);
          fprintf(stderr, "*** debug: i=" "%d", i); fputs("\n", stdout);
 ##
+- name:  cpp1
+  lang:  cpp
+  class: Ecpp
+  options: { :filename: foo.html, :indent: '  ' }
+  input: |4
+      <table>
+       <tbody>
+      <%  for (i = 0; i < n; i++) { %>
+        <tr>
+         <td><%= i %></td>
+         <td><%== list[i] %></td>
+        </tr>
+      <%  } %>
+       </tbody>
+      </table>
+      <%=== i %>
+  expected: |
+      #line 1 "foo.html"
+        _buf << "<table>\n"
+                " <tbody>\n";
+        for (i = 0; i < n; i++) { 
+        _buf << "  <tr>\n"
+                "   <td>"; _buf << (i); _buf << "</td>\n"
+                "   <td>"; escape(list[i]); _buf << "</td>\n"
+                "  </tr>\n";
+        } 
+        _buf << " </tbody>\n"
+                "</table>\n";
+         std::cerr << "*** debug: i=" << (i); _buf << "\n";
+##
 - name:  java1
   lang:  java
   class: Ejava
@@ -298,11 +356,11 @@ __END__
       '); print('*** debug: $i=', $i, "\n");print('
       '); 
 ##
-- name:  javascript
+- name:  javascript1
   lang:  javascript
   class: Ejavascript
   options:
-  input: |
+  input: &javascript_input |
       <%
          var user = 'Erubis';
          var list = ['<aaa>', 'b&b', '"ccc"'];
@@ -340,3 +398,28 @@ __END__
       alert("*** debug: i="+(i)); _buf.push("\n");
       document.write(_buf.join(""));
  ##
+- name:  javascript2
+  lang:  javascript
+  class: Ejavascript
+  options: { :docwrite: false }
+  input: *javascript_input
+  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");
+      _buf.join("");
+ ##

data/test/test-enhancers.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 require "#{File.dirname(__FILE__)}/test.rb"
@@ -98,6 +97,8 @@ class EnhancersTest < Test::Unit::TestCase
   end
 
 
+  self.post_definition()
+
 end
 
 __END__
@@ -471,8 +472,8 @@ __END__
       '; end
        _buf << '</table>
       <pre>
-      '; _buf << '% double percent
-      '; _buf << ' % spaced percent
+      % double percent
+       % spaced percent
       </pre>
       ';
       _buf.to_s
@@ -496,6 +497,55 @@ __END__
        % spaced percent
       </pre>
 
+##
+- name:  prefixedline1
+  class: PrefixedLineEruby
+  options: { :prefixchar: '!' }
+  input: |
+      <table>
+        ! for item in list
+        <tr>
+          <td><%= item %></td>
+          <td><%== item %></td>
+        </tr>
+        ! end
+      </table>
+      <pre>
+        !! doubled characters
+      </pre>
+  src: |
+      _buf = ''; _buf << '<table>
+      ';   for item in list
+       _buf << '  <tr>
+          <td>'; _buf << ( item ).to_s; _buf << '</td>
+          <td>'; _buf << Erubis::XmlHelper.escape_xml( item ); _buf << '</td>
+        </tr>
+      ';   end
+       _buf << '</table>
+      <pre>
+        ! doubled characters
+      </pre>
+      ';
+      _buf.to_s
+  output: |
+      <table>
+        <tr>
+          <td><aaa></td>
+          <td>&lt;aaa&gt;</td>
+        </tr>
+        <tr>
+          <td>b&b</td>
+          <td>b&amp;b</td>
+        </tr>
+        <tr>
+          <td>"ccc"</td>
+          <td>&quot;ccc&quot;</td>
+        </tr>
+      </table>
+      <pre>
+        ! doubled characters
+      </pre>
+
 ##
 - name:  headerfooter1
   class: HeaderFooterEruby
@@ -566,4 +616,31 @@ __END__
       _buf.to_s
   output: *basic1_output
 
-
+- name:  interpolation2
+  desc:  sharp, back-quote, and backslash should be escaped, but other quotes should not be escaped (reported by andrewj)
+  class: InterpolationEruby
+  options:
+  testopt:
+  input: |
+      <p>`back-quote`</p>
+      <p><%= `echo back-tick operator` %></p>
+      <p>#{sharp}</p>
+      <p>'single quote'</p>
+      <p>"double quote"</p>
+      <p>backslash\n\t</p>
+  src: |
+      _buf = ''; _buf << %Q`<p>\`back-quote\`</p>
+      <p>#{ `echo back-tick operator` }</p>
+      <p>\#{sharp}</p>
+      <p>'single quote'</p>
+      <p>"double quote"</p>
+      <p>backslash\\n\\t</p>\n`
+      _buf.to_s
+  output: |
+      <p>`back-quote`</p>
+      <p>back-tick operator
+      </p>
+      <p>#{sharp}</p>
+      <p>'single quote'</p>
+      <p>"double quote"</p>
+      <p>backslash\n\t</p>

data/test/test-erubis.rb

@@ -1,7 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
-## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
 ##
 
 require "#{File.dirname(__FILE__)}/test.rb"
@@ -120,32 +119,36 @@ END
     filename = 'tmp.load_file_timestamp1'
     cachename = filename + '.cache'
     begin
+      ## when cache doesn't exist then it is created automatically
       File.open(filename, 'w') { |f| f.write(@input) }
-      assert_block() { !test(?f, cachename) }
+      mtime = Time.now - 2.0
+      File.utime(mtime, mtime, filename)
+      !test(?f, cachename)  or raise "** failed"
       engine = @klass.load_file(filename)
       assert_block() { test(?f, cachename) }
       assert_block() { File.mtime(filename) <= File.mtime(cachename) }
       assert_text_equal(@src, engine.src)
-      #
+      ## when cache has different timestamp then it is recreated
       input2 = @input.gsub(/ul>/, 'ol>')
       src2   = @src.gsub(/ul>/, 'ol>')
-      mtime = File.mtime(filename)
       File.open(filename, 'w') { |f| f.write(input2) }
       t1 = Time.now()
       sleep(1)
       t2 = Time.now()
+      #
       File.utime(t1, t1, filename)
       File.utime(t2, t2, cachename)
-      assert_block('cache should be newer') { File.mtime(filename) < File.mtime(cachename) }
+      File.mtime(filename) < File.mtime(cachename)  or raise "** failed"
       engine = @klass.load_file(filename)
-      assert_block('cache should be newer') { File.mtime(filename) < File.mtime(cachename) }
-      assert_text_equal(@src, engine.src)
+      assert_block('cache should have same timestamp') { File.mtime(filename) == File.mtime(cachename) }
+      #assert_text_equal(@src, engine.src)
+      assert_text_equal(src2, engine.src)
       #
       File.utime(t2, t2, filename)
       File.utime(t1, t1, cachename)
-      assert_block('cache should be older') { File.mtime(filename) > File.mtime(cachename) }
+      File.mtime(filename) > File.mtime(cachename)  or raise "** failed"
       engine = @klass.load_file(filename)
-      assert_block('cache should be newer') { File.mtime(filename) <= File.mtime(cachename) }
+      assert_block('cache should have same timestamp') { File.mtime(filename) == File.mtime(cachename) }
       assert_text_equal(src2, engine.src)
     ensure
       File.unlink(cachename) if File.file?(cachename)
@@ -154,8 +157,67 @@ END
   end
 
 
+  class Dummy
+  end
+
+  def _class_has_instance_method(klass, method)
+    return klass.instance_methods.collect{|m| m.to_s}.include?(method.to_s)
+  end
+
+  def test_def_method1
+    s = "<%for i in list%>i=<%=i%>\n<%end%>"
+    eruby = Erubis::Eruby.new(s)
+    assert(! _class_has_instance_method(Dummy, 'render'))
+    eruby.def_method(Dummy, 'render(list)', 'foo.rhtml')
+    assert(_class_has_instance_method(Dummy, 'render'))
+    actual = Dummy.new().render(%w[1 2 3])
+    assert_equal("i=1\ni=2\ni=3\n", actual)
+  end
+
+  def test_def_method2
+    s = "<%for i in list%>i=<%=i%>\n<%end%>"
+    eruby = Erubis::Eruby.new(s)
+    assert(! (eruby.respond_to? :render))
+    eruby.def_method(eruby, 'render(list)', 'foo.rhtml')
+    assert eruby.respond_to?(:render)
+    actual = eruby.render([1, 2, 3])
+    assert_equal("i=1\ni=2\ni=3\n", actual)
+    assert(! _class_has_instance_method(eruby.class, 'render'))
+  end
+
+  def test_evaluate_creates_proc
+    s = "hello <%= @name %>"
+    eruby = Erubis::Eruby.new(s)
+    assert_nil(eruby.instance_variable_get('@_proc'))
+    actual1 = eruby.evaluate(:name=>'world')
+    assert_not_nil(eruby.instance_variable_get('@_proc'))
+    assert_instance_of(Proc, eruby.instance_variable_get('@_proc'))
+    actual2 = eruby.evaluate(:name=>'world')
+    assert_equal(actual1, actual2)
+    # convert() must clear @_proc
+    eruby.convert(s)
+    assert_nil(eruby.instance_variable_get('@_proc'))
+  end
+
+  #def test_toplevel_binding
+  #  s = "locals = <%= local_variables().inspect %>\n<% x = 50 %>\n"
+  #  eruby = Erubis::Eruby.new(s)
+  #  _x = eval 'x', TOPLEVEL_BINDING
+  #  _y = eval 'y', TOPLEVEL_BINDING
+  #  actual = eruby.evaluate(:x=>_x, :y=>_y)
+  #  _x = eval 'x', TOPLEVEL_BINDING
+  #  _y = eval 'y', TOPLEVEL_BINDING
+  #  puts "*** actual=#{actual.inspect}, x=#{_x.inspect}, y=#{_y.inspect}"
+  #end
+
+  self.post_definition()
+
 end
 
+x = 10
+y = 20
+
+
 __END__
 - name:  basic1
   input: &basic1_input|
@@ -463,6 +525,48 @@ __END__
       &lt;&gt;&amp;&quot;
       <>&"
 
+##
+- name:  tailch1
+  options:
+  input: |
+        <p>
+          <% str = '<>&"' %>
+          <%= str %>
+          <%= str =%>
+          <%= str -%>
+        </p>
+  src: |
+        _buf = ''; _buf << '<p>
+        ';   str = '<>&"' 
+         _buf << '  '; _buf << ( str ).to_s; _buf << '
+        '; _buf << '  '; _buf << ( str ).to_s; _buf << '  '; _buf << ( str ).to_s; _buf << '</p>
+        ';
+        _buf.to_s
+  output: |
+        <p>
+          <>&"
+          <>&"  <>&"</p>
+
+##
+- name:  doublepercent1
+  options:
+  input: |
+        <% x1 = 10 %>
+        <%% x2 = 20 %>
+        <%= x1 %>
+        <%%= x2 %>
+  src: |
+        _buf = ''; x1 = 10 
+         _buf << '<% x2 = 20 %>
+        '; _buf << ( x1 ).to_s; _buf << '
+        '; _buf << '<%= x2 %>
+        ';
+        _buf.to_s
+  output: |
+        <% x2 = 20 %>
+        10
+        <%= x2 %>
+
 ##
 - name:  optimized1
   class: OptimizedEruby

data/test/test-index-cgi.rb

@@ -0,0 +1,191 @@
+##
+## $Release: 2.7.0 $
+## copyright(c) 2006-2011 kuwata-lab.com all rights reserved.
+##
+
+require "#{File.dirname(__FILE__)}/test.rb"
+
+require 'stringio'
+
+load "#{File.dirname(__FILE__)}/../public_html/index.cgi"
+
+
+def spec(desc)
+  yield
+end
+
+
+def dummy_env(request_method='GET', request_uri='/', opts={})
+  if request_method.is_a?(Hash)
+    opts = request_method
+    request_method = 'GET'
+    request_uri = '/'
+  elsif request_uri.is_a?(Hash)
+    opts = request_uri
+    request_uri = '/'
+  end
+  env = {
+    'REQUEST_METHOD' => request_method.to_s,
+    'REQUEST_URI'    => request_uri.to_s,
+    'DOCUMENT_ROOT'  => Dir.pwd,
+  }
+  opts.each {|k, v| env[k.to_s.upcase] = v }
+  env.update(opts)
+  return env
+end
+
+
+def dummy_template(filename, content)
+  begin
+    File.open(filename, 'wb') {|f| f.write(content) }
+    return yield
+  ensure
+    [filename, filename + '.cache'].each do |fname|
+      File.unlink(fname) if File.exist?(fname)
+    end
+  end
+end
+
+
+class ErubisHandlerTest < Test::Unit::TestCase
+
+  def test_initialize
+
+    spec "sets @encoding and @layout" do
+      encoding_bkup = $ENCODING
+      layout_bkup   = $LAYOUT
+      begin
+        $ENCODING = 'cp932'
+        $LAYOUT   = 'site.rhtml'
+        obj = ErubisHandler.new
+        assert_equal 'cp932', obj.encoding
+        assert_equal 'site.rhtml', obj.layout
+      ensure
+        $ENCODING = encoding_bkup
+        $LAYOUT   = layout_bkup
+      end
+    end
+
+  end
+
+  def test_handle
+
+    spec "renders requested template file." do
+      base = "_test_handle"
+      env = dummy_env('GET', "/#{base}.html")
+      handler = ErubisHandler.new
+      input = <<'END'
+<h1><%= '<b>SOS</b>' %></h1>
+<ul>
+  <% for item in %w[Haruhi Mikuru Yuki] %>
+  <li><%= item %></li>
+  <% end %>
+</ul>
+END
+      expected = <<'END'
+<h1><b>SOS</b></h1>
+<ul>
+  <li>Haruhi</li>
+  <li>Mikuru</li>
+  <li>Yuki</li>
+</ul>
+END
+      out = dummy_template("#{base}.rhtml", input) do
+        handler.handle(env)
+      end
+      assert_equal expected, out
+    end
+
+    spec "raises 404 error when requested file not found." do
+      req_url = "/_test_handle.html"
+      env = dummy_env('GET', req_url)
+      handler = ErubisHandler.new
+      ex = assert_raise HttpError do
+        handler.handle(env)
+      end
+      assert_equal 404, ex.status
+      assert_equal "#{req_url}: not found.", ex.message
+    end
+
+  end
+
+end
+
+
+class ErubisApplicationTest < Test::Unit::TestCase
+
+  def test_handle_request
+
+    spec "handles request by handler object and returns response data." do
+      app = ErubisApplication.new()
+      def app.get_handler
+        return Class.new {
+          def handle(env); "<p>Hello SOS</p>"; end
+          def encoding; "euc_jp"; end
+        }.new
+      end
+      expected = [
+        200,
+        [["Content-Type", "text/html;charset=euc_jp"]],
+        ["<p>Hello SOS</p>"],
+      ]
+      env = dummy_env('GET', '/')
+      ret = app.call(env)
+      assert_equal expected, ret
+    end
+
+  end
+
+  def test_handle_http_error
+
+    spec "renders error page." do
+      req_path = '/HaruhiSuzumiya.html'
+      app = ErubisApplication.new()
+      env = dummy_env('GET', req_path)
+      expected = [
+        404,
+        [["Content-Type", "text/html"]],
+        ["<h2>404 Not Found</h2>\n<p>#{req_path}: not found.</p>\n"],
+      ]
+      ret = app.call(env)
+      assert_equal expected, ret
+    end
+
+  end
+
+  def test_run
+
+    spec "prints to $stdout" do
+      input = "<p>Hello SOS</p>"
+      app = ErubisApplication.new
+      base = "SOS"
+      env = dummy_env("GET", "/#{base}.html")
+      sio = StringIO.new
+      output = dummy_template("#{base}.rhtml", input) do
+        app.run(env, sio)
+        sio.string
+      end
+      expected = ""
+      expected << "Content-Type: text/html\r\n"
+      expected << "\r\n"
+      expected << "<p>Hello SOS</p>"
+      assert_equal expected, output
+    end
+
+    spec "prints 'Status:' header if status code is not 200." do
+      req_path = "/SOS.html"
+      env = dummy_env("GET", req_path)
+      app = ErubisApplication.new
+      sio = StringIO.new
+      app.run(env, sio)
+      expected = "Status: 404 Not Found\r\n"
+      expected << "Content-Type: text/html\r\n"
+      expected << "\r\n"
+      expected << "<h2>404 Not Found</h2>\n"
+      expected << "<p>#{req_path}: not found.</p>\n"
+      assert_equal expected, sio.string
+    end
+
+  end
+
+end