kwartz 3.1.0 → 3.1.1

data/lib/kwartz/defun.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 136 $
-### $Release: 3.1.0 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 

data/lib/kwartz/error.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 112 $
-### $Release: 3.1.0 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 

data/lib/kwartz/helper/rails.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 134 $
-### $Release: 3.1.0 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 

data/lib/kwartz/main.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 136 $
-### $Release: 3.1.0 $
+### $Rev: 141 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 
@@ -175,8 +175,8 @@ module Kwartz
       status = 0
       begin
         main = Kwartz::Main.new(argv)
-        out = main.execute()
-        print out unless out == nil
+        output = main.execute()
+        print output unless output == nil
       rescue Kwartz::KwartzError => ex
         raise ex if $DEBUG
         $stderr.puts ex.to_s

data/lib/kwartz/node.rb

@@ -1,6 +1,6 @@
 ####
 #### $Rev: 122 $
-#### $Release: 3.1.0 $
+#### $Release: 3.1.1 $
 #### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ####
 

data/lib/kwartz/parser.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 124 $
-### $Release: 3.1.0 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 

data/lib/kwartz/translator.rb

@@ -1,6 +1,6 @@
 ####
 #### $Rev: 128 $
-#### $Release: 3.1.0 $
+#### $Release: 3.1.1 $
 #### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ####
 

data/lib/kwartz/util.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 126 $
-### $Release: 3.1.0 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 

data/lib/kwartz/util/assert-text-equal.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 117 $
-### $Release: 3.1.0 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 

data/lib/kwartz/util/testcase-helper.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 3.1.0 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 
@@ -73,17 +73,21 @@ class Test::Unit::TestCase   # :nodoc:
   end
 
 
+  SPECIAL_KEYS = %[exception errormsg]
+
   def self.load_yaml_testdata(filename, options={})   # :nodoc:
     identkey   = options[:identkey]   || 'name'
     testmethod = options[:testmethod] || '_test'
     lang       = options[:lang]
+    special_keys = options[:special_keys] || SPECIAL_KEYS
     load_yaml_documents(filename, options) do |ydoc|
       ident = ydoc[identkey]
       s  =   "def test_#{ident}\n"
       ydoc.each do |key, val|
         if key[-1] == ?*
           key = key[0, key.length-1]
-          val = val[lang]
+          k = special_keys.include?(key) ? 'ruby' : lang
+          val = val[k]
         end
         s << "  @#{key} = #{val.inspect}\n"
       end
@@ -103,9 +107,10 @@ class Test::Unit::TestCase   # :nodoc:
   def self.load_yaml_testdata_with_each_lang(filename, options={})   # :nodoc:
     identkey   = options[:identkey]   || 'name'
     testmethod = options[:testmethod] || '_test'
+    special_keys = options[:special_keys] || SPECIAL_KEYS
     langs = defined?($lang) && $lang ? [ $lang ] : options[:langs]
     langs or raise "*** #{method_name()}(): option ':langs' is required."
-    #
+
     load_yaml_documents(filename, options) do |ydoc|
       ident = ydoc[identkey]
       langs.each do |lang|
@@ -114,7 +119,8 @@ class Test::Unit::TestCase   # :nodoc:
         ydoc.each do |key, val|
           if key[-1] == ?*
             key = key[0, key.length-1]
-            val = val[lang]
+            k = special_keys.include?(key) ? 'ruby' : lang
+            val = val[k]
           end
           s << "  @#{key} = #{val.inspect}\n"
         end

data/test/test-compile.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 128 $
-### $Release: 3.1.0 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 

data/test/test-converter.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 123 $
-### $Release: 3.1.0 $
+### $Rev: 141 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 
@@ -13,13 +13,11 @@ class ConverterTest < Test::Unit::TestCase
   ## define test methods
   filename = __FILE__.sub(/\.rb$/, '.yaml')
   #load_yaml_testdata(filename)
-  load_yaml_testdata_with_each_lang(filename, :langs=>%w[eruby php])
+  langs = %w[eruby php jstl eperl]
+  load_yaml_testdata_with_each_lang(filename, :langs=>langs)
 
 
   def _test
-    #parser = Kwartz::PresentationLogicParser.get_class('css').new
-    #ruleset_list = parser.parse(@plogic)
-    ruleset_list = []
     (@properties ||= {}).each do |key, val|
       if key.is_a?(String)
         key = key.intern
@@ -27,15 +25,32 @@ class ConverterTest < Test::Unit::TestCase
         @properties[key] = val
       end
     end
+    parser = Kwartz::PresentationLogicParser.get_class('css').new
+    ruleset_list = parser.parse(@plogic.to_s)
+    #ruleset_list = []
     handler = Kwartz::Handler.get_class(@lang).new(ruleset_list, @properties)
     converter = Kwartz::TextConverter.new(handler, @properties)
-    stmt_list = converter.convert(@pdata)
-    sb = ''
-    stmt_list.each do |stmt|
-      sb << (s = stmt._inspect)
-      sb << "\n" unless s[-1] == ?\n
+    if @exception
+      error_class = @exception.split(/::/).inject(Object) {|cls, name| cls.const_get(name) }
+      errmsg = nil
+      assert_raise(error_class) do
+        begin
+          stmt_list = converter.convert(@pdata)
+        rescue => ex
+          errmsg = ex.message
+          raise ex
+        end
+      end
+      assert_equal(@errormsg, errmsg)
+    else
+      stmt_list = converter.convert(@pdata)
+      sb = ''
+      stmt_list.each do |stmt|
+        sb << (s = stmt._inspect)
+        sb << "\n" unless s[-1] == ?\n
+      end
+      assert_text_equal(@expected, sb)
     end
-    assert_text_equal(@expected, sb)
   end
 
 

data/test/test-converter.yaml

@@ -1,3 +1,176 @@
+
+# --------------------------------------------------------------------------------
+
+###
+- name:	   convert01
+  desc:    basic test
+  pdata: |
+	<ul>
+	  <li>foo</li>
+	</ul>
+  expected: |
+	print("<ul>\n")
+	print("  <li>")
+	print("foo")
+	print("</li>\n")
+	print("</ul>\n")
+
+###
+- name:	   convert02
+  desc:    marked element
+  pdata: |
+	<ul id="list">
+	  <li id="mark:item">foo</li>
+	</ul>
+  expected: |
+	print("<ul id=\"list\">\n")
+	print("  <li>")
+	print("foo")
+	print("</li>\n")
+	print("</ul>\n")
+
+###
+- name:	   convert03
+  desc:    nested element
+  pdata: |
+        <div>
+	  <div>
+	    <div id="list">
+	      <div id="mark:item">
+	        <div>foo</div>
+	      </div>
+	    </div>
+	  </div>
+	</div>
+  expected: |
+	print("<div>\n")
+	print("  <div>\n")
+	print("    <div id=\"list\">\n")
+	print("      <div>\n")
+	print("        <div>")
+	print("foo")
+	print("</div>\n")
+	print("      </div>\n")
+	print("    </div>\n")
+	print("  </div>\n")
+	print("</div>\n")
+
+###
+- name:	   convert04
+  desc:    rest text
+  pdata: |
+        foo
+	bar
+	<ul id="mark:list">
+	</ul>
+	baz
+	boo
+  expected: |
+	print("foo\nbar\n")
+	print("<ul>\n")
+	print("</ul>\n")
+	print("baz\nboo\n")
+
+###
+- name:	   convert05
+  desc:    no tags
+  pdata: |
+        foo
+	bar
+	baz
+  expected: |
+	print("foo\nbar\nbaz\n")
+
+###
+- name:	   convert06
+  desc:    not well-formed
+  pdata: |
+	<div id="foo">
+  	 <p><span></b>
+	</div>
+  expected: |
+	print("<div id=\"foo\">\n")
+	print(" <p>")
+	print("<span>")
+	print("</b>\n")
+	print("</div>\n")
+
+###
+- name:	   convert08
+  desc:    tag is not closed
+  pdata: |
+        <span>
+	<div id="list">
+	  <div id="mark:item">
+	    <div>foo
+	  </div>
+	</div>
+	</span>
+  exception*:
+    ruby:  Kwartz::ConvertError
+    php:   KwartzConvertionException
+    java:  kwartz.ConverterException
+  errormsg*:
+    ruby:  ":2: '<div>' is not closed."
+    php:   ":2: '<div>' is not closed."
+    java:  ...error message...
+
+# --------------------------------------------------------------------------------
+
+###
+- name:    convert11
+  desc:    pdata and plogic
+  pdata: |
+	<ul id="mark:list">
+	  <li id="mark:item">foo</li>
+	</ul>
+  plogic: |
+	#list {
+	  logic: {
+	    _stag;
+	    foreach (item in list) {
+	      _cont;
+	    }
+	    _etag;
+	  }
+	}
+	#item {
+	  value: item;
+	}
+  expected: |
+  	print("<ul>\n")
+	<%    foreach (item in list) {%>
+	print("  <li>")
+	print(<%=item%>)
+	print("</li>\n")
+	<%    }%>
+  	print("</ul>\n")
+
+
+###
+- name:    convert12
+  desc:    empty logic
+  pdata: |
+        <div>
+	 <ul id="mark:list">
+	  <li id="mark:item">foo</li>
+	 </ul>
+	</div>
+  plogic: |
+	#list {
+	  logic: {
+	  }
+	}
+	#item {
+	  value: item;
+	}
+  expected: |
+  	print("<div>\n")
+  	print("</div>\n")
+
+
+# --------------------------------------------------------------------------------
+
 ###
 - name:    delspan1
   desc:    <span> and id="mark:foo"
@@ -330,29 +503,3 @@
 #
 
 
-###
-- name:    unmatched
-  desc:    unmatched text to fetch pattern
-  bug:     self found
-  pdata*:
-    eruby: &unmatched_pdata |
-	foo
-	bar
-	baz
-    php: *unmatched_pdata
-    jstl: *unmatched_pdata
-    eperl: *unmatched_pdata
-
-  plogic*:
-    eruby: |
-    php: |
-    jstl: |
-    eperl: |
-
-  expected*:
-    eruby: &unmatched_expected |
-        print("foo\nbar\nbaz\n")
-    php:  *unmatched_expected
-    jstl: *unmatched_expected
-    eperl: *unmatched_expected
-

data/test/test-directives.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 117 $
-### $Release: 3.1.0 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 

data/test/test-main.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 136 $
-### $Release: 3.1.0 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 

data/test/test-parser.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 122 $
-### $Release: 3.1.0 $
+### $Release: 3.1.1 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 

data/test/test-parser.yaml

@@ -1,5 +1,5 @@
 ## $Rev: 132 $
-## $Release: 3.1.0 $
+## $Release: 3.1.1 $
 ## copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 
 ###