tenjin 0.6.1 → 0.6.2

data/CHANGES.txt

@@ -1,6 +1,36 @@
 =begin
 = CHANGES
 
+
+== Release 0.6.2 (2008-02-24)
+
+* Rubinius supported.
+
+* Changed to convert texts before expressions into spaces when
+  command-line option '-S' specified.
+
+  ex. hoge.rbhtml
+    <?rb for item in @list ?>
+      <p>${item}</p>
+    <?rb end ?>
+
+  ex. result of '-S'
+    ## 0.6.1
+    $ rbtenjin -S hoge.rbhtml
+    _buf = ''; for item in @list
+    escape((item).to_s); 
+    end
+    _buf.to_s
+
+    ## 0.6.2
+    $ rbtenjin -S hoge.rbhtml
+    _buf = ''; for item in @list
+         escape((item).to_s); 
+    end
+    _buf.to_s
+
+
+
 == Release 0.6.1 (2007-02-07)
 
 === Enhancements

data/README.txt

@@ -1,6 +1,6 @@
 = README
 
-release::	0.6.1
+release::	0.6.2
 copyright::	copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
 
 
@@ -34,14 +34,16 @@ See doc/*.html for details.
 
     $ sudo gem install tenjin
 
-* Else download rbtenjin-0.6.1.tar.bz2 and just copy 'lib/tenjin.rb' and
+* Else download rbtenjin-0.6.2.tar.bz2 and just copy 'lib/tenjin.rb' and
   'bin/rbtenjin' into proper directory.
 
-    $ tar xjf rbtenjin-0.6.1.tar.bz2
-    $ cd rbtenjin-0.6.1/
+    $ tar xjf rbtenjin-0.6.2.tar.bz2
+    $ cd rbtenjin-0.6.2/
     $ sudo copy lib/tenjin.rb /usr/local/lib/ruby/1.8/site_ruby/1.8/
     $ sudo copy bin/rbtenjin /usr/local/bin/
 
+rbTenjin is tested with Ruby 1.8.6 and Rubinius.
+
 
 == Attention
 

data/bin/rbtenjin

@@ -23,8 +23,8 @@
 ## WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ##
 
-## $Rev: 59 $
-## $Release: 0.6.1 $
+## $Rev: 70 $
+## $Release: 0.6.2 $
 
 require 'tenjin'
 
@@ -51,6 +51,11 @@ module Tenjin
       n = text.count("\n")
       n -= 1 if encode_newline && text[-1] == ?\n
       @script << (@newline * n)
+      if text[-1] != ?\n
+        pos = text.rindex(?\n)
+        s = pos ? text[(pos+1)..-1] : text
+        @script << s.gsub(/[^\t]/, ' ')
+      end
     end
 
     ## add expression code

data/doc-api/classes/Tenjin.html

@@ -77,7 +77,7 @@
 <a href="Tenjin.html">Tenjin</a> module
 </p>
 <p>
-$Rev: 65 $ $Release: 0.6.1 $
+$Rev: 65 $ $Release: 0.6.2 $
 </p>
 
     </div>
@@ -116,7 +116,7 @@ Class <a href="Tenjin/Template.html" class="link">Tenjin::Template</a><br />
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">RELEASE</td>
           <td>=</td>
-          <td class="context-item-value">('$Release: 0.6.1 $' =~ /[\d.]+/) &amp;&amp; $&amp;</td>
+          <td class="context-item-value">('$Release: 0.6.2 $' =~ /[\d.]+/) &amp;&amp; $&amp;</td>
         </tr>
         </table>
       </div>

data/doc-api/created.rid

@@ -1 +1 @@
-Thu, 07 Feb 2008 11:07:39 +0900
+Mon, 25 Feb 2008 00:47:12 +0900

data/doc-api/files/README_txt.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Thu Feb 07 11:04:47 +0900 2008</td>
+      <td>Mon Feb 25 00:45:04 +0900 2008</td>
     </tr>
     </table>
   </div>
@@ -71,7 +71,7 @@
     <div id="description">
       <h1>README</h1>
 <table>
-<tr><td valign="top">release:</td><td>0.6.1
+<tr><td valign="top">release:</td><td>0.6.2
 
 </td></tr>
 <tr><td valign="top">copyright:</td><td>copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
@@ -129,18 +129,21 @@ See doc/*.html for details.
   $ sudo gem install tenjin
 </pre>
 </li>
-<li>Else download rbtenjin-0.6.1.tar.bz2 and just copy
+<li>Else download rbtenjin-0.6.2.tar.bz2 and just copy
 &#8216;lib/tenjin.rb&#8217; and &#8216;bin/rbtenjin&#8217; into proper
 directory.
 
 <pre>
-  $ tar xjf rbtenjin-0.6.1.tar.bz2
-  $ cd rbtenjin-0.6.1/
+  $ tar xjf rbtenjin-0.6.2.tar.bz2
+  $ cd rbtenjin-0.6.2/
   $ sudo copy lib/tenjin.rb /usr/local/lib/ruby/1.8/site_ruby/1.8/
   $ sudo copy bin/rbtenjin /usr/local/bin/
 </pre>
 </li>
 </ul>
+<p>
+rbTenjin is tested with Ruby 1.8.6 and Rubinius.
+</p>
 <h2>Attention</h2>
 <p>
 rbTenjin is beta released. It means that API or specification may change in

data/doc-api/files/lib/tenjin_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Feb 06 12:44:46 +0900 2008</td>
+      <td>Sun Feb 24 12:06:42 +0900 2008</td>
     </tr>
     </table>
   </div>

data/doc/examples.html

@@ -17,7 +17,7 @@
       last update: $Date: 2007-10-23 15:29:14 +0900 (Tue, 23 Oct 2007) $<br>
     </div>
 
-<p>Release: 0.6.1
+<p>Release: 0.6.2
 </p>
 <p>Table of Contents:
 <ul>

data/doc/faq.html

@@ -17,7 +17,7 @@
       last update: $Date: 2008-02-04 22:21:53 +0900 (Mon, 04 Feb 2008) $<br>
     </div>
 
-<p>Release:	0.6.1
+<p>Release:	0.6.2
 </p>
 <p>Table of contents:
 <ul>

data/doc/users-guide.html

@@ -14,10 +14,10 @@
 
     <div align="left"><h1>rbTenjin User's Guide</h1></div>
     <div align="left">
-      last update: $Date: 2008-02-06 12:44:46 +0900 (Wed, 06 Feb 2008) $<br>
+      last update: $Date: 2008-02-24 11:43:28 +0900 (Sun, 24 Feb 2008) $<br>
     </div>
 
-<p>Release: 0.6.1
+<p>Release: 0.6.2
 </p>
 <p>Table of Contents:
 <ul>
@@ -361,7 +361,7 @@ for item in ['&lt;foo&gt;', 'bar&amp;bar', '"baz"']
     i += 1
 
 
-escape((item).to_s); 
+          escape((item).to_s); 
 
 end
 

data/examples/form/Makefile

@@ -1,5 +1,8 @@
 all:
 	ruby main.rb
 
+all2:
+	rbx main.rb    # Rubinius
+
 clean:
-	rm -f *.cache
+	rm -f *.cache *.rbc

data/examples/form/Rakefile

@@ -2,6 +2,10 @@ task 'default' do
   load 'main.rb'
 end
 
+task 'all2' do
+  system 'rbx main.rb'    # Rubinius
+end
+
 task 'clean' do
-  rm_f Dir.glob('*.cache')
+  rm_f Dir.glob('*.{cache,rbc}')
 end

data/examples/preprocessing/Makefile

@@ -1,8 +1,11 @@
 all:
 	ruby main.rb
 
+all2:
+	rbx main.rb	# Rubinius
+
 preprocess:
 	rbtenjin -a preprocess select.rbhtml
 
 clean:
-	rm -f *.cache
+	rm -f *.cache *.rbc

data/examples/preprocessing/Rakefile

@@ -2,10 +2,14 @@ task 'default' do
   load 'main.rb'
 end
 
+task 'all2' do
+  system 'rbx main.rb'	# Rubinius
+end
+
 task 'preprocess' do
   system 'rbtenjin -a preprocess select.rbhtml'
 end
 
 task 'clean' do
-  rm_f Dir.glob('*.cache')
+  rm_f Dir.glob('*.{cache,rbc}')
 end

data/examples/preprocessing/select.rbhtml.cache

@@ -0,0 +1,17 @@
+ _buf << %Q`<form>
+  <label>Select your language:</label>
+  <select name="lang">\n`
+table = { @params[:lang] => ' selected="selected"' }
+ _buf << %Q`    <option value="en" #{table["en"]}>Engilish</option>
+    <option value="fr" #{table["fr"]}>French</option>
+    <option value="de" #{table["de"]}>German</option>
+    <option value="es" #{table["es"]}>Spanish</option>
+    <option value="ch" #{table["ch"]}>Chinese</option>
+    <option value="ja" #{table["ja"]}>Japanese</option>
+  </select>
+  <input type="submit" value="OK" />
+</form>
+<p>
+  <a href="/app/index">Back</a> |
+  <a href="/app/show/#{@params[:id]}">Show #{escape((@params[:name]).to_s)}</a>
+</p>\n`

data/examples/table/Makefile

@@ -1,5 +1,8 @@
 all:
 	ruby table.rb
 
+all2:
+	rbx table.rb	# Rubinius
+
 clean:
-	rm -f *.cache
+	rm -f *.cache *.rbc

data/examples/table/Rakefile

@@ -2,6 +2,10 @@ task 'default' do
   load 'table.rb'
 end
 
+task 'all2' do
+  system 'rbx table.rb'    # Rubinius
+end
+
 task 'clean' do
-  rm_f Dir.glob('*.cache')
+  rm_f Dir.glob('*.{cache,rbc}')
 end

data/lib/tenjin.rb

@@ -25,12 +25,12 @@
 ## Tenjin module
 ##
 ## $Rev: 65 $
-## $Release: 0.6.1 $
+## $Release: 0.6.2 $
 ##
 
 module Tenjin
 
-  RELEASE = ('$Release: 0.6.1 $' =~ /[\d.]+/) && $&
+  RELEASE = ('$Release: 0.6.2 $' =~ /[\d.]+/) && $&
 
 
   ##

data/tenjin.gemspec

@@ -2,7 +2,7 @@
 
 ###
 ### $Rev: 68 $
-### $Release: 0.6.1 $
+### $Release: 0.6.2 $
 ### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
 ###
 
@@ -14,7 +14,7 @@ spec = Gem::Specification.new do |s|
   s.author      = "makoto kuwata"
   s.email       = "kwa(at)kuwata-lab.com"
   s.rubyforge_project = 'tenjin'
-  s.version     = "0.6.1"
+  s.version     = "0.6.2"
   s.platform    = Gem::Platform::RUBY
   s.homepage    = "http://www.kuwata-lab.com/tenjin/"
   s.summary     = "very fast and full-featured template engine"

data/test/Rookbook.yaml

@@ -0,0 +1,14 @@
+
+recipes:
+
+  - product:	:clean
+    method*: |
+	rm_rf '**/*.rbc', 'test.log'
+
+  - product:	:ruby_test
+    method*: |
+	sys 'ruby test_all.rb 2>&1 | tee test.log'
+
+  - product:	:rubinius_test
+    method*: |
+	sys 'rubinius test_all.rb 2>&1 | tee test.log'

data/test/assert-text-equal.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 30 $
-### 0.6.1
+### 0.6.2
 ### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
 ###
 

data/test/data/users_guide/example1_S.result

@@ -6,7 +6,7 @@ for item in ['<foo>', 'bar&bar', '"baz"']
     i += 1
 
 
-escape((item).to_s); 
+          escape((item).to_s); 
 
 end
 

data/test/test_all.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 45 $
-### $Release: 0.6.1 $
+### $Release: 0.6.2 $
 ### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
 ###
 

data/test/test_engine.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 59 $
-### $Release: 0.6.1 $
+### $Rev: 72 $
+### $Release: 0.6.2 $
 ### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
 ###
 
@@ -8,7 +8,17 @@ require 'test/unit'
 #require 'testutil'
 require 'testcase-helper'
 require 'assert-text-equal'
-require 'yaml'
+if defined?(RBX_VERSION)
+  require 'kwalify'
+  def load_yaml_str(s)
+    return Kwalify::Yaml.load(s)
+  end
+else
+  require 'yaml'
+  def load_yaml_str(s)
+    return YAML.load(s)
+  end
+end
 
 require 'tenjin'
 
@@ -17,7 +27,7 @@ class TenjinEngineTest < Test::Unit::TestCase
 
   s = File.read(__FILE__.sub(/\.\w+$/, '.yaml'))
   s.gsub!(/^\t/, ' ' * 8)
-  ydoc = YAML.load(s)
+  ydoc = load_yaml_str(s)
   _data_convert(ydoc, 'ruby')
   TESTDATA = {}
   ydoc.each { |e| TESTDATA[e['name']] = e }
@@ -53,7 +63,6 @@ class TenjinEngineTest < Test::Unit::TestCase
   end
 
   def _test_basic
-
     ## setup
     _setup()
 
@@ -298,49 +307,8 @@ class TenjinEngineTest < Test::Unit::TestCase
   end
 
 
-  def test_change_layout()
-    data = TESTDATA['test_change_layout']
-    ## setup
-    basenames = %w[baselayout customlayout content]
-    for basename in basenames
-      File.write("#{basename}.rbhtml", data[basename])
-    end
-    ## body
-    begin
-      engine = Tenjin::Engine.new(:layout=>'baselayout.rbhtml',
-                                           :templateclass=>_template_class())
-      output = engine.render('content.rbhtml')
-      expected = data['expected']
-      assert_text_equal(expected, output)
-    ensure
-      for basename in basenames
-        Dir.glob("#{basename}.rbhtml*").each do |fname|
-          File.unlink(fname)
-        end
-      end
-    end
-  end
-
-
-  def test_context_scope
-    return if ENV['TEST'] && ENV['TEST'] != 'template_args'
-    data = TESTDATA['test_context_scope']
-    content = data['content']
-    expected = data['expected']
-    begin
-      File.write('base.rbhtml', data['base'])
-      File.write('part.rbhtml', data['part'])
-      engine = Tenjin::Engine.new()
-      actual = engine.render('base.rbhtml');
-      assert_text_equal(expected, actual)
-    ensure
-      _remove_files(['base', 'part'])
-    end
-  end
-
 
   def test_template_args
-    return if ENV['TEST'] && ENV['TEST'] != 'template_args'
     data = TESTDATA['test_template_args']
     content = data['content']
     expected = data['expected']
@@ -359,7 +327,9 @@ class TenjinEngineTest < Test::Unit::TestCase
       assert_not_nil(args1)
       output = engine.render('content.rbhtml', context)
     end
-    assert_equal(errormsg, ex.to_s.sub(/:0x\w+>/, '>'))
+    msg = ex.to_s.sub(/:0x[0-9a-fA-F]\w+/, ':0x12345')
+    msg = msg[0, errormsg.length-1]+'>' if defined?(RBX_VERSION)
+    assert_equal(errormsg, msg)
     # when cache file exist
     ex = assert_raise(NameError) do
       #File.unlink('content.rbhtml');
@@ -370,7 +340,10 @@ class TenjinEngineTest < Test::Unit::TestCase
       assert_equal(args1, args2)
       output = engine.render('content.rbhtml', context)
     end
-    assert_equal(errormsg, ex.to_s.sub(/:0x\w+>/, '>'))
+    #assert_equal(errormsg, ex.to_s.sub(/:0x\w+>/, '>'))
+    msg = ex.to_s.sub(/:0x[0-9a-fA-F]\w+/, ':0x12345')
+    msg = msg[0, errormsg.length-1]+'>' if defined?(RBX_VERSION)
+    assert_equal(errormsg, msg)
   ensure
     _remove_files(['content'])
   end
@@ -507,12 +480,8 @@ class TenjinEngineTest < Test::Unit::TestCase
   end
 
 
-  if ENV['TEST']
-    targetname = 'test_' + ENV['TEST']
-    for m in self.instance_methods
-      private m if m =~ /^test_/ && m != targetname
-    end
-  end
+  self.select_target_test()
+
 
 end
 

data/test/test_examples.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 54 $
-### $Release: 0.6.1 $
+### $Release: 0.6.2 $
 ### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
 ###
 

data/test/test_faq.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 45 $
-### $Release: 0.6.1 $
+### $Release: 0.6.2 $
 ### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
 ###
 

data/test/test_htmlhelper.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 52 $
-### $Release: 0.6.1 $
+### $Release: 0.6.2 $
 ### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
 ###
 

data/test/test_main.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 59 $
-### $Release: 0.6.1 $
+### $Rev: 71 $
+### $Release: 0.6.2 $
 ### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
 ###
 
@@ -211,11 +211,13 @@ class TenjinMainTest < Test::Unit::TestCase
 #    end
 
 
-  def test_execute()  # ''
+  def test_render()  # (nothing), -a render
     @options  = ""
     @input    = INPUT
     @expected = OUTPUT
     _test()
+    @options  = '-a render'
+    _test()
   end
 
 
@@ -259,6 +261,178 @@ class TenjinMainTest < Test::Unit::TestCase
   end
 
 
+  INPUT_FOR_RETRIEVE = <<END
+<div>
+<?rb if list ?>
+  <table>
+    <thead>
+      <tr>
+        <th>#</th><th>item</th>
+      </tr>
+    </thead>
+    </tbody>
+    <?rb i = 0 ?>
+    <?rb for item in list ?>
+\t<?rb i += 1 ?>
+      <tr bgcolor="${i % 2 ? "#FFCCCC" : "#CCCCFF"}">
+\t<td>\#{i}</td>
+\t<td>${item}</td>
+      </tr>
+    <?rb end ?>
+    </tbody>
+  </table>
+<?rb end ?>
+</div>
+END
+
+
+  def test_retrieve()  # -S, -a retrieve
+    @input = INPUT_FOR_RETRIEVE
+    @expected = <<'END'
+_buf = ''; 
+if list
+
+
+
+
+
+
+
+    i = 0
+    for item in list
+	i += 1
+                   escape((i % 2 ? "#FFCCCC" : "#CCCCFF").to_s); 
+
+	    escape((item).to_s); 
+
+    end
+
+
+end
+
+_buf.to_s
+END
+    @options = '-S'
+    _test()
+    @options = '-a retrieve'
+    _test()
+  end
+
+
+  def test_retrieve2()  # -SU, -SNU
+    @input = INPUT_FOR_RETRIEVE
+    @expected = <<'END'
+_buf = ''; 
+if list
+
+    i = 0
+    for item in list
+	i += 1
+                   escape((i % 2 ? "#FFCCCC" : "#CCCCFF").to_s); 
+
+	    escape((item).to_s); 
+
+    end
+
+end
+
+_buf.to_s
+END
+    @options = '-SU'
+    _test()
+    #
+    @expected = <<'END'
+    1:  _buf = ''; 
+    2:  if list
+
+   10:      i = 0
+   11:      for item in list
+   12:  	i += 1
+   13:                     escape((i % 2 ? "#FFCCCC" : "#CCCCFF").to_s); 
+
+   15:  	    escape((item).to_s); 
+
+   17:      end
+
+   20:  end
+
+   22:  _buf.to_s
+END
+    @options = '-SUN'
+    _test()
+  end
+
+
+  def test_retrieve3()  # -SC, -SNC
+    @input = INPUT_FOR_RETRIEVE
+    @expected = <<'END'
+_buf = ''; 
+if list
+    i = 0
+    for item in list
+	i += 1
+                   escape((i % 2 ? "#FFCCCC" : "#CCCCFF").to_s); 
+	    escape((item).to_s); 
+    end
+end
+_buf.to_s
+END
+    @options = '-SC'
+    _test()
+    #
+    @expected = <<'END'
+    1:  _buf = ''; 
+    2:  if list
+   10:      i = 0
+   11:      for item in list
+   12:  	i += 1
+   13:                     escape((i % 2 ? "#FFCCCC" : "#CCCCFF").to_s); 
+   15:  	    escape((item).to_s); 
+   17:      end
+   20:  end
+   22:  _buf.to_s
+END
+    @options = '-SNC'
+    _test()
+  end
+
+
+  def test_statements()  # -X, -a statements
+    @input = INPUT_FOR_RETRIEVE
+    @expected = <<'END'
+_buf = ''; 
+if list
+
+
+
+
+
+
+
+    i = 0
+    for item in list
+	i += 1
+                   
+
+	    
+
+    end
+
+
+end
+
+_buf.to_s
+END
+    @options = '-X'
+    _test()
+    @options = '-a statements'
+    _test()
+  end
+
+#  def test_dump()  # -d, -a dump
+#  end
+
+
 #  def test_indent()  # -si2
 #    @options  = "-si2"
 #    @input    = INPUT
@@ -393,7 +567,11 @@ class TenjinMainTest < Test::Unit::TestCase
     @context_file = context_filename
     @context_data = CONTEXT1
     #@exception = yaml.parser.ScannerError
-    @exception = ArgumentError
+    if defined?(RBX_VERSION)
+      @exception = RbYAML::ScannerError
+    else
+      @exception = ArgumentError
+    end
     _test()
   end
 
@@ -404,7 +582,10 @@ class TenjinMainTest < Test::Unit::TestCase
     @input    = INPUT
     @expected = OUTPUT
     @exception = NameError
-    if defined?(YARVCore)
+    if defined?(RBX_VERSION)
+      #@errormsg = "Missing or uninitialized constant: CGI"
+      @errormsg = "Missing or uninitialized constant: ERB"
+    elsif defined?(YARVCore)
       #@errormsg = "uninitialized constant Tenjin::Context::CGI"
       @errormsg = "uninitialized constant Tenjin::Context::ERB"
     else
@@ -561,4 +742,7 @@ END
   end
 
 
+  self.select_target_test()
+
+
 end

data/test/test_template.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 59 $
-### $Release: 0.6.1 $
+### $Rev: 71 $
+### $Release: 0.6.2 $
 ### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
 ###
 
@@ -15,7 +15,12 @@ class TenjinTemplateTest < Test::Unit::TestCase
 
   filename = __FILE__.sub(/\.\w+$/, '.yaml')
   #load_yaml_testdata(filename)
-  eval load_yaml_testdata(filename, :lang=>'ruby')
+  if defined?(RBX_VERSION)
+    lang = ['rubinius', 'ruby']
+  else
+    lang = 'ruby'
+  end
+  eval load_yaml_testdata(filename, :lang=>lang)
 
   def _test
 
@@ -68,7 +73,14 @@ class TenjinTemplateTest < Test::Unit::TestCase
         template.render(@context)
       end
       #assert_equal(@exception, ex.class.name)
-      assert_equal(@errormsg, ex.to_s.sub(/:0x\w+>/, '>')) if @errormsg
+      if @errormsg
+        errmsg = ex.to_s.sub(/:0x[0-9a-fA-F]+/, ':0x12345')
+        if defined?(RBX_VERSION)
+          assert_equal(@errormsg, errmsg[0, @errormsg.length-1] + '>')
+        else
+          assert_equal(@errormsg, errmsg)
+        end
+      end
       assert_equal(@filename, ex.filename) if @filename
     else
       template = @templateclass.new(@options)
@@ -110,4 +122,7 @@ END
   #def test_import_module2()
 
 
+  self.select_target_test()
+
+
 end

data/test/test_template.yaml

@@ -416,7 +416,7 @@
   desc:         lspaces
   testopts:  { spacechar: '^' }
   input*:
-   "python": |5
+    python: |4
           <?py
         i = 0
         for item in ['a', 'b', 'c']:
@@ -430,7 +430,7 @@
           <?py
         #endfor
            ?>
-   "ruby": |5
+    ruby: |4
           <?rb
         i = 0
         for item in ['a', 'b', 'c']
@@ -459,7 +459,7 @@
           
         #endfor
           
-   "ruby": |5+
+   "ruby": |5
         ^^
         i = 0
         for item in ['a', 'b', 'c']
@@ -889,7 +889,8 @@
    "ruby":  NameError
   errormsg*:
    "python": "name 'name2' is not defined"
-   "ruby":   "undefined local variable or method `name2' for #<Tenjin::Context>"
+   "ruby":   "undefined local variable or method `name2' for #<Tenjin::Context:0x12345>"
+   #"rubinius": 'undefined local variable or method `name2\' for #<Tenjin::Context:0x12345 @name="world" @_buf="<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\">\\n">'
 
 
 ##
@@ -1112,7 +1113,7 @@
 	#{{link_to('"Show '+_P("item['name']")+'"', '/items/show/'+_p("item['id']"))}}
 	#{{escape('<b>'+_P('item["name"]')+'</b>')}}
     "ruby": |
-        <?RB def link_to(label, url) ?>
+        <?RB def self.link_to(label, url) ?>
 	<?RB     require 'cgi' ?>
 	<?RB     return '<a href="%s">%s</a>' % [CGI::escape(url).gsub(/%2F/,'/'), label] ?>
 	<?RB end ?>
@@ -1144,7 +1145,7 @@
 	''', to_str(_decode_params(link_to('"Show '+_P("item['name']")+'"', '/items/show/'+_p("item['id']")))), '''
 	''', to_str(_decode_params(escape('<b>'+_P('item["name"]')+'</b>'))), '''\n''', ));
     "ruby": |
-	def link_to(label, url)
+	def self.link_to(label, url)
 	    require 'cgi'
 	    return '<a href="%s">%s</a>' % [CGI::escape(url).gsub(/%2F/,'/'), label]
 	end

data/test/test_users_guide.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 48 $
-### $Release: 0.6.1 $
+### $Release: 0.6.2 $
 ### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
 ###
 

data/test/testcase-helper.rb

@@ -1,10 +1,21 @@
 ###
-### $Rev: 42 $
-### $Release: 0.6.1 $
+### $Rev: 72 $
+### $Release: 0.6.2 $
 ### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
 ###
 
-require 'yaml'
+if defined?(RBX_VERSION)
+  require 'kwalify'
+  def load_yaml_documents_str(s, &block)
+    parser = Kwalify::Yaml::Parser.new()
+    parser.parse_documents(s, &block)
+  end
+else
+  require 'yaml'
+  def load_yaml_documents_str(s, &block)
+    YAML.load_documents(s, &block)
+  end
+end
 require 'test/unit/testcase'
 
 
@@ -19,7 +30,13 @@ def _data_convert(data, lang='ruby')
       v = data[k]
       if k[-1,1] == '*'
         v.is_a?(Hash) or raise "** assertion error"
-        data[k[0..-2]] = data.delete(k)[lang]
+        data.delete(k)
+        if lang.is_a?(Array)
+          v = v[ lang.find{|l| v[l]} ]
+        else
+          v = v[lang]
+        end
+        data[k[0..-2]] = v
       elsif v.is_a?(Hash) && v.key?(lang)
         data[k] = v[lang]
       else
@@ -39,6 +56,15 @@ end
 class Test::Unit::TestCase   # :nodoc:
 
 
+  def self.select_target_test(target_name=ENV['TEST'])
+    if target_name
+      self.instance_methods.each do |method|
+        private method if method =~ /^test_(.*)/ && $1 != target_name
+      end
+    end
+  end
+
+
   def self._untabify(str, width=8)         # :nodoc:
     list = str.split(/\t/, -1)
     return list.first if list.length == 1
@@ -72,13 +98,11 @@ class Test::Unit::TestCase   # :nodoc:
     identkey = options[:identkey] || 'name'
     list = []
     table = {}
-    YAML.load_documents(str) do |ydoc|
-      if ydoc.is_a?(Hash)
-        list << ydoc
-      elsif ydoc.is_a?(Array)
-        list += ydoc
-      else
-        raise "*** invalid ydoc: #{ydoc.inspect}"
+    load_yaml_documents_str(str) do |ydoc|
+      case ydoc
+      when Hash  ;  list << ydoc
+      when Array ;  list += ydoc
+      else       ;  raise "*** invalid ydoc: #{ydoc.inspect}"
       end
     end
     #
@@ -115,8 +139,12 @@ class Test::Unit::TestCase   # :nodoc:
       ydoc.each do |key, val|
         if key[-1] == ?*
           key = key[0, key.length-1]
-          k = special_keys.include?(key) ? 'ruby' : lang
-          val = val[k]
+          #k = special_keys.include?(key) ? 'ruby' : lang
+          if lang.is_a?(Array)
+            val = val[ lang.find{|l| val[l]} ]
+          else
+            val = val[lang]
+          end
         end
         s << "  @#{key} = #{val.inspect}\n"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tenjin
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - makoto kuwata
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-07 00:00:00 +09:00
+date: 2008-02-25 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -155,6 +155,7 @@ files:
 - test/data/users_guide/user_edit.rbhtml
 - test/data/users_guide/user_form.rbhtml
 - test/data/users_guide/user_layout.rbhtml
+- test/Rookbook.yaml
 - test/test_all.rb
 - test/test_engine.rb
 - test/test_engine.yaml
@@ -185,6 +186,7 @@ files:
 - examples/preprocessing/Makefile
 - examples/preprocessing/Rakefile
 - examples/preprocessing/select.rbhtml
+- examples/preprocessing/select.rbhtml.cache
 - examples/table
 - examples/table/Makefile
 - examples/table/Rakefile