RubyGems - tenjin - Versions diffs - 0.6.2 → 0.7.0 - Mend

tenjin 0.6.2 → 0.7.0

Files changed (282) hide show

data/CHANGES.txt +163 -0
data/MIT-LICENSE +16 -17
data/README.txt +5 -5
data/benchmark/Makefile +9 -0
data/benchmark/bench.rb +3 -2
data/bin/rbtenjin +6 -3
data/doc/docstyle.css +25 -4
data/doc/users-guide.html +2088 -1563
data/lib/tenjin.rb +784 -158
data/public_html/_layout.rbhtml +33 -0
data/public_html/css/style.css +77 -0
data/public_html/env.rbhtml +15 -0
data/public_html/favicon.ico +0 -0
data/public_html/hello.rbhtml +14 -0
data/public_html/index.rbhtml +39 -0
data/public_html/rbtenjin.cgi +188 -0
data/tenjin.gemspec +9 -6
data/test/data/examples/preprocessing/main.rb +1 -1
data/test/data/examples/preprocessing/select.rbhtml +1 -1
data/test/data/faq/{ex11-bench.rb → ex10-bench.rb} +3 -3
data/test/data/faq/ex10-content.rbhtml +8 -11
data/test/data/faq/{ex11-layout1.rbhtml → ex10-layout1.rbhtml} +0 -0
data/test/data/faq/{ex11-layout2.rbhtml → ex10-layout2.rbhtml} +0 -0
data/test/data/faq/{ex11.rb → ex10.rb} +1 -1
data/test/data/faq/{ex11.rbhtml → ex10.rbhtml} +0 -0
data/test/data/faq/{ex11.source → ex10.source} +2 -2
data/test/data/faq/{ex11_arraybuffer.result → ex10_arraybuffer.result} +1 -1
data/test/data/faq/{ex5.rbhtml → ex2.rbhtml} +0 -0
data/test/data/faq/{ex5_template_args.source → ex2_template_args.source} +1 -1
data/test/data/faq/{ex7-expr-pattern.rb → ex4-expr-pattern.rb} +1 -1
data/test/data/faq/{ex7-expr-pattern.rbhtml → ex4-expr-pattern.rbhtml} +0 -0
data/test/data/faq/{ex7_expr_pattern.result → ex4_expr_pattern.result} +1 -1
data/test/data/faq/{ex6-content.rhtml → ex5-content.rhtml} +0 -0
data/test/data/faq/{ex6-layout.rhtml → ex5-layout.rhtml} +0 -0
data/test/data/faq/{ex6.rb → ex5.rb} +2 -2
data/test/data/faq/{ex6_eruby.result → ex5_eruby.result} +1 -1
data/test/data/faq/{ex2-content.rbhtml → ex6-content.rbhtml} +0 -0
data/test/data/faq/{ex2-layout.rbhtml → ex6-layout.rbhtml} +0 -0
data/test/data/faq/{ex2_removenl.result → ex6_removenl.result} +1 -1
data/test/data/faq/ex7-m18n.rb +48 -0
data/test/data/faq/{ex8-m18n.rbhtml → ex7-m18n.rbhtml} +0 -0
data/test/data/faq/{ex8_m18n.result → ex7_m18n.result} +1 -1
data/test/data/faq/ex8-baselayout.rbhtml +8 -0
data/test/data/faq/ex8-content.rbhtml +6 -0
data/test/data/faq/{ex9-mylayout.rbhtml → ex8-mylayout.rbhtml} +0 -0
data/test/data/faq/{ex9_changelayout.result → ex8_changelayout.result} +1 -1
data/test/data/faq/ex9-baselayout.rbhtml +24 -5
data/test/data/faq/ex9-content.rbhtml +12 -6
data/test/data/faq/{ex10-customlayout.rbhtml → ex9-customlayout.rbhtml} +1 -1
data/test/data/faq/{ex10_inherit.result → ex9_inherit.result} +1 -1
data/test/data/faq/helpers1.rb +17 -0
data/test/data/faq/helpers1.rbhtml +4 -0
data/test/data/faq/helpers1.result +11 -0
data/test/data/faq/helpers2.rb +21 -0
data/test/data/faq/helpers2.rbhtml +4 -0
data/test/data/faq/helpers2.result +11 -0
data/test/data/faq/weekday1.rb +6 -0
data/test/data/faq/weekday1.rbhtml +9 -0
data/test/data/faq/weekday1.result +23 -0
data/test/data/faq/weekday2.rb +8 -0
data/test/data/faq/weekday2.rbhtml +10 -0
data/test/data/faq/weekday2.result +24 -0
data/test/data/faq/weekday3.rb +22 -0
data/test/data/faq/weekday3.rbhtml +3 -0
data/test/data/faq/weekday3.result +28 -0
data/test/data/users_guide/test_010/main.rb +14 -0
data/test/data/users_guide/test_010/result.output +13 -0
data/test/data/users_guide/test_010/views/page.rbhtml +11 -0
data/test/data/users_guide/test_011/main.rb +14 -0
data/test/data/users_guide/test_011/result.output +2 -0
data/test/data/users_guide/test_011/views/page.rbhtml +11 -0
data/test/data/users_guide/test_020/main.rb +14 -0
data/test/data/users_guide/test_020/result.output +13 -0
data/test/data/users_guide/test_020/views/page.rbhtml +11 -0
data/test/data/users_guide/test_021/main.rb +12 -0
data/test/data/users_guide/test_021/result.output +12 -0
data/test/data/users_guide/test_021/views/page.rbhtml +11 -0
data/test/data/users_guide/test_030/main.rb +14 -0
data/test/data/users_guide/test_030/result.output +23 -0
data/test/data/users_guide/test_030/views/_layout.rbhtml +10 -0
data/test/data/users_guide/test_030/views/page.rbhtml +11 -0
data/test/data/users_guide/test_040/main.rb +14 -0
data/test/data/users_guide/test_040/result.output +23 -0
data/test/data/users_guide/test_040/views/_layout.rbhtml +10 -0
data/test/data/users_guide/test_040/views/page.rbhtml +12 -0
data/test/data/users_guide/test_050/main.rb +14 -0
data/test/data/users_guide/test_050/result.output +14 -0
data/test/data/users_guide/test_050/views/_layout.rbhtml +10 -0
data/test/data/users_guide/test_050/views/page.rbhtml +13 -0
data/test/data/users_guide/test_051/main.rb +14 -0
data/test/data/users_guide/test_051/result.output +12 -0
data/test/data/users_guide/test_051/views/_layout.rbhtml +11 -0
data/test/data/users_guide/test_051/views/page.rbhtml +13 -0
data/test/data/users_guide/test_060/main.rb +14 -0
data/test/data/users_guide/test_060/result.output +29 -0
data/test/data/users_guide/test_060/views/_footer.rbhtml +3 -0
data/test/data/users_guide/test_060/views/_header.rbhtml +3 -0
data/test/data/users_guide/test_060/views/_layout.rbhtml +13 -0
data/test/data/users_guide/test_060/views/page.rbhtml +13 -0
data/test/data/users_guide/test_070/main.rb +14 -0
data/test/data/users_guide/test_070/result.output +29 -0
data/test/data/users_guide/test_070/views/_footer.rbhtml +3 -0
data/test/data/users_guide/test_070/views/_header.rbhtml +3 -0
data/test/data/users_guide/test_070/views/_layout.rbhtml +13 -0
data/test/data/users_guide/test_070/views/page.rbhtml +13 -0
data/test/data/users_guide/test_capturing/main.rb +24 -0
data/test/data/users_guide/test_capturing/result.output +28 -0
data/test/data/users_guide/test_capturing/views/_layout.rbhtml +21 -0
data/test/data/users_guide/test_capturing/views/blog-post.rbhtml +13 -0
data/test/data/users_guide/test_context/context.rb +5 -0
data/test/data/users_guide/test_context/context.yaml +4 -0
data/test/data/users_guide/test_context/example.rbhtml +5 -0
data/test/data/users_guide/test_context/result1.output +6 -0
data/test/data/users_guide/test_context/result2.output +6 -0
data/test/data/users_guide/test_context/result3.output +6 -0
data/test/data/users_guide/test_context/result4.output +6 -0
data/test/data/users_guide/test_convert/example.rbhtml +5 -0
data/test/data/users_guide/test_convert/result1.output +7 -0
data/test/data/users_guide/test_convert/result2.output +6 -0
data/test/data/users_guide/test_escape/main.rb +4 -0
data/test/data/users_guide/test_escape/result.output +5 -0
data/test/data/users_guide/test_escape/views/page.rbhtml +4 -0
data/test/data/users_guide/test_execute/example.rbhtml +6 -0
data/test/data/users_guide/test_execute/result.output +6 -0
data/test/data/users_guide/test_fragmentcache/cache.d/items/1 +5 -0
data/test/data/users_guide/test_fragmentcache/main.rb +21 -0
data/test/data/users_guide/test_fragmentcache/result.output +8 -0
data/test/data/users_guide/test_fragmentcache/result2.output +6 -0
data/test/data/users_guide/test_fragmentcache/views/items.rbhtml +10 -0
data/test/data/users_guide/test_logging/ex-logger.rb +11 -0
data/test/data/users_guide/test_logging/example.rbhtml +0 -0
data/test/data/users_guide/test_logging/result1.output +3 -0
data/test/data/users_guide/test_logging/result2.output +2 -0
data/test/data/users_guide/test_m17n/m17n.rb +44 -0
data/test/data/users_guide/test_m17n/m17n.rbhtml +5 -0
data/test/data/users_guide/test_m17n/result.output +9 -0
data/test/data/users_guide/test_m17n/result_en.output +4 -0
data/test/data/users_guide/test_m17n/result_fr.output +4 -0
data/test/data/users_guide/test_nested/main.rb +8 -0
data/test/data/users_guide/test_nested/result.output +15 -0
data/test/data/users_guide/test_nested/views/_blog_layout.rbhtml +5 -0
data/test/data/users_guide/{layout8_html.rbhtml → test_nested/views/_site_layout.rbhtml} +0 -0
data/test/data/users_guide/test_nested/views/blog_post.rbhtml +4 -0
data/test/data/users_guide/test_preprocessing/pp-example1.rb +14 -0
data/test/data/users_guide/test_preprocessing/result1a.output +11 -0
data/test/data/users_guide/test_preprocessing/result1b.output +5 -0
data/test/data/users_guide/test_preprocessing/result1c.output +6 -0
data/test/data/users_guide/test_preprocessing/result2a.output +10 -0
data/test/data/users_guide/test_preprocessing/result2b.output +10 -0
data/test/data/users_guide/test_preprocessing/result3a.output +2 -0
data/test/data/users_guide/test_preprocessing/result3b.output +2 -0
data/test/data/users_guide/test_preprocessing/views/pp-example1.rbhtml +4 -0
data/test/data/users_guide/{example12.rbhtml → test_preprocessing/views/pp-example2.rbhtml} +4 -4
data/test/data/users_guide/test_preprocessing/views/pp-example3.rbhtml +7 -0
data/test/data/users_guide/test_retrieve/example.rbhtml +10 -0
data/test/data/users_guide/test_retrieve/result1.output +11 -0
data/test/data/users_guide/test_retrieve/result2.output +11 -0
data/test/data/users_guide/test_retrieve/result3.output +11 -0
data/test/data/users_guide/test_retrieve/result4.output +8 -0
data/test/data/users_guide/test_retrieve/result5.output +5 -0
data/test/data/users_guide/test_safe/result.output +6 -0
data/test/data/users_guide/test_safe/safe-test.rb +21 -0
data/test/data/users_guide/test_safehelper/main.rb +16 -0
data/test/data/users_guide/test_safehelper/result.output +8 -0
data/test/data/users_guide/{example3.rbhtml → test_syntax_check/example.rbhtml} +0 -0
data/test/data/users_guide/test_syntax_check/result.output +2 -0
data/test/data/users_guide/test_trace/layout.rbhtml +7 -0
data/test/data/users_guide/test_trace/main.rbhtml +5 -0
data/test/data/users_guide/test_trace/result.output +16 -0
data/test/data/users_guide/test_trace/trace-example.rb +4 -0
data/test/oktest.rb +755 -0
data/test/test_all.rb +24 -14
data/test/test_engine.rb +628 -63
data/test/test_engine.yaml +40 -3
data/test/test_examples.rb +14 -12
data/test/test_faq.rb +17 -12
data/test/test_htmlhelper.rb +104 -33
data/test/test_main.rb +32 -21
data/test/test_main.yaml +2 -2
data/test/test_safe.rb +206 -0
data/test/test_store.rb +220 -0
data/test/test_tcache.rb +94 -0
data/test/test_template.rb +65 -23
data/test/test_template.yaml +7 -7
data/test/test_users_guide.rb +75 -29
data/test/testcase-helper.rb +20 -18
data/test/testunit-assertions.rb +71 -0
metadata +185 -159
data/doc-api/classes/Tenjin.html +0 -141
data/doc-api/classes/Tenjin/ArrayBufferTemplate.html +0 -270
data/doc-api/classes/Tenjin/BaseContext.html +0 -329
data/doc-api/classes/Tenjin/Context.html +0 -126
data/doc-api/classes/Tenjin/ContextHelper.html +0 -461
data/doc-api/classes/Tenjin/Engine.html +0 -616
data/doc-api/classes/Tenjin/ErubisTemplate.html +0 -166
data/doc-api/classes/Tenjin/HtmlHelper.html +0 -359
data/doc-api/classes/Tenjin/Preprocessor.html +0 -242
data/doc-api/classes/Tenjin/Template.html +0 -916
data/doc-api/created.rid +0 -1
data/doc-api/files/README_txt.html +0 -188
data/doc-api/files/lib/tenjin_rb.html +0 -136
data/doc-api/fr_class_index.html +0 -36
data/doc-api/fr_file_index.html +0 -28
data/doc-api/fr_method_index.html +0 -91
data/doc-api/index.html +0 -24
data/doc-api/rdoc-style.css +0 -208
data/doc/examples.html +0 -312
data/doc/faq.html +0 -909
data/examples/preprocessing/select.rbhtml.cache +0 -17
data/test/Rookbook.yaml +0 -14
data/test/assert-text-equal.rb +0 -45
data/test/data/faq/ex10-baselayout.rbhtml +0 -27
data/test/data/faq/ex11-content.rbhtml +0 -9
data/test/data/faq/ex8-m18n.rb +0 -77
data/test/data/users_guide/content6.rbhtml +0 -3
data/test/data/users_guide/content7.rbhtml +0 -5
data/test/data/users_guide/content8.rbhtml +0 -2
data/test/data/users_guide/contextdata.rb +0 -7
data/test/data/users_guide/datafile.rb +0 -5
data/test/data/users_guide/datafile.yaml +0 -10
data/test/data/users_guide/ex.rbhtml +0 -6
data/test/data/users_guide/ex.result +0 -7
data/test/data/users_guide/ex.script +0 -5
data/test/data/users_guide/ex_script.result +0 -7
data/test/data/users_guide/ex_source.result +0 -8
data/test/data/users_guide/example1.rbhtml +0 -12
data/test/data/users_guide/example1.result +0 -17
data/test/data/users_guide/example10.rbhtml +0 -4
data/test/data/users_guide/example10_template_args.result +0 -6
data/test/data/users_guide/example11.rbhtml +0 -5
data/test/data/users_guide/example11_template_args_result +0 -2
data/test/data/users_guide/example12_preprocessed.result +0 -10
data/test/data/users_guide/example12_preprocessed_source.result +0 -10
data/test/data/users_guide/example13.rbhtml +0 -6
data/test/data/users_guide/example13_preprocessed.result +0 -2
data/test/data/users_guide/example13_preprocessed_source.result +0 -2
data/test/data/users_guide/example14.rb +0 -32
data/test/data/users_guide/example14.rbhtml +0 -6
data/test/data/users_guide/example14_tmplclass.result +0 -15
data/test/data/users_guide/example15.rb +0 -10
data/test/data/users_guide/example15_escapefunc.result +0 -14
data/test/data/users_guide/example16.rbhtml +0 -4
data/test/data/users_guide/example16a.rb +0 -10
data/test/data/users_guide/example16a.result +0 -4
data/test/data/users_guide/example16b.rb +0 -13
data/test/data/users_guide/example16b.result +0 -4
data/test/data/users_guide/example16c.rb +0 -12
data/test/data/users_guide/example16c.result +0 -4
data/test/data/users_guide/example16d.rb +0 -27
data/test/data/users_guide/example16d.result +0 -4
data/test/data/users_guide/example1_S.result +0 -14
data/test/data/users_guide/example1_SXNC.result +0 -10
data/test/data/users_guide/example1_source.result +0 -14
data/test/data/users_guide/example2.rbhtml +0 -3
data/test/data/users_guide/example2_sb.result2 +0 -9
data/test/data/users_guide/example3_syntaxcheck.result +0 -2
data/test/data/users_guide/example4.rbhtml +0 -13
data/test/data/users_guide/example4_datafile_rb.result +0 -13
data/test/data/users_guide/example4_yaml.result +0 -13
data/test/data/users_guide/example5.rbhtml +0 -9
data/test/data/users_guide/example5_datastr_rb.result +0 -9
data/test/data/users_guide/example5_datastr_yaml.result +0 -9
data/test/data/users_guide/example6.rbhtml +0 -19
data/test/data/users_guide/example6_layout.result +0 -29
data/test/data/users_guide/example6_nested.result +0 -28
data/test/data/users_guide/example7_layout2.result +0 -13
data/test/data/users_guide/example8_layout3.result +0 -8
data/test/data/users_guide/example9.rbhtml +0 -18
data/test/data/users_guide/example9_capture.result +0 -26
data/test/data/users_guide/footer.html +0 -5
data/test/data/users_guide/footer.rbhtml +0 -4
data/test/data/users_guide/layout6.rbhtml +0 -17
data/test/data/users_guide/layout7.rbhtml +0 -9
data/test/data/users_guide/layout8_xhtml.rbhtml +0 -6
data/test/data/users_guide/layout9.rbhtml +0 -25
data/test/data/users_guide/sidemenu.rbhtml +0 -5
data/test/data/users_guide/user_app.cgi +0 -39
data/test/data/users_guide/user_app.result +0 -30
data/test/data/users_guide/user_create.rbhtml +0 -6
data/test/data/users_guide/user_edit.rbhtml +0 -7
data/test/data/users_guide/user_form.rbhtml +0 -10
data/test/data/users_guide/user_layout.rbhtml +0 -16

@@ -1188,7 +1188,7 @@
    "python": |
         <html>
           <body>
-        <?py if _context.has_key('title'): ?>
+        <?py if 'title' in _context: ?>
             <h1>${title}</h1>
         <?py #end ?>
         <?py _buf.append(_content) ?>
@@ -1401,7 +1401,7 @@
    "js": |
   errormsg*:
    "python": name 'b' is not defined
-   "ruby": "undefined local variable or method `b' for #<Tenjin::Context>"
+   "ruby": "undefined local variable or method `b' for #<Tenjin::Context:0x12345>"
    "perl": |
 	*** Error: content.plhtml
 	Global symbol "$y" requires explicit package name at (eval 999) line 3.
@@ -1799,7 +1799,7 @@
         <?PY            "FL": "Florida", } ?>
         <?PY # ?>
         <?py chk = { params['state']: ' checked="checked"' } ?>
-        <?PY codes = states.keys() ?>
+        <?PY codes = list(states.keys()) ?>
         <?PY codes.sort() ?>
         <select name="state">
           <option value="">-</option>
@@ -2037,3 +2037,40 @@
 	  <input type="submit" value="&quot;Update&quot;">\n\
 	</form>\n');
 	_buf.join('')
+- name:  test_include_with_preprocess
+  testopts:  { preprocess: true }
+  index_html*:
+    "python": |
+	## TODO (index.pyhtml)
+    "ruby": |
+        <?rb @val = 10 ?>
+	<?rb import "show.rbhtml" ?>
+	<?rb @val = 20 ?>
+	<?rb import "show.rbhtml" ?>
+	<?rb @val = 30 ?>
+	<?rb import "show.rbhtml" ?>
+    "perl": |
+	## TODO (index.plhtml)
+    "js": |
+	## TODO (index.jshtml)
+    "php": |
+	## TODO (index.phphtml)
+  show_html*:
+    "python": |
+        ## TODO (show.pyhtml)
+    "ruby": |
+        value is #{@val}
+    "perl": |
+        ## TODO (show.plhtml)
+    "js": |
+        ## TODO (show.jshtml)
+    "php": |
+        ## TODO (show.phphtml)
+  expected: |
+        value is 10
+        value is 20
+        value is 30

data/test/test_examples.rb CHANGED

@@ -1,13 +1,10 @@
 ###
-### $Rev: 54 $
-### $Release: 0.6.2 $
-### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
+### $Rev$
+### $Release: 0.7.0 $
+### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
-require 'test/unit'
-#require 'testutil'
-#require 'testcase-helper'
-require 'assert-text-equal'
+require "#{File.dirname(File.expand_path(__FILE__))}/test_all"
 #class Symbol
 #  def <=>(other)
@@ -24,20 +21,20 @@ require 'assert-text-equal'
 #  end
 #end
-require 'tenjin'
-class TenjinExamplesTest < Test::Unit::TestCase
+class TenjinExamplesTest
+  include Oktest::TestCase
   DIR = File.expand_path(File.dirname(__FILE__) + '/data/examples')
   CWD = Dir.pwd()
-  def setup
+  def before
     Dir.chdir DIR
   end
-  def teardown
+  def after
     Dir.chdir CWD
   end
@@ -55,7 +52,7 @@ class TenjinExamplesTest < Test::Unit::TestCase
     command = $1
     expected = $'
     result = `#{command}`
-    assert_text_equal(expected, result)
+    ok_(result) == expected
   end
@@ -79,3 +76,8 @@ class TenjinExamplesTest < Test::Unit::TestCase
 end
+if __FILE__ == $0
+  Oktest.run_all()
+end

data/test/test_faq.rb CHANGED

@@ -1,28 +1,25 @@
 ###
-### $Rev: 45 $
-### $Release: 0.6.2 $
-### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
+### $Rev$
+### $Release: 0.7.0 $
+### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
-require 'test/unit'
-#require 'testutil'
-#require 'testcase-helper'
-require 'assert-text-equal'
+require "#{File.dirname(File.expand_path(__FILE__))}/test_all"
-require 'tenjin'
-class TenjinFaqTest < Test::Unit::TestCase
+class TenjinFaqTest
+  include Oktest::TestCase
   DIR = File.expand_path(File.dirname(__FILE__) + '/data/faq')
   CWD = Dir.pwd()
-  def setup
+  def before
     Dir.chdir DIR
   end
-  def teardown
+  def after
     Dir.chdir CWD
   end
@@ -33,8 +30,11 @@ class TenjinFaqTest < Test::Unit::TestCase
     s =~ /\A\$ (.*?)\n/
     command = $1
     expected = $'
+    if RUBY_VERSION >= '1.9'
+      expected.gsub!(/(expecting|unexpected) kEND/, '\1 keyword_end')
+    end
     result = `#{command}`
-    assert_text_equal(expected, result)
+    ok_(result) == expected
   end
@@ -58,3 +58,8 @@ class TenjinFaqTest < Test::Unit::TestCase
 end
+if __FILE__ == $0
+  Oktest.run_all()
+end

data/test/test_htmlhelper.rb CHANGED

@@ -1,78 +1,149 @@
 ###
-### $Rev: 52 $
-### $Release: 0.6.2 $
-### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
+### $Rev$
+### $Release: 0.7.0 $
+### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
-require 'test/unit'
-#require 'testutil'
-require 'testcase-helper'
-require 'assert-text-equal'
-require 'tenjin'
+require "#{File.dirname(File.expand_path(__FILE__))}/test_all"
-class TenjinHtmlHelperTest < Test::Unit::TestCase
+class TenjinHtmlHelperTest
+  include Oktest::TestCase
+  include Tenjin::ContextHelper
+  include Tenjin::HtmlHelper
+  include Tenjin::HtmlTagHelper
+  include Tenjin::SafeHelper
+  def test_escape_xml
+    ok_(escape_xml('<>&"\'')) == '&lt;&gt;&amp;&quot;\''
+  end
+  def test_escape_html
+    ok_(escape_html('<>&"\'')) == '&lt;&gt;&amp;&quot;&#039;'
+  end
   def test_tagattr
-    actual = Tenjin::HtmlHelper.tagattr('size', 20)
+    actual = tagattr('size', 20)
     expected = ' size="20"'
-    assert_equal(expected, actual)
+    ok_(actual) == expected
     #
-    actual = Tenjin::HtmlHelper.tagattr('size', nil)
+    actual = tagattr('size', nil)
     expected = ''
-    assert_equal(expected, actual)
+    ok_(actual) == expected
     #
-    actual = Tenjin::HtmlHelper.tagattr('checked', true, 'checked')
+    actual = tagattr('checked', true, 'checked')
     expected = ' checked="checked"'
-    assert_equal(expected, actual)
+    ok_(actual) == expected
     #
-    actual = Tenjin::HtmlHelper.tagattr('checked', false, 'checked')
+    actual = tagattr('checked', false, 'checked')
     expected = ''
-    assert_equal(expected, actual)
+    ok_(actual) == expected
+    #
+    spec "return SafeString object." do
+      ok_(tagattr('size', 20)).is_a?(Tenjin::SafeString)
+    end
   end
   def test_checked
-    actual = Tenjin::HtmlHelper.checked(1==1)
+    actual = checked(1==1)
     expected = ' checked="checked"'
-    assert_equal(expected, actual)
+    ok_(actual) == expected
     #
-    actual = Tenjin::HtmlHelper.checked(1==0)
+    actual = checked(1==0)
     expected = ''
-    assert_equal(expected, actual)
+    ok_(actual) == expected
+    #
+    spec "return SafeString object." do
+      ok_(checked(1==1)).is_a?(Tenjin::SafeString)
+    end
   end
   def test_selected
-    actual = Tenjin::HtmlHelper.selected(1==1)
+    actual = selected(1==1)
     expected = ' selected="selected"'
-    assert_equal(expected, actual)
+    ok_(actual) == expected
     #
-    actual = Tenjin::HtmlHelper.selected(1==0)
+    actual = selected(1==0)
     expected = ''
-    assert_equal(expected, actual)
+    ok_(actual) == expected
+    #
+    spec "return SafeString object." do
+      ok_(selected(1==1)).is_a?(Tenjin::SafeString)
+    end
   end
   def test_disabled
-    actual = Tenjin::HtmlHelper.disabled(1==1)
+    actual = disabled(1==1)
     expected = ' disabled="disabled"'
-    assert_equal(expected, actual)
+    ok_(actual) == expected
     #
-    actual = Tenjin::HtmlHelper.disabled(1==0)
+    actual = disabled(1==0)
     expected = ''
-    assert_equal(expected, actual)
+    ok_(actual) == expected
+    #
+    spec "return SafeString object." do
+      ok_(disabled(1==1)).is_a?(Tenjin::SafeString)
+    end
+  end
+  def test_nv
+    ## generates 'name="..." value="..."' string
+    ok_(nv('user', 'guest')) == ' name="user" value="guest"'
+    ## nil is converted into empty string
+    ok_(nv('user', nil)) == ' name="user" value=""'
+    ok_(nv(nil, 'guest')) == ' name="" value="guest"'
+    ## escapes both name and value attrigute
+    ok_(nv('<user>', '<guest>')) == ' name="&lt;user&gt;" value="&lt;guest&gt;"'
+    ## if separator is passed then id attribute is added
+    ok_(nv('user', 'guest', '-')) == ' name="user" value="guest" id="user-guest"'
+  end
+  def test_js_link
+    ## generates '<a href="" onclick=""></a>'
+    ok_(js_link('Show', '$().show()')) == \
+      '<a href="javascript:undefined" onclick="$().show();return false">Show</a>'
+    ## accepts extra tag name and value
+    ok_(js_link('Show', "$().show()", :class=>"link")) == \
+      '<a href="javascript:undefined" onclick="$().show();return false" class="link">Show</a>'
+    ## escapes js code and label
+    ok_(js_link('Tiger&Bunny', 'alert("tiger&bunny")')) == \
+      '<a href="javascript:undefined" onclick="alert(&quot;tiger&amp;bunny&quot;);return false">Tiger&amp;Bunny</a>'
   end
   def test_nl2br
     s = """foo\nbar\nbaz\n"""
-    actual = Tenjin::HtmlHelper.nl2br(s)
+    actual = nl2br(s)
     expected = "foo<br />\nbar<br />\nbaz<br />\n"
-    assert_equal(expected, actual)
+    ok_(actual) == expected
+    #
+    spec "return SafeString object." do
+      ok_(actual).is_a?(Tenjin::SafeString)
+    end
   end
   def test_text2html
     s = """foo\n    bar\nba     z\n"""
-    actual = Tenjin::HtmlHelper.text2html(s)
+    actual = text2html(s)
     expected = "foo<br />\n &nbsp; &nbsp;bar<br />\nba &nbsp; &nbsp; z<br />\n"
-    assert_equal(expected, actual)
+    ok_(actual) == expected
+    #
+    spec "return SafeString object." do
+      ok_(actual).is_a?(Tenjin::SafeString)
+    end
+  end
+  def test_Cycle
+    cycle = Cycle.new('odd', 'even')
+    ok_("#{cycle}") == 'odd'
+    ok_("#{cycle}") == 'even'
+    ok_("#{cycle}") == 'odd'
+    ok_("#{cycle}") == 'even'
   end
+end
+if __FILE__ == $0
+  Oktest.run_all()
 end

data/test/test_main.rb CHANGED

@@ -1,15 +1,11 @@
 ###
-### $Rev: 71 $
-### $Release: 0.6.2 $
-### copyright(c) 2007-2008 kuwata-lab.com all rights reserved.
+### $Rev$
+### $Release: 0.7.0 $
+### copyright(c) 2007-2011 kuwata-lab.com all rights reserved
 ###
-require 'test/unit'
-#require 'testutil'
-require 'testcase-helper'
-require 'assert-text-equal'
+require "#{File.dirname(File.expand_path(__FILE__))}/test_all"
-require 'tenjin'
 DONT_INVOKE = true
 load File.dirname(File.dirname(File.expand_path(__FILE__))) + '/bin/rbtenjin'
@@ -88,7 +84,7 @@ OUTPUT = <<'END'
   <li><a&b>
       &lt;a&amp;b&gt;</li>
   <li>["c",'d']
-      [&quot;c&quot;,'d']</li>
+      [&quot;c&quot;,&#039;d&#039;]</li>
 </ul>
 END
@@ -97,7 +93,7 @@ OUTPUT2 = <<'END'
   <li><a&b>
       &lt;a&amp;b&gt;</li>
   <li>["c",'d']
-      [&quot;c&quot;,'d']</li>
+      [&quot;c&quot;,&#039;d&#039;]</li>
 </ul>
 END
 OUTPUT2.gsub!(/\n/, "\r\n")
@@ -125,7 +121,8 @@ CONTEXT2 = <<'END'
 END
-class TenjinMainTest < Test::Unit::TestCase
+class TenjinMainTest
+  include Oktest::TestCase
   filename = __FILE__.sub(/\.\w+$/, '.yaml')
   #load_yaml_testdata(filename)
@@ -165,15 +162,19 @@ class TenjinMainTest < Test::Unit::TestCase
       if @exception.is_a?(@exception)
         @exception = Kernel.const_get(@exception)
       end
-      ex = assert_raise(@exception) do
-        output = main.execute()
-      end
+      ex = ok_(proc { output = main.execute() }).raise?(@exception)
       if @errormsg
-        assert_text_equal(@errormsg, ex.to_s)
+        ok_(ex.to_s) == @errormsg
       end
     else
+      if RUBY_VERSION >= '1.9'
+        if @name =~ /lint/
+          @expected.gsub!(/kIN/, 'keyword_in')
+          @expected.gsub!(/kEND/, 'keyword_end')
+        end
+      end
       output = main.execute()
-      assert_text_equal(@expected, output)
+      ok_(output) == @expected
     end
   ensure
     to_list(@filename).each { |fname| File.unlink(fname) } if @filename
@@ -570,7 +571,11 @@ END
     if defined?(RBX_VERSION)
       @exception = RbYAML::ScannerError
     else
-      @exception = ArgumentError
+      if defined?(Psych::SyntaxError)
+        @exception = Psych::SyntaxError
+      else
+        @exception = ArgumentError
+      end
     end
     _test()
   end
@@ -580,7 +585,7 @@ END
     #@options  = "--escapefunc=CGI.escapeHTML"
     @options  = "--escapefunc=ERB::Util.html_escape"
     @input    = INPUT
-    @expected = OUTPUT
+    @expected = OUTPUT.gsub(/&#039;/, "'")
     @exception = NameError
     if defined?(RBX_VERSION)
       #@errormsg = "Missing or uninitialized constant: CGI"
@@ -592,12 +597,16 @@ END
       #@errormsg = "uninitialized constant Tenjin::Template::CGI"
       @errormsg = "uninitialized constant Tenjin::Template::ERB"
     end
+    if RUBY_VERSION >= "1.9.0"
+      @errormsg = @errormsg.gsub(/Missing uninitialized constant/, "uninitialized constant")
+      @expected = @expected.gsub(/expecting kEND/, "expecting keyword_end")
+    end
     _test()
     #
     #@options  = "-r cgi --escapefunc=CGI.escapeHTML"
     @options  = "-r erb --escapefunc=ERB::Util.html_escape"
     @input    = INPUT
-    @expected = OUTPUT
+    @expected = OUTPUT.gsub(/&#039;/, "'")
     @exception = nil
     @errormsg = nil
     _test()
@@ -639,7 +648,7 @@ END
   def test_templateclass()  # --templateclass
     @options  = "--templateclass=Tenjin::ArrayBufferTemplate -s"
     @input    = INPUT
-    @expected = SOURCE4
+    @expected = SOURCE4.sub(/_buf\.to_s/, '_buf.join')
     _test()
     @options  = "--templateclass=Tenjin::ArrayBufferTemplate"
     @expected = OUTPUT
@@ -742,7 +751,9 @@ END
   end
-  self.select_target_test()
+end
+if __FILE__ == $0
+  Oktest.run_all()
 end