kwartz 3.1.2 → 3.2.0

data/lib/kwartz/translator.rb

@@ -1,6 +1,6 @@
 ####
-#### $Rev: 128 $
-#### $Release: 3.1.2 $
+#### $Rev$
+#### $Release: 3.2.0 $
 #### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ####
 
@@ -152,15 +152,16 @@ module Kwartz
 
     def parse_embedded_expr(text)
       pos = 0
-      text.scan(/@(!*)\{(.*?)\}@/) do |indicator, expr_code|
+      text.scan(/@(!*)\{(.*?)\}@/) do |indicator, expr_str|
         m = Regexp.last_match
         s = text[pos, m.begin(0) - pos]
         pos = m.end(0)
         translate_string(s) unless s.empty?
+        expr_str = parse_expr_str!(expr_str)
         case indicator
-        when nil, ''  ;  add_escaped_expr(expr_code)
-        when '!'      ;  add_plain_expr(expr_code)
-        when '!!'     ;  add_debug_expr(expr_code)
+        when nil, ''  ;  add_escaped_expr(expr_str)
+        when '!'      ;  add_plain_expr(expr_str)
+        when '!!'     ;  add_debug_expr(expr_str)
         else          ;  # do nothing
         end
       end
@@ -169,6 +170,13 @@ module Kwartz
     end
 
 
+    ## (abstract) convert expression to native expression string.
+    ## ex. 'item.name' => '$item->name', '$item->name' => '$item->name'
+    def parse_expr_str!(expr_str)
+      not_implemented
+    end
+
+
     def add_plain_expr(expr_code)
       @sb << @expr_l << expr_code << @expr_r       # ex. <%= expr_code %>
     end

data/lib/kwartz/util.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 126 $
-### $Release: 3.1.2 $
+### $Rev$
+### $Release: 3.2.0 $
 ### 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.2 $
+### $Rev$
+### $Release: 3.2.0 $
 ### 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.2 $
+### $Release: 3.2.0 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 

data/test/test-compile.rb

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

data/test/test-compile.yaml

@@ -306,3 +306,84 @@
     eperl: |
       <a href="mailto:<?= $email !>"><?= encode_entities($name) !></a>
       <a href="mailto:<?= $email !>"><?= encode_entities($name) !></a>
+
+###
+- name:   embedded_expr2
+  desc:   common expression string
+  pdata: |
+	@{variable}@
+	@{object.property}@
+	@{hash['key']}@
+	@{hash["key"]}@
+	@{hash[:key]}@
+	@{array[0]}@
+	@{array[index]}@
+	@{$unknown->style}@
+  plogic: |
+  expected*:
+    ruby: |
+	_buf = ""; _buf << ERB::Util.h(variable); _buf << "\n";
+	_buf << ERB::Util.h(object.property); _buf << "\n";
+	_buf << ERB::Util.h(hash['key']); _buf << "\n";
+	_buf << ERB::Util.h(hash["key"]); _buf << "\n";
+	_buf << ERB::Util.h(hash[:key]); _buf << "\n";
+	_buf << ERB::Util.h(array[0]); _buf << "\n";
+	_buf << ERB::Util.h(array[index]); _buf << "\n";
+	_buf << ERB::Util.h($unknown->style); _buf << "\n";
+	; _buf
+    eruby: |
+	<%=h variable %>
+	<%=h object.property %>
+	<%=h hash['key'] %>
+	<%=h hash["key"] %>
+	<%=h hash[:key] %>
+	<%=h array[0] %>
+	<%=h array[index] %>
+	<%=h $unknown->style %>
+    erubis: |
+	<%== variable %>
+	<%== object.property %>
+	<%== hash['key'] %>
+	<%== hash["key"] %>
+	<%== hash[:key] %>
+	<%== array[0] %>
+	<%== array[index] %>
+	<%== $unknown->style %>
+    pierubis: |
+	@{variable}@
+	@{object.property}@
+	@{hash['key']}@
+	@{hash["key"]}@
+	@{hash[:key]}@
+	@{array[0]}@
+	@{array[index]}@
+	@{$unknown->style}@
+    php: |
+	<?php echo htmlspecialchars($variable); ?>
+	<?php echo htmlspecialchars($object->property); ?>
+	<?php echo htmlspecialchars($hash['key']); ?>
+	<?php echo htmlspecialchars($hash["key"]); ?>
+	<?php echo htmlspecialchars($hash['key']); ?>
+	<?php echo htmlspecialchars($array[0]); ?>
+	<?php echo htmlspecialchars($array[$index]); ?>
+	<?php echo htmlspecialchars($unknown->style); ?>
+    jstl: |
+	<%@ taglib prefix="c"  uri="http://java.sun.com/jsp/jstl/core" %>
+	<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+	${variable}
+	${object.property}
+	${hash['key']}
+	${hash["key"]}
+	${hash['key']}
+	${array[0]}
+	${array[index]}
+	${$unknown->style}
+    eperl: |
+	<?= encode_entities($variable) !>
+	<?= encode_entities($object->{property}) !>
+	<?= encode_entities($hash{'key'}) !>
+	<?= encode_entities($hash{"key"}) !>
+	<?= encode_entities($hash{'key'}) !>
+	<?= encode_entities($array[0]) !>
+	<?= encode_entities($array[$index]) !>
+	<?= encode_entities($unknown->style) !>

data/test/test-converter.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 141 $
-### $Release: 3.1.2 $
+### $Rev$
+### $Release: 3.2.0 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 
@@ -18,12 +18,8 @@ class ConverterTest < Test::Unit::TestCase
 
 
   def _test
-    (@properties ||= {}).each do |key, val|
-      if key.is_a?(String)
-        key = key.intern
-        @properties.delete(key)
-        @properties[key] = val
-      end
+    (@properties ||= {}).keys.each do |key|
+      @properties[key.intern] = @properties.delete(key) if key.is_a?(String)
     end
     parser = Kwartz::PresentationLogicParser.get_class('css').new
     ruleset_list = parser.parse(@plogic.to_s)

data/test/test-converter.yaml

@@ -118,8 +118,8 @@
 # --------------------------------------------------------------------------------
 
 ###
-- name:    convert11
-  desc:    pdata and plogic
+- name:    selector1
+  desc:    selectr - marking
   pdata: |
 	<ul id="mark:list">
 	  <li id="mark:item">foo</li>
@@ -148,7 +148,105 @@
 
 
 ###
-- name:    convert12
+- name:    selector2
+  desc:    selectr - class name
+  pdata: |
+	<ul class="list">
+	  <li class="item">foo</li>
+	</ul>
+  plogic: |
+	.list {
+	  logic: {
+	    _stag;
+	    foreach (item in list) {
+	      _cont;
+	    }
+	    _etag;
+	  }
+	}
+	.item {
+	  value: item;
+	}
+  expected: |
+  	print("<ul class=\"list\">\n")
+	<%    foreach (item in list) {%>
+	print("  <li class=\"item\">")
+	print(<%=item%>)
+	print("</li>\n")
+	<%    }%>
+  	print("</ul>\n")
+
+
+###
+- name:    selector3
+  desc:    selectr - tag name
+  pdata: |
+	<ul>
+	  <html:li>foo</html:li>
+	</ul>
+  plogic: |
+	ul {
+	  logic: {
+	    _stag;
+	    foreach (item in list) {
+	      _cont;
+	    }
+	    _etag;
+	  }
+	}
+	html:li {
+	  value: item;
+	}
+  expected: |
+  	print("<ul>\n")
+	<%    foreach (item in list) {%>
+	print("  <html:li>")
+	print(<%=item%>)
+	print("</html:li>\n")
+	<%    }%>
+  	print("</ul>\n")
+
+
+###
+- name:    selector4
+  desc:    selectr - combination of marking, classname, and tagname
+  pdata: |
+	<ul id="mark:list">
+	  <ol>
+	    <li class="item">foo</li>
+	  </ol>
+	</ul>
+  plogic: |
+	#list, ol, .item {
+	  logic: {
+	    foreach (item in list) {
+	      _elem
+	    }
+	  }
+	}
+	li {
+	  value: item;
+	}
+  expected: |
+	<%    foreach (item in list) {%>
+  	print("<ul>\n")
+	<%    foreach (item in list) {%>
+	print("  <ol>\n")
+	<%    foreach (item in list) {%>
+	print("    <li class=\"item\">")
+	print(<%=item%>)
+	print("</li>\n")
+	<%    }%>
+	print("  </ol>\n")
+	<%    }%>
+	print("</ul>\n")
+	<%    }%>
+
+
+# --------------------------------------------------------------------------------
+
+###
+- name:    convert11
   desc:    empty logic
   pdata: |
         <div>
@@ -168,6 +266,57 @@
   	print("<div>\n")
   	print("</div>\n")
 
+###
+- name:    convert12
+  desc:    "'#DOCUMENT' and 'logic:'"
+  pdata: |
+	<html>
+	  <body>
+	    <h1 id="mark:title">...title...</h1>
+	    <p>...</p>
+	    <div id="mark:content">
+	      <table>
+	        <tr id="mark:list">
+		  <td id="mark:item"></td>
+		</tr>
+	      </table>
+	    </div>
+	  </body>
+	</html>
+  plogic: |
+	#DOCUMENT {
+	  logic: {
+	    _element(title)
+	    _content(content)
+	  }
+	}
+	#title {
+	  value: title;
+	}
+	#list {
+	  logic: {
+	    for item in list
+	      _elem
+	    end
+	  }
+	}
+	#item {
+	  value: item;
+	}
+  expected: |
+	print("    <h1>")
+	print(<%=title%>)
+	print("</h1>\n")
+	print("      <table>\n")
+	<%    for item in list%>
+	print("        <tr>\n")
+	print("	         <td>")
+	print(<%=item%>)
+	print("</td>\n")
+	print("	       </tr>\n")
+	<%    end%>
+	print("      </table>\n")
+
 
 # --------------------------------------------------------------------------------
 

data/test/test-directives.rb

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

data/test/test-directives.yaml

@@ -50,6 +50,7 @@
 	{{*${expr}*}}
 	{{*<c:out value="${expr}" escapeXml="false"/>*}}
 
+
 ###
 - name:      stag
   subject:   stag, Stag, STAG
@@ -102,6 +103,8 @@
 	{{*${expr}*}}foo</b>
 	{{*<c:out value="${expr}" escapeXml="false"/>*}}foo</b>
 
+
+###
 - name:      etag
   subject:   etag, Etag, ETAG
   desc:  |
@@ -153,6 +156,7 @@
 	<b>foo{{*${expr}*}}
 	<b>foo{{*<c:out value="${expr}" escapeXml="false"/>*}}
 
+
 ###
 - name:      cont
   subject:   cont, Cont, CONT
@@ -205,6 +209,7 @@
 	<b>{{*${expr}*}}</b>
 	<b>{{*<c:out value="${expr}" escapeXml="false"/>*}}</b>
 
+
 ###
 - name:      value
   subject:   value, Value, VALUE
@@ -254,6 +259,7 @@
 	<b>{{*${expr}*}}</b>
 	<b>{{*<c:out value="${expr}" escapeXml="false"/>*}}</b>
 
+
 ###
 - name:      foreach
   subject:   foreach
@@ -369,6 +375,7 @@
 	</tr>
 	{{*</c:forEach>*}}
 
+
 ###
 - name:      list
   subject:   list
@@ -462,6 +469,7 @@
 	{{*</c:forEach>*}}
 	</tr>
 
+
 ###
 - name:      foreach_ctr
   subject:   Foreach, List
@@ -573,6 +581,7 @@
 	{{*</c:forEach>*}}
 	</tr>
 
+
 ###
 - name:      foreach_tgl
   subject:   FOREACH, LIST
@@ -695,6 +704,7 @@
 	{{*</c:forEach>*}}
 	</tr>
 
+
 ###
 - name:      while
   subject:   while, loop
@@ -779,6 +789,7 @@
     jstl: |
 	*** not supported ***
 
+
 ###
 - name:      if
   subject:   if-then-else
@@ -894,6 +905,7 @@
 	</div>
 	{{*</c:otherwise></c:choose>*}}
 
+
 ###
 - name:      set
   subject:   set
@@ -946,6 +958,7 @@
 	 <td>${color}</td>
 	</tr>
 
+
 ###
 - name:      mark
   subject:   mark
@@ -998,6 +1011,7 @@
 	 <li>foo</li>
 	</ul>
 
+
 ###
 - name:      attr
   subject:   attr, Attr, ATTR
@@ -1075,6 +1089,7 @@
 	</tr>
 	</c:forEach>
 
+
 ###
 - name:      append
   subject:   append, Append, APPEND
@@ -1129,6 +1144,7 @@
 	<input type="checkbox"{{*${flag1 ? ' checked=\'checked\'' : ''}*}}>
   #    <input type="checkbox" name="flag" value="y"${flag1 ? ' checked=\'checked\'' : ''}>
 
+
 ###
 - name:      dummy
   subject:   dummy
@@ -1188,6 +1204,7 @@
 	  <li>foo</li>
 	</ul>
 
+
 ###
 - name:      default
   subject:   default, Default, DEFAULT
@@ -1225,6 +1242,7 @@
     jstl: |
 	name: <em>{{*<c:out value="${user}" default="Guest"/>*}}</em>
 
+
 ###
 - name:     replace
   common:   yes
@@ -1300,6 +1318,7 @@
 
     jstl: *replace1_expected
 
+
 ###
 - name:     replace2
   hide:     yes
@@ -1394,3 +1413,206 @@
     eperl: *expected1
 
     jstl: *expected1
+
+
+###
+- name:      expr
+  subject:   Language-independent Directive
+  desc:  |
+	Some directives can be language-independent.
+
+	.* 'mark' and 'replace_(element|content)_with_(element|content)' directives can be
+	   language-independent because their argument is element name which is
+	   language-independent.
+	.* 'dummy' directive can be language-independent because it takes dummy argument.
+	.* 'value', 'elem', 'stag', 'etag', 'cont', and 'default' directives can be
+	   language-independent if their expression argument is one of the following format.
+	   .- {{,variable,}}
+	   .- {{,object.property,}}
+	   .- {{,hash['key'],}}, {{,hash["key"],}}, {{,hash[:key],}}
+	   .- {{,array[123],}}, {{,array[var],}}
+
+	Language-independent directives are always described with id attribute.
+
+  pdata*:
+    eruby: &expr_pdata|
+	<p id="value:user">foo</p>
+	<p id="value:user.name">foo</p>
+	<p id="value:user['name']">foo</p>
+	<p id="value:user[:name]">foo</p>
+	<p id="value:user[0]">foo</p>
+	<p id="value:user[index]">foo</p>
+    php:   *expr_pdata
+    jstl:  *expr_pdata
+    eperl: *expr_pdata
+
+  expected*:
+    eruby: |
+	<p><%= user %></p>
+	<p><%= user.name %></p>
+	<p><%= user['name'] %></p>
+	<p><%= user[:name] %></p>
+	<p><%= user[0] %></p>
+	<p><%= user[index] %></p>
+
+    php: |
+	<p><?php echo $user; ?></p>
+	<p><?php echo $user->name; ?></p>
+	<p><?php echo $user['name']; ?></p>
+	<p><?php echo $user['name']; ?></p>
+	<p><?php echo $user[0]; ?></p>
+	<p><?php echo $user[$index]; ?></p>
+
+    eperl: |
+	<p><?= $user !></p>
+	<p><?= $user->{name} !></p>
+	<p><?= $user{'name'} !></p>
+	<p><?= $user{'name'} !></p>
+	<p><?= $user[0] !></p>
+	<p><?= $user[$index] !></p>
+
+    jstl: |
+	<p>${user}</p>
+	<p>${user.name}</p>
+	<p>${user['name']}</p>
+	<p>${user['name']}</p>
+	<p>${user[0]}</p>
+	<p>${user[index]}</p>
+
+
+###
+- name:      expr2
+  hide:	     yes
+  subject:   Language-independent Directive
+  desc:  |
+
+  pdata*:
+    eruby: &expr2_pdata |
+	<p id="value:user.name">foo</p>
+	<p id="Value:user['name']">foo</p>
+	<p id="VALUE:user[:name]">foo</p>
+
+	<p id="elem:user.name">foo</p>
+	<p id="Elem:user['name']">foo</p>
+	<p id="ELEM:user[:name]">foo</p>
+
+	<p id="cont:user.name">foo</p>
+	<p id="Cont:user['name']">foo</p>
+	<p id="CONT:user[:name]">foo</p>
+
+	<p id="stag:user.name">foo</p>
+	<p id="Stag:user['name']">foo</p>
+	<p id="STAG:user[:name]">foo</p>
+	
+	<p id="etag:user.name">foo</p>
+	<p id="Etag:user['name']">foo</p>
+	<p id="ETAG:user[:name]">foo</p>
+
+	<p id="default:user.name">foo</p>
+	<p id="Default:user['name']">foo</p>
+	<p id="DEFAULT:user[:name]">foo</p>
+    php:   *expr2_pdata
+    jstl:  *expr2_pdata
+    eperl: *expr2_pdata
+
+  expected*:
+    eruby: |
+	<p><%= user.name %></p>
+	<p><%=h user['name'] %></p>
+	<p><%= user[:name] %></p>
+	
+	<%= user.name %>
+	<%=h user['name'] %>
+	<%= user[:name] %>
+	
+	<p><%= user.name %></p>
+	<p><%=h user['name'] %></p>
+	<p><%= user[:name] %></p>
+	
+	<%= user.name %>foo</p>
+	<%=h user['name'] %>foo</p>
+	<%= user[:name] %>foo</p>
+	
+	<p>foo<%= user.name %>
+	<p>foo<%=h user['name'] %>
+	<p>foo<%= user[:name] %>
+	
+	<p><% if (user.name) && !(user.name).to_s.empty? then %><%= user.name %><% else %>foo<% end %></p>
+	<p><% if (user['name']) && !(user['name']).to_s.empty? then %><%=h user['name'] %><% else %>foo<% end %></p>
+	<p><% if (user[:name]) && !(user[:name]).to_s.empty? then %><%= user[:name] %><% else %>foo<% end %></p>
+
+    php: |
+	<p><?php echo $user->name; ?></p>
+	<p><?php echo htmlspecialchars($user['name']); ?></p>
+	<p><?php echo $user['name']; ?></p>
+	
+	<?php echo $user->name; ?>
+	<?php echo htmlspecialchars($user['name']); ?>
+	<?php echo $user['name']; ?>
+	
+	<p><?php echo $user->name; ?></p>
+	<p><?php echo htmlspecialchars($user['name']); ?></p>
+	<p><?php echo $user['name']; ?></p>
+	
+	<?php echo $user->name; ?>foo</p>
+	<?php echo htmlspecialchars($user['name']); ?>foo</p>
+	<?php echo $user['name']; ?>foo</p>
+	
+	<p>foo<?php echo $user->name; ?>
+	<p>foo<?php echo htmlspecialchars($user['name']); ?>
+	<p>foo<?php echo $user['name']; ?>
+	
+	<p><?php if ($user->name) { ?><?php echo $user->name; ?><?php } else { ?>foo<?php } ?></p>
+	<p><?php if ($user['name']) { ?><?php echo htmlspecialchars($user['name']); ?><?php } else { ?>foo<?php } ?></p>
+	<p><?php if ($user['name']) { ?><?php echo $user['name']; ?><?php } else { ?>foo<?php } ?></p>
+
+    eperl: |
+	<p><?= $user->{name} !></p>
+	<p><?= encode_entities($user{'name'}) !></p>
+	<p><?= $user{'name'} !></p>
+	
+	<?= $user->{name} !>
+	<?= encode_entities($user{'name'}) !>
+	<?= $user{'name'} !>
+	
+	<p><?= $user->{name} !></p>
+	<p><?= encode_entities($user{'name'}) !></p>
+	<p><?= $user{'name'} !></p>
+	
+	<?= $user->{name} !>foo</p>
+	<?= encode_entities($user{'name'}) !>foo</p>
+	<?= $user{'name'} !>foo</p>
+	
+	<p>foo<?= $user->{name} !>
+	<p>foo<?= encode_entities($user{'name'}) !>
+	<p>foo<?= $user{'name'} !>
+	
+	<p><? if ($user->{name}) { !><?= $user->{name} !><? } else { !>foo<? } !></p>
+	<p><? if ($user{'name'}) { !><?= encode_entities($user{'name'}) !><? } else { !>foo<? } !></p>
+	<p><? if ($user{'name'}) { !><?= $user{'name'} !><? } else { !>foo<? } !></p>
+
+    jstl: |
+	<p>${user.name}</p>
+	<p>${user['name']}</p>
+	<p><c:out value="${user['name']}" escapeXml="false"/></p>
+	
+	${user.name}
+	${user['name']}
+	<c:out value="${user['name']}" escapeXml="false"/>
+	
+	<p>${user.name}</p>
+	<p>${user['name']}</p>
+	<p><c:out value="${user['name']}" escapeXml="false"/></p>
+	
+	${user.name}foo</p>
+	${user['name']}foo</p>
+	<c:out value="${user['name']}" escapeXml="false"/>foo</p>
+	
+	<p>foo${user.name}
+	<p>foo${user['name']}
+	<p>foo<c:out value="${user['name']}" escapeXml="false"/>
+	
+	<p><c:out value="${user.name}" default="foo"/></p>
+	<p><c:out value="${user['name']}" escapeXml="true" default="foo"/></p>
+	<p><c:out value="${user['name']}" escapeXml="false" default="foo"/></p>
+