zena 1.0.0.beta3 → 1.0.0.rc1

data/test/integration/zafu_compiler/calendar.yml

@@ -9,7 +9,7 @@ calendar:
   context:
     ref_date: "2006-03-18"
   src: "<div do='calendar' select='notes in site'/>"
-  res: "/<td class='sat ref'><span>18</span><ul><li><a href='/oo/projects/cleanWater/post27.html'>opening</a></li></ul><\/td>/"
+  res: "/<td class='sat ref'><span>18</span><ul><li><a href='/oo/projects-list/Clean-Water-project/post27.html'>opening</a></li></ul><\/td>/"
 
 calendar_default_else:
   context:
@@ -23,7 +23,7 @@ calendar_l_date:
     ref_date: "2009-7-17"
     node: 'zena'
   src: "<div do='calendar' select='added_notes' date='l_date' />"
-  res: "/<td class='ref'><span>17</span><ul><li><a href='/oo/projects/cleanWater/post27.html'>opening</a></li></ul></td>/"
+  res: "/<td class='ref'><span>17</span><ul><li><a href='/oo/projects-list/Clean-Water-project/post27.html'>opening</a></li></ul></td>/"
 
 calendar_hours:
   context:
@@ -31,5 +31,5 @@ calendar_hours:
     node: 'zena'
   # I do not like the way we do this, the 'else' thing is not helping. Maybe we need some
   # extra zafu tags because it' messy: we have 3 lists (days, hours, nodes) ...
-  src: "<div do='calendar' select='added_notes' date='l_date' split_hours='12'><r:if test='hour eq 0' do='[current_date]' format='%d'/><div do='void' set_class='hour_[hour]' do='each' do='node_name' join=', '/><r:else><r:if test='hour eq 0' do='[current_date]' format='%d'/><div do='void' set_class='hour_[hour]'></div></r:else></div>"
+  src: "<div do='calendar' select='added_notes' date='l_date' split_hours='12'><r:if test='hour eq 0' do='[current_date]' format='%d'/><div do='void' set_class='hour_[hour]' do='each' do='title' join=', '/><r:else><r:if test='hour eq 0' do='[current_date]' format='%d'/><div do='void' set_class='hour_[hour]'></div></r:else></div>"
   res: "/<td class='ref'>17<div class='hour_0'></div><div class='hour_12'>opening</div></td>/"

data/test/integration/zafu_compiler/complex.yml

@@ -60,43 +60,43 @@ default:
     visitor: complex_admin
     site: complex
     ref_date: 2004-09-01
-  src: "<r:emp_form_dates where='repeat_every is not null' do='each' join=', '><r:show attr='node_name'/>(<r:show attr='priority'/>, <r:show date='last_date' format='%Y-%m-%d'/>, <r:show date='next_date' format='%Y-%m-%d'/>)</r:emp_form_dates>"
+  src: "<r:emp_form_dates where='repeat_every is not null' do='each' join=', '><r:show attr='title'/>(<r:show attr='priority'/>, <r:show date='last_date' format='%Y-%m-%d'/>, <r:show date='next_date' format='%Y-%m-%d'/>)</r:emp_form_dates>"
   res: "secure_a_site(10, , ), winch_usage(10, , ), dangerous_transportations(10, 2004-03-15, 2006-03-15), engine(5, , ), transmit_information(5, 2002-05-05, 2003-05-05), fiber_junction(5, 2003-03-03, 2005-03-03), radio_usage(1, , )"
 
 courses_in_the_next_6_months:
   # custom_a = repetition interval
-  src: "<r:emp_form_dates where='last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month)' order='last_date asc, node_name ASC' do='each' join=', '><r:show attr='node_name'/>: <r:show date='next_date' format='%Y-%m-%d'/></r:emp_form_dates>"
+  src: "<r:emp_form_dates where='last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month)' order='last_date asc, title ASC' do='each' join=', '><r:show attr='title'/>: <r:show date='next_date' format='%Y-%m-%d'/></r:emp_form_dates>"
   res: "engine: , radio_usage: , secure_a_site: , winch_usage: , transmit_information: 2003-05-05"
 
 courses_in_the_next_6_months_do_syntax:
   context:
     ref_date: 2005-03-01
     # before 2005-06-01
-  src: "<ol do='emp_form_dates where last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month)' do='group' by='priority'><li set_class='priority[priority]' do='each_group' do='each' join=', '><r:show attr='node_name'/>: <r:show date='next_date' format='%Y-%m-%d'/></li></ol>"
+  src: "<ol do='emp_form_dates where last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month)' do='group' by='priority'><li set_class='priority[priority]' do='each_group' do='each' join=', '><r:show attr='title'/>: <r:show date='next_date' format='%Y-%m-%d'/></li></ol>"
   res: "<ol><li class='priority10'>secure_a_site: , winch_usage: </li><li class='priority5'>engine: , transmit_information: 2003-05-05, fiber_junction: 2005-03-03</li><li class='priority1'>radio_usage: </li></ol>"
 
 all_formations:
-  src: "<r:formations in='site' do='each' join=', '><r:show attr='node_name'/>: <r:show date='event_at'/></r:formations>"
+  src: "<r:formations in='site' do='each' join=', '><r:show attr='title'/>: <r:show date='event_at'/></r:formations>"
   res: "fiber2002: 2002-02-02, fiber2003: 2003-03-03, form2005: 2005-03-20, form2006: 2006-03-20, transm2001: 2001-06-15, transm2002: 2002-05-05, transm2003: 2003-03-20, transp2004: 2004-03-15, transp2006: 2006-04-21, vision2003: 2003-04-05"
 
 all_formations_with_people:
-  src: "<r:formations in='site' do='each' join=', '><r:show attr='node_name'/>: <r:show date='event_at'/> (<r:formation_for find='all' do='each' join=', ' do='node_name'/>)</r:formations>"
+  src: "<r:formations in='site' do='each' join=', '><r:show attr='title'/>: <r:show date='event_at'/> (<r:formation_for find='all' do='each' join=', ' do='title'/>)</r:formations>"
   res: "fiber2002: 2002-02-02 (mike), fiber2003: 2003-03-03 (joe, roger), form2005: 2005-03-20 (roger), form2006: 2006-03-20 (roger), transm2001: 2001-06-15 (roger), transm2002: 2002-05-05 (roger), transm2003: 2003-03-20 (joe), transp2004: 2004-03-15 (roger), transp2006: 2006-04-21 (roger), vision2003: 2003-04-05 (mike)"
 
 all_people_related_to_a_course:
   context:
     node: transmit_information
-  src: "<r:course_emp_dates do='each' join=', '><r:show attr='node_name'/> (last:<r:show date='last_date'/>, next:<r:show date='next_date'/>)</r:course_emp_dates>"
+  src: "<r:course_emp_dates do='each' join=', '><r:show attr='title'/> (last:<r:show date='last_date'/>, next:<r:show date='next_date'/>)</r:course_emp_dates>"
   res: "joe (last:2003-03-20, next:2004-03-20), mike (last:, next:), roger (last:2002-05-05, next:2003-05-05)"
 
 all_people_related_to_a_course_group_by_priority:
   context:
     node: transmit_information
   src: |
-    <ol do='course_emp_dates' where='last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month)' order='priority desc, last_date asc, node_name ASC' do='group' by='priority'>
+    <ol do='course_emp_dates' where='last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month)' order='priority desc, last_date asc, title ASC' do='group' by='priority'>
       <li set_class='priority[priority]' do='each_group'>
         <ol>
-          <li do='each'><r:show attr='node_name'/> (last:<r:show date='last_date'/>, next:<r:show date='next_date'/>)</li>
+          <li do='each'><r:show attr='title'/> (last:<r:show date='last_date'/>, next:<r:show date='next_date'/>)</li>
         </ol>
       </li>
     </ol>
@@ -118,16 +118,16 @@ all_people_related_to_a_course_in_6_month:
   context:
     node: transmit_information
     ref_date: 2003-04-04
-  src: "<r:course_emp_dates where='last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month)' do='each' join=', '><r:show attr='node_name'/> (last:<r:show date='last_date'/>, next:<r:show date='next_date'/>)</r:course_emp_dates>"
+  src: "<r:course_emp_dates where='last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month)' do='each' join=', '><r:show attr='title'/> (last:<r:show date='last_date'/>, next:<r:show date='next_date'/>)</r:course_emp_dates>"
   res: "mike (last:, next:), roger (last:2002-05-05, next:2003-05-05)"
 
 all_course_emp_date:
   src: |
-    <ol do='all_course_emp_dates order by priority desc, log_at asc, node_name ASC'>
+    <ol do='all_course_emp_dates order by priority desc, log_at asc, title ASC'>
     <r:group by='priority'>
       <li do='each_group' set_class='priority[priority]'>
         <ol>
-          <li do='each'><r:if test='min_next_date'><r:show date='min_next_date' tformat='%Y-%m-%d'/><r:else>ASAP</r:else></r:if> <r:show attr='node_name'/> (<r:show attr='emp_count'/>)</li>
+          <li do='each'><r:if test='min_next_date'><r:show date='min_next_date' tformat='%Y-%m-%d'/><r:else>ASAP</r:else></r:if> <r:show attr='title'/> (<r:show attr='emp_count'/>)</li>
         </ol>
       </li>
     </r:group>
@@ -166,11 +166,11 @@ all_course_emp_dates_in_six_months:
     ref_date: 2003-09-01
     # in 6 months = before 2004-03-01
   src: |
-    <ol do='all_course_emp_dates where last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month) order by priority desc, log_at asc, node_name ASC'>
+    <ol do='all_course_emp_dates where last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month) order by priority desc, log_at asc, title ASC'>
     <r:group by='priority'>
       <li do='each_group' set_class='priority[priority]'>
         <ol>
-          <li do='each'><r:if test='min_next_date'><r:show date='min_next_date' tformat='%Y-%m-%d'/><r:else>ASAP</r:else></r:if> <r:show attr='node_name'/> (<r:show attr='emp_count'/>)</li>
+          <li do='each'><r:if test='min_next_date'><r:show date='min_next_date' tformat='%Y-%m-%d'/><r:else>ASAP</r:else></r:if> <r:show attr='title'/> (<r:show attr='emp_count'/>)</li>
         </ol>
       </li>
     </r:group>
@@ -206,11 +206,11 @@ all_course_emp_dates_in_six_months_later:
     ref_date: 2004-03-01
     # in 6 months = before 2004-09-01
   src: |
-    <ol do='all_course_emp_dates where last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month) order by priority desc, log_at asc, node_name ASC'>
+    <ol do='all_course_emp_dates where last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month) order by priority desc, log_at asc, title ASC'>
     <r:group by='priority'>
       <li do='each_group' set_class='priority[priority]'>
         <ol>
-          <li do='each'><r:if test='min_next_date'><r:show date='min_next_date' tformat='%Y-%m-%d'/><r:else>ASAP</r:else></r:if> <r:show attr='node_name'/> (<r:show attr='emp_count'/>)</li>
+          <li do='each'><r:if test='min_next_date'><r:show date='min_next_date' tformat='%Y-%m-%d'/><r:else>ASAP</r:else></r:if> <r:show attr='title'/> (<r:show attr='emp_count'/>)</li>
         </ol>
       </li>
     </r:group>
@@ -245,5 +245,5 @@ all_course_emp_dates_paginate:
   context:
     ref_date: 2004-03-01
     # in 6 months = before 2004-09-01
-  src: "<r:all_course_emp_dates where='last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month)' order='priority desc, log_at asc, node_name ASC' limit='3' paginate='p'><r:link page='list'/> <r:each join=',' do='node_name'/>"
+  src: "<r:all_course_emp_dates where='last_date is null or (repeat_every is not null and next_date lt REF_DATE + 6 month)' order='priority desc, log_at asc, title ASC' limit='3' paginate='p'><r:link page='list'/> <r:each join=',' do='title'/>"
   res: "/1 <a.*>2</a> <a.*>3</a> <a.*>4</a> resp_management, secure_a_site, team_motivation/"

data/test/integration/zafu_compiler/complex_ok.yml

@@ -5,8 +5,8 @@ it_should_compile_custom_select:
     visitor: complex_admin
     site: complex
     ref_date: 2004-09-01
-  src: "<r:emp_form_dates do='each' join=', '><r:show attr='node_name'/>(<r:priority/>)</r:emp_form_dates>"
-  res: 'secureASite(10), winchUsage(10), dangerousTransportations(10), engine(5), transmitInformation(5), fiberJunction(5), formulateProblems(5), radioUsage(1)'
+  src: "<r:emp_form_dates do='each' join=', '><r:show attr='title'/>(<r:priority/>)</r:emp_form_dates>"
+  res: 'how to use the winch(10), secure a site(10), dangerous transportations(10), engine maintenance(5), information transmission(5), fiber junction(5), problem formulation(5), how to use the radio(1)'
 
 it_should_group_by_custom_select:
   context:

data/test/integration/zafu_compiler/conditional.yml

@@ -9,20 +9,29 @@ default:
 
 class_conditional:
   old_src: "<r:if kind_of='Image'><b do='#{size}' format='%.2f'/></r:if>"
-  src: "<r:Image><b do='#{size}' format='%.2f'/></r:Image>"
+  src: "<r:Image?><b do='#{size}' format='%.2f'/></r:Image?>"
   tem: "/@node.kpath_match\?\('NDI'\)/"
 
+class_conditional_in_if:
+  src: "<r:parent do='Image?'>image<r:else>not an image</r:else></r:parent>"
+  tem: "<% if var1 = @node.parent %><% if var1.kpath_match?('NDI') %>image<% elsif true %>not an image<% end %><% end %>"
+  res: "not an image"
+
+class_conditional_in_array:
+  src: "<r:nodes><r:Image?><b do='#{size}' format='%.2f'/></r:Image?></r:nodes>"
+  tem: "/Cannot scope class in list .use each before filtering./"
+
 case_when:
-  src: "<r:case><r:Document>this is a document</r:Document><r:Page>Page</r:Page><r:when test='v.status == 50'>Pub</r:when></r:case>"
-  tem: "<% if false -%><% elsif @node.kpath_match?('ND') -%>this is a document<% elsif @node.kpath_match?('NP') -%>Page<% elsif (@node.version.status==50) -%>Pub<% end -%>"
+  src: "<r:case><r:Document?>this is a document</r:Document?><r:Page?>Page</r:Page?><r:when test='v.status == 50'>Pub</r:when></r:case>"
+  tem: "<% if false %><% elsif @node.kpath_match?('ND') %>this is a document<% elsif @node.kpath_match?('NP') %>Page<% elsif (@node.version.status==50) %>Pub<% end %>"
   res: "Page"
 
 case_when_else:
-  src: "<r:case><r:Document>Document</r:Document><r:else>Not a document</r:else></r:case>"
+  src: "<r:case><r:Document?>Document</r:Document?><r:else>Not a document</r:else></r:case>"
   res: "Not a document"
 
 case_when_else_text:
-  src: "<r:case><r:Document>Document</r:Document><r:else do='t' text='Not a document'/></r:case>"
+  src: "<r:case><r:Document?>Document</r:Document?><r:else do='t' text='Not a document'/></r:case>"
   res: "Not a document"
 
 case_when_test:
@@ -43,7 +52,7 @@ if_html_tag_false_html_params:
 
 if_html_tag_elsif:
   src: "<div do='if' test='2 == 1'>A<r:elsif test='1'>B</r:elsif><r:else>C</r:else></div>"
-  tem: '<% if (2==1) -%><div>A</div><% elsif 1 -%><div>B</div><% elsif true -%><div>C</div><% end -%>'
+  tem: '<% if (2==1) %><div>A</div><% elsif 1 %><div>B</div><% elsif true %><div>C</div><% end %>'
   res: "<div>B</div>"
 
 case_when_html_tag:
@@ -71,12 +80,12 @@ if_test_param:
   context:
     f: '3'
   src: "<r:if test='params[:f] == \"3\"'>three</r:if> / <r:if test='!params[:f].blank?'>exist</r:if>"
-  tem: "<% if (params[:f]==\"3\") -%>three<% end -%> / <% if not params[:f].blank? -%>exist<% end -%>"
+  tem: "<% if (params[:f]==\"3\") %>three<% end %> / <% if not params[:f].blank? %>exist<% end %>"
   res: 'three / exist'
 
 if_in_if:
   src: "<r:if eval='id == 22'><r:if eval='1 == 2'>strange...<r:else>wrong!</r:else></r:if><r:else>other node</r:else></r:if>"
-  tem: "<% if (@node.zip==22) -%><% if (1==2) -%>strange...<% elsif true -%>wrong!<% end -%><% elsif true -%>other node<% end -%>"
+  tem: "<% if (@node.zip==22) %><% if (1==2) %>strange...<% elsif true %>wrong!<% end %><% elsif true %>other node<% end %>"
   res: "wrong!"
 
 do_if:
@@ -84,18 +93,18 @@ do_if:
   res: "<b>it's false</b>"
 
 if_has_discussion:
-  src: "<r:show attr='node_name'/>:<r:if test='discussion'>yes<r:else>no</r:else></r:if> <r:context select='42'><r:show attr='node_name'/>:<r:if test='discussion'>yes<r:else>no</r:else></r:if></r:context>"
-  res: "status:yes letter:no"
+  src: "<r:show attr='title'/>:<r:if test='discussion'>yes<r:else>no</r:else></r:if> <r:context select='42'><r:show attr='title'/>:<r:if test='discussion'>yes<r:else>no</r:else></r:if></r:context>"
+  res: "status title:yes zena enhancements:no"
 
 case_ancestor:
-  src: "<r:root><r:pages><r:each join=', '><r:case><r:when eval='ancestor?(main)'><b><r:show attr='node_name'/></b></r:when><r:else><r:show attr='node_name'/></r:else></r:case></r:each></r:pages></r:root>"
-  res: "collections, nature, people, <b>projects</b>, skins"
+  src: "<r:root><r:pages><r:each join=', '><r:case><r:when eval='ancestor?(main)'><b><r:show attr='title'/></b></r:when><r:else><r:show attr='title'/></r:else></r:case></r:each></r:pages></r:root>"
+  res: "Collections, Nature, people, <b>projects list</b>, Skins (layout themes)"
 
 on_if_ancestor_no_class:
-  old_src: "<r:root><r:pages><li do='each' on_if_node='ancestor' join=', '><r:show attr='node_name'/></li></r:pages></r:root>"
-  src: "<r:root><r:pages><li do='each' on_if='ancestor?(main)' join=', '><r:show attr='node_name'/></li></r:pages></r:root>"
+  old_src: "<r:root><r:pages><li do='each' on_if_node='ancestor' join=', '><r:show attr='title'/></li></r:pages></r:root>"
+  src: "<r:root><r:pages><li do='each' on_if='ancestor?(main)' join=', '><r:show attr='title'/></li></r:pages></r:root>"
   tem: '/var3.ancestor\?\(@node\)/'
-  res: "<li class=''>collections</li>, <li class=''>nature</li>, <li class=''>people</li>, <li class=' on'>projects</li>, <li class=''>skins</li>"
+  res: "<li class=''>Collections</li>, <li class=''>Nature</li>, <li class=''>people</li>, <li class=' on'>projects list</li>, <li class=''>Skins (layout themes)</li>"
 
 multiple_class_conditions:
   src: "<li class='unknown' do='void' one_if='custom_a == 1' two_if='custom_a == 2'>Agrippina</li>"
@@ -108,9 +117,9 @@ multiple_class_conditions_true_in_middle:
 
 # var1 = stored 'papa'
 test_ancestor_with_stored:
-  src: "<r:parent do='parent' set_papa='this' do='pages'><div do='each' super_if='papa.ancestor?(this)' do='node_name'/></r:parent>"
-  tem: "/\(var1\.ancestor\?\(var4\)\)/"
-  res: "<div class=' super'>cleanWater</div><div class=''>wiki</div>"
+  src: "<r:parent do='parent' set_papa='this' do='pages'><div do='each' super_if='papa.ancestor?(this)' do='title'/></r:parent>"
+  tem: "/_zpapa = var1.*\(_zpapa\.ancestor\?\(var4\)\)/"
+  res: "<div class=''>a wiki with Zena</div><div class=' super'>Clean Water project</div>"
 
 on_if_kind_of:
   context:
@@ -119,21 +128,21 @@ on_if_kind_of:
   res: "<b class=' popo'>parc opening</b>"
 
 on_if_attribute:
-  src: "<r:projects in='site'><div do='each' on_if='assigned' do='node_name'/></r:projects>"
+  src: "<r:projects in='site'><div do='each' on_if='assigned' do='title'/></r:projects>"
   tem: "/var2.prop\['assigned'\]. \? ' on'/"
-  res: "<div class=' on'>cleanWater</div><div class=''>wiki</div><div class=''>zena</div>"
+  res: "<div class=''>a wiki with Zena</div><div class=' on'>Clean Water project</div><div class=''>Zena the wild CMS</div>"
 
 on_if_attribute_with_edit:
-  src: "<r:projects in='site'><div do='each' on_if='assigned'><r:show attr='node_name'/><r:edit/></div></r:projects>"
+  src: "<r:projects in='site'><div do='each' on_if='assigned'><r:show attr='title'/><r:edit/></div></r:projects>"
   tem: "/var2.prop\['assigned'\]. \? ' on'/"
 
 on_if_node_main:
-  src: "<r:parent><r:pages><div do='each' on_if='id == main.id' do='node_name'>hello</div></r:pages></r:parent>"
-  res: "<div class=''>crocodiles</div><div class=' on'>status</div><div class=''>track</div>"
+  src: "<r:parent><r:pages><div do='each' on_if='id == main.id' do='title'>hello</div></r:pages></r:parent>"
+  res: "<div class=''>crocodiles</div><div class=''>Keeping things clean !</div><div class=' on'>status title</div>"
 
 if_in_tag:
-  src: "<r:form><p do='if' in='form' do='node_name'/></r:form><i do='if' in='form' do='node_name'/>done."
-  res: "/<p>status</p>.*</form>done./"
+  src: "<r:form><p do='if' in='form' do='title'/></r:form><i do='if' in='form' do='title'/>done."
+  res: "/<p>status title</p>.*</form>done./"
 
 if_in_tag_else:
   src: "<r:if in='form'>in form<r:else>not in form</r:else></r:if>"
@@ -141,23 +150,23 @@ if_in_tag_else:
 
 if_or:
   src: "<r:if eval='can_write?' or_test='origin'>hello</r:if>"
-  tem: "/<% if @node.can_write? || !@node.version.prop[\"foo\"].blank? -%>hello<% end -%>|<% if !@node.version.prop[\"foo\"].blank? || @node.can_write? -%>hello<% end -%>/"
+  tem: "/<% if @node.can_write? || !@node.version.prop[\"foo\"].blank? %>hello<% end %>|<% if !@node.version.prop[\"foo\"].blank? || @node.can_write? %>hello<% end %>/"
   res: "hello"
 
 if_or_same:
   src: "<r:if test='origin' test='d_bar'>hello</r:if>"
-  tem: "/<% if !@node.version.prop[\"foo\"].blank? || !@node.version.prop[\"bar\"].blank? -%>hello<% end -%>|<% if !@node.version.prop[\"bar\"].blank? || !@node.version.prop[\"foo\"].blank? -%>hello<% end -%>/"
+  tem: "/<% if !@node.version.prop[\"foo\"].blank? || !@node.version.prop[\"bar\"].blank? %>hello<% end %>|<% if !@node.version.prop[\"bar\"].blank? || !@node.version.prop[\"foo\"].blank? %>hello<% end %>/"
   res: ""
 
 if_now:
   src: "<r:if test='log_at &gt; now'>future<r:else>past</r:else></r:if>"
-  tem: "<% if (@node.log_at ? (@node.log_at>Time.now) : nil) -%>future<% elsif true -%>past<% end -%>"
+  tem: "<% if (@node.log_at ? (@node.log_at>Time.now) : nil) %>future<% elsif true %>past<% end %>"
   res: "past"
 
 on_if_now:
-  src: "<p do='node_name' on_if='log_at &gt; now'/>"
+  src: "<p do='title' on_if='log_at &gt; now'/>"
   tem: "/@node.log_at>Time.now.*' on'/"
-  res: "<p class=''>status</p>"
+  res: "<p class=''>status title</p>"
 
 visitor_is_anon:
   context:
@@ -168,6 +177,6 @@ visitor_is_anon:
 test_in_each:
   context:
     node: 'cleanWater'
-  src: "<ul do='pages'><li do='each' on_if='this.node_name == \"track\"' do='node_name'/></ul>"
-  tem: "/var2.node_name==\"track\"/"
-  res: "<ul><li class=''>crocodiles</li><li class=''>status</li><li class=' on'>track</li></ul>"
+  src: "<ul do='pages'><li do='each' on_if='this.title == \"Keeping things clean !\"' do='title'/></ul>"
+  tem: "/var2.prop\['title'\]==\"Keeping things clean !\"/"
+  res: "<ul><li class=''>crocodiles</li><li class=' on'>Keeping things clean !</li><li class=''>status title</li></ul>"

data/test/integration/zafu_compiler/data.yml

@@ -43,15 +43,15 @@ stat_max:
   res: "56.0"
 
 group_stat_sum:
-  src: "<r:data><r:group by='node_a'><r:each_group><r:node_a do='node_name'/>:<r:stat find='sum'/> </r:each_group></r:group></r:data>"
+  src: "<r:data><r:group by='node_a'><r:each_group><r:node_a do='title'/>:<r:stat find='sum'/> </r:each_group></r:group></r:data>"
   res: "cleanWater:27.0 wiki:102.0 "
 
 li_each_group:
-  src: "<r:data><r:group by='node_a'><li set_class='[node_a_id]_class' do='each_group'><r:node_a do='node_name'/>:<r:stat find='sum'/> </li></r:group></r:data>"
+  src: "<r:data><r:group by='node_a'><li set_class='[node_a_id]_class' do='each_group'><r:node_a do='title'/>:<r:stat find='sum'/> </li></r:group></r:data>"
   res: "<li class='21_class'>cleanWater:27.0 </li><li class='29_class'>wiki:102.0 </li>"
 
 group_stat_sum_join:
-  src: "<r:data><r:group by='node_b' join=', '><r:node_b><r:show attr='node_name'/><r:else text='undef'/></r:node_b>:<r:stat find='sum'/></r:group></r:data>"
+  src: "<r:data><r:group by='node_b' join=', '><r:node_b><r:show attr='title'/><r:else text='undef'/></r:node_b>:<r:stat find='sum'/></r:group></r:data>"
   res: "undef:96.0, cleanWater:33.0"
 
 stat_max_no_entries:

data/test/integration/zafu_compiler/dates.yml

@@ -12,12 +12,12 @@ date:
     visitor: ant
     node: 'letter'
     lang: 'fr'
-  src: "<r:void set_date='log_at'>nouvelles <r:show eval='trans(date.strftime(\"%B\"))'/> <r:show eval='date' format='%Y'/>: <r:notes where='log_at.month eq #{date}.month' in='site' do='each' join=', ' do='node_name'/></r:void>"
-  res: "nouvelles avril 2006: letter"
+  src: "<r:void set_date='log_at'>nouvelles <r:show eval='trans(date.strftime(\"%B\"))'/> <r:show eval='date' format='%Y'/>: <r:notes where='log_at.month eq #{date}.month' in='site' do='each' join=', ' do='title'/></r:void>"
+  res: "nouvelles avril 2006: zena enhancements"
 
 select_date_attr:
   src: "<p do='void' set_date='log_at'><span do='show' eval='date.year'/></p>"
-  tem: "<p><span><%= (@node.log_at ? @node.log_at.year : nil) %></span></p>"
+  tem: "<p><% _zdate = @node.log_at %><span><%= (_zdate ? _zdate.year : nil) %></span></p>"
   res: '<p><span>2006</span></p>'
 
 date_in_link:
@@ -36,7 +36,7 @@ could_be_nil:
   context:
     node: 'status'
   src: "*<r:void set_date='log_at'><r:eval>date.year</r:eval></r:void>*"
-  tem: "*<%= (@node.log_at ? @node.log_at.year : nil) %>*"
+  tem: "*<% _zdate = @node.log_at %><%= (_zdate ? _zdate.year : nil) %>*"
   res: '**' # no errors
 
 uses_datebox:
@@ -53,7 +53,7 @@ show_date_foo:
   context:
     date: '2010-05-16'
     lang: fr
-  src: "<r:show eval='date' format='%A %d.%m.%Y'/>"
+  src: "<r:show eval='main_date' format='%A %d.%m.%Y'/>"
   tem: "/main_date/"
   res: 'dimanche 16.05.2010'
 
@@ -80,8 +80,8 @@ date_tz:
 date_tz_field:
   context:
     node: nature
-  src: "<r:nodes do='each' join=', '><r:show attr='node_name'/>: <r:show date='created_at' format='%H:%M' tz='#{tz || \"Europe/Zurich\"}'/> | <r:show date='created_at' format='%H:%M' tz='UTC'/></r:nodes>"
-  res: "forest: 01:00 | 00:00, tree: 07:00 | 00:00"
+  src: "<r:nodes do='each' join=', '><r:show attr='title'/>: <r:show date='created_at' format='%H:%M' tz='#{tz || \"Europe/Zurich\"}'/> | <r:show date='created_at' format='%H:%M' tz='UTC'/></r:nodes>"
+  res: "Autumn Tree: 07:00 | 00:00, Forest: 01:00 | 00:00"
 
 date_fr:
   context:
@@ -114,6 +114,21 @@ date_from_params:
 date_from_params_in_query:
   context:
     year: 2006
-  src: "<r:date text='#{params[:year]}/04/03' format='%Y/%m/%d' do='show' eval='date' format='%Y-%m-%d'/>"
-  tem: "/_zdate = \"#\{params\[:year\]\}/04/03\".to_utc\(\"%Y/%m/%d\"\) -%>/"
-  res: "2006-04-03"
+  src: "<r:main_date text='#{params[:year]}/04/03' format='%Y/%m/%d' do='show' eval='main_date' format='%Y-%m-%d'/>"
+  tem: "/_zmaindate = \"#\{params\[:year\]\}/04/03\".to_utc\(\"%Y/%m/%d\"\) %>/"
+  res: "2006-04-03"
+
+input_date:
+  context:
+    node: opening
+  src: "<r:Post?><r:input type='date' name='date'/></r:Post?>"
+  tem: '/date_box\(@node, "date", :value => @node.prop\[.date.\], :size => 15\)/'
+  res: "/value='2011-01-16 01:00'/"
+
+test_date:
+  src: "<r:Post?><r:if test='date'></r:if></r:Post?>"
+  tem: "/@node.prop\['date'\]/"
+  
+format_date_empty_string:
+  tem: "<%= format_date('') %>"
+  res: ""

data/test/integration/zafu_compiler/display.yml

@@ -29,9 +29,11 @@ show_title_link_http:
   res: "<a href='http://example.com'>status title</a>"
 
 show_title_link_attribute:
+  context:
+    node: 'bird_jpg'
   old_src: "<r:title link='http://[name].com'/>"
-  src: "<a href='http://#{node_name}.com' do='title'/>"
-  res: "<a href='http://status.com'>status title</a>"
+  src: "<a href='http://#{title}.com' do='title'/>"
+  res: "<a href='http://bird.com'>bird</a>"
 
 show_title_link_id:
   old_src: "<r:title link='32'/>"
@@ -50,12 +52,12 @@ do_title:
 show_title_link_id_from_stored:
   # disabled
   old_src: "<r:parent><r:title link='[main.id]'/></r:parent>"
-  old_res: "<a href='/oo/projects/cleanWater/page22.html'><span id='title21'>Clean Water project</span></a>"
+  old_res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'><span id='title21'>Clean Water project</span></a>"
 
 show_title_link_id_from_stored_mode_and_format:
   # disabled
   old_src: "<r:parent><r:title link='[main.id]_blog.rss'/></r:parent>"
-  old_res: "<a href='/oo/projects/cleanWater/page22_blog.rss'><span id='_title21'>Clean Water project</span></a>"
+  old_res: "<a href='/oo/projects-list/Clean-Water-project/page22_blog.rss'><span id='_title21'>Clean Water project</span></a>"
 
 show_live_no_tag:
   src: "<r:show attr='title' live='true'/>"
@@ -120,8 +122,8 @@ zazen_code:
   res: "/<code class='css'><span class=\"tag\">body</span>/"
 
 show_name:
-  src: "my <r:show attr='node_name'/>"
-  res: "my status"
+  src: "my <r:show attr='title'/>"
+  res: "my status title"
 
 show_text:
   old_src: "my <r:show attr='text'/>"
@@ -131,15 +133,15 @@ show_text:
 show_width:
   context:
     node: "bird_jpg"
-  src: "width = <r:Image do='width'/>"
+  src: "width = <r:Image? do='width'/>"
   tem: "/@node.prop\['width'\]/"
   res: "width = 660"
 
 show_else:
   old_src: "<r:show attr='comment' else='name'/>"
-  src: "<r:show eval='comment || node_name'/>"
-  tem: "<%= (@node.prop['comment'] or @node.node_name) %>"
-  res: "status"
+  src: "<r:show eval='origin || title'/>"
+  tem: "<%= (@node.prop['origin'] or @node.prop['title']) %>"
+  res: "status title"
 
 show_default:
   old_src: "<r:show attr='d_foo' default='baz'/>"
@@ -193,7 +195,7 @@ img_tag_icon:
   context:
     node: 'cleanWater'
   src: "<r:img alt_src='icon'/>"
-  res: "<img src='/en/projects/cleanWater/image24_std.jpg?929831698949' width='545' height='400' alt='it&apos;s a lake' class='std'/>"
+  res: "<img src='/en/projects-list/Clean-Water-project/image24_std.jpg?929831698949' width='545' height='400' alt='it&apos;s a lake' class='std'/>"
 
 icon:
   context:
@@ -270,4 +272,39 @@ admin_links_for_anon:
   src: "<r:admin_links>hello</r:admin_links>"
   res: ''
 
-# ---- fixed to here
+string_limit:
+  src: "<div do=\"text.limit(10, %Q{<a href='#{url}'>read more</a>})\"/>"
+  tem: "<div><%= (@node.prop['text'] ? @node.prop['text'].limit(10, \"<a href='#{zen_url(@node)}'>read more</a>\") : nil) %></div>"
+  res: "<div>status tex<a href='http://test.host/oo/projects-list/Clean-Water-project/page22.html'>read more</a></div>"
+
+show_with_label_shortcut:
+  context:
+    lang: fr
+  src: "<li do='show' label='t' blank='hide' attr='title'/>"
+  tem: "<% if !@node.prop['title'].blank? %><li><label>titre</label> <span><%= @node.prop['title'] %></span></li><% end %>"
+  res: "<li><label>titre</label> <span>Etat des travaux</span></li>"
+
+show_with_custom_label_shortcut:
+  context:
+    lang: fr
+  src: "<li do='show' label='#{t(\"en\")}' blank='hide' attr='title'/>"
+  tem: "/anglais/"
+  res: "<li><label>anglais</label> <span>Etat des travaux</span></li>"
+
+show_with_custom_tlabel_shortcut:
+  context:
+    lang: fr
+  src: "<li do='show' tlabel='en' blank='hide' attr='title'/>"
+  tem: "/anglais/"
+  res: "<li><label>anglais</label> <span>Etat des travaux</span></li>"
+
+rendering:
+  src: "==<r:headers Content-Disposition='attachment; filename=special_#{title}.csv'/>=="
+  tem: "==<% set_headers(\"Content-Disposition\" => \"attachment; filename=special_#{@node.prop['title']}.csv\") %>=="
+  res: '===='
+
+each_whitespace:
+  src: |
+    <r:pages in='site' order='id asc' limit='3'><r:each><r:id/><r:node></r:node></r:each>
+    </r:pages>.
+  res: "12\n34\n16\n.\n"