zena 1.0.0.rc2 → 1.0.0.rc3

data/test/integration/zafu_compiler/ajax.yml

@@ -17,14 +17,42 @@ add:
 
 edit_not_each:
   src: "<li class='blah'>this is a post <r:edit>edit post</r:edit></li>"
-  res: "/<li class='blah'>this is a post <a href='/nodes/22/edit'>edit</a></li>/"
+  res: "/<li class='blah'>this is a post <a href='/nodes/22/versions/0/edit'>edit</a></li>/"
+
+edit_in_block:
+  src: "<li do='block'><r:title/> <r:edit/></li>"
+  res: "/Ajax.Request\(\"/nodes/22/zafu\?dom_id=list1&"
+  'ajax/edit/in/block/en/list1_form.erb': "/f.text_field :title.*alt='cancel/"
+
+edit_in_block_publish:
+  src: "<li do='block'><r:title/> <r:edit publish='true'/></li>"
+  res: "/Ajax.Request\(\"/nodes/22/zafu\?dom_id=list1/"
+  'ajax/edit/in/block/publish/en/list1_form.erb': "/name='node\[v_status\]' value='50'/"
+
+edit_in_block_cancel:
+  src: "<li do='block'><r:title/> <r:edit tcancel='en'/></li>"
+  res: "/Ajax.Request\(\"/nodes/22/zafu\?dom_id=list1/"
+  'ajax/edit/in/block/cancel/en/list1_form.erb': "/link_to_remote\(\"english\"/"
+
+form_in_block:
+  src: "<li do='block'><r:form>XYZ</r:form><r:title/> <r:edit/></li>"
+  res: "/XYZ/"
+  'ajax/form/in/block/en/list1_form.erb': "/XYZ/"
+  'ajax/form/in/block/en/list1.erb': "/XYZ/"
+
+form_in_block_edit_only:
+  src: "<li do='block'><r:form on='edit'>XYZ</r:form><r:title/> <r:edit/></li>"
+  res: "!/XYZ/"
+  'ajax/form/in/block/edit/only/en/list1_form.erb': "/XYZ/"
+  'ajax/form/in/block/edit/only/en/list1.erb': "!/XYZ/"
 
 add_each_no_form:
   src: "<ul do='children' id='things'><li do='each'>I <p do='title'>blah</p></li><li do='add'/></ul>"
+  tem: "!/</ul><ul></ul>/" # bug in closing group with [add].
   res: "/<ul><li.*id='things_add'.*li.*class='form' id='things_form'.*form.*I <p><input id=.things_title. name=.node\[title\]. .*type=.text..*hidden/"
 
 add_each_no_form_date:
-  src: "<ul do='children' id='things'><li do='each'>I <p do='show' date='event_at' tformat='short_date'>blah</p></li><li do='add'/></ul>"
+  src: "<ul do='children' id='things'><li do='each'>I <p do='show' attr='event_at' tformat='short_date'>blah</p></li><li do='add'/></ul>"
   res: "/<ul><li.*id='things_add'.*li.*id='things_form'.*form.*I <p>.*date_box.*name='node\[event_at\]' type='text' value.*hidden/"
 
 add_each_no_form_focus:
@@ -67,7 +95,7 @@ each_add_with_form_klass_set:
   res: "!/hidden.*node\[klass\].*Node.*select.*node\[klass\]/"
 
 each_add_with_select:
-  src: "<r:children><r:each do='title'/><r:add/><r:form><select name='icon_id' nodes='images in project' selected='[main.icon_id]_abc'/></r:form></r:children>"
+  src: "<r:children><r:each do='title'/><r:add/><r:form><r:select name='icon_id' nodes='images in project' selected='[main.icon_id]_abc'/></r:form></r:children>"
   'ajax/each/add/with/select/en/list1_form.erb': '/map.|r| \[r.name, r.zip.to_s\]., \"#.@node.icon_zip._abc\"\)/'
   tem: "/nodes.kpath LIKE 'NDI%'/"
 
@@ -75,7 +103,20 @@ each_edit_with_form:
   context:
     node: 'wiki'
   src: "<r:children><li do='each'><r:show attr='title'>blah</r:show> <r:edit>edit</r:edit></li>\n<r:form><li><form>this is the form</form></li></r:form></r:children>"
-  res: "/<li id='list1_30'>bird <a href='/nodes/30/edit' onclick='new Ajax.Request\(\"/nodes/30/edit\?.*t_url=ajax%2Feach%2Fedit%2Fwith%2Fform%2Flist1_form/"
+  res: "/<li id='list1_30'>bird <a href='/nodes/30/versions/0/edit' onclick='new Ajax.Request\(\"/nodes/30/zafu\?.*t_url=ajax%2Feach%2Fedit%2Fwith%2Fform%2Flist1_form/"
+
+form_with_dictionary:
+  context:
+    node: 'wiki'
+  src: "<r:load dictionary='/Default skin/translations'><r:children><li do='each'><span do='t(\"foo#{origin}\")'/> <r:edit>edit</r:edit></li>\n<li do='form'><r:select name='origin' values=',en,fr,de' tshow=',en,fr,de'/></li></r:children></r:load>"
+  # Partial should lazy load dictionary
+  'ajax/form/with/dictionary/en/list1_form.erb': "/_zdict = load_dictionary/"
+  'ajax/form/with/dictionary/en/list1.erb': "/_zdict = load_dictionary.*_zdict.get\(\"foo\#\{@node.prop\['origin'\]\}\"\)/"
+
+block_dictionary:
+  src: "<r:load dictionary='/Default skin/translations'><r:block>...</r:block></r:load>"
+  # Partial should lazy load dictionary
+  'ajax/block/dictionary/en/list1.erb': "/_zdict = load_dictionary/"
 
 make_form:
   src: "<ul do='children'><li do='each' do='title'/><li do='add'/></ul>"
@@ -128,7 +169,8 @@ live_filter:
   context:
     node: cleanWater
   src: "<r:filter live='true'/><r:block><ol do='pages where title like \"#{params[:f]}%\"'><li do='each' do='title'/></ol></r:block>"
-  tem: "/ml1.value LIKE \?.*, \"#\{params\[:f\]\}%\"/"
+  # Make sure a unique_name is set for the given block
+  tem: "/name='t_url' value='ajax/live/filter/list1'.*<% filter_form\(@node.*ml1.value LIKE \?.*, \"#\{params\[:f\]\}%\"/"
   'ajax/live/filter/en/list1.erb': "/<div id='list1.*, \"#\{params\[:f\]\}%\".*var2.prop\['title'\]/"
   res: "/<input type='text' name='f'.*<div id='list1'><ol><li>crocodiles</li><li>Keeping things clean !</li><li>status title</li></ol></div>/"
 
@@ -143,26 +185,26 @@ live_filter_single_element:
 live_filter_select_options:
   context:
     node: cleanWater
-  src: "<r:filter live='true' do='select' name='f' values='1,2'/><r:block><ol do='pages where title like \"#{params[:f]}%\"'><li do='each' do='title'/></ol></r:block>"
+  src: "<r:filter live='true' do='select' param='f' values='1,2'/><r:block><ol do='pages where title like \"#{params[:f]}%\"'><li do='each' do='title'/></ol></r:block>"
   tem: "/select name=.f.><%= options_for_select\(\[.1., .2.\], params\[:f\].to_s/"
   'ajax/live/filter/select/options/en/list1.erb': "/<div id='list1'.*params\[:f\]/"
   res: "/<select name='f'.*<div id='list1'><ol><li>crocodiles</li><li>Keeping things clean !</li><li>status title</li></ol></div>/"
 
 draggable_do_syntax:
   src: "<r:images in='site' do='each' draggable='all' do='img' mode='pv'/>"
-  tem: "/add_drag_id\(\"drag_#\{var2.zip\}\"/"
+  tem: "/add_drag_id\(%Q\{drag_#\{var2.zip\}\}/"
   res: "/id='drag_30'><img src='/en/image30_pv.jpg\?967816914293'/"
   js: '/"drag_24"\].each.*Zena.draggable\(item, false\)/'
 
 draggable_true:
   # should use 'drag_handle' class
   src: "<r:link draggable='true'><b do='title'/></r:link>"
-  tem: "/span class='drag_handle'.*add_drag_id\(\"drag_\#\{@node.zip\}\", .*drag_handle/"
+  tem: "/span class='drag_handle'.*add_drag_id\(%Q\{drag_\#\{@node.zip\}\}, .*drag_handle/"
 
 draggable_on_each_with_id:
   src: "<ul do='pages in site'><li do='each'><b do='link' draggable='true'/> <r:edit/></li></ul>"
   # should not use each id
-  tem: "/li id='<%= %Q\{list1_#\{var2.zip\}\}.*%Q\{drag_#\{var2.zip\}\}.*add_drag_id\(\"drag_#\{var2.zip\}\"/"
+  tem: "/li id='<%= %Q\{list1_#\{var2.zip\}\}.*%Q\{drag_#\{var2.zip\}\}.*add_drag_id\(%Q\{drag_#\{var2.zip\}\}/"
 
 drag_with_form:
   src: "<table do='pages in site'>
@@ -172,31 +214,48 @@ drag_with_form:
         <td class='edit'> <r:edit class='edit'>éditer</r:edit></td>
       </tr>
     </table>"
-  tem: "/tr id='<%= %Q\{list1_#\{var2.zip\}\}.*<div[^>]+id='<%= %Q\{drag_#\{var2.zip\}\}.*add_drag_id\(\"drag_#\{var2.zip\}\"/"
+  tem: "/<span class='drag' id='<%= %Q\{drag_#\{var2.zip\}\}.*<% add_drag_id\(%Q\{drag_#\{var2.zip\}\}/"
+
+drag_with_form_not_in_form:
+  src: "<table do='pages in site'>
+      <tr do='add'/>
+      <tr do='each'>
+        <td><r:link draggable='true'><b do='title'/></r:link></td>
+        <td class='edit'> <r:edit class='edit'>éditer</r:edit></td>
+      </tr>
+    </table>"
+  tem: "!/add_drag_id.*add_drag_id/"
+
+drag_on_each_with_make_form:
+  src: "<ul do='pages in site'>
+      <li do='add'/>
+      <li do='each' draggable='true' do='link'/>
+    </ul>"
+  tem: "/add_drag_id\(%Q\{list1_#\{var2.zip\}\},/"
 
 draggable_existing_class:
   # should use 'drag_handle' class
   src: "<r:link draggable='true'><r:img class='drag_handle' mode='tiny'/> <r:title/></r:link>"
   tem: "!/span class='drag_handle'/"
-  res: "/div class='drag' id='drag_22'><a href='.*22.*img src='/images/ext/page_tiny.png' .*class='drag_handle'/> status title/"
+  res: "/span class='drag' id='drag_22'><a href='.*22.*img src='/images/ext/page_tiny.png' .*class='drag_handle'/> status title/"
 
 draggable_existing_class_do:
   # should use 'drag_handle' class
   src: "<r:link draggable='drag_img'><b class='drag_img' do='img' mode='tiny'/> blah</r:link>"
   tem: "!/span class='drag_handle'|span class='drag_img'/"
-  res: "/div class='drag' id='drag_22'><a href='.*22.*<b class='drag_img'.*img src='/images/ext/page_tiny.png'/"
+  res: "/span class='drag' id='drag_22'><a href='.*22.*<b class='drag_img'.*img src='/images/ext/page_tiny.png'/"
 
 draggable_in_block:
   # should use 'hooba' class
   src: "<r:block><r:link draggable='hooba'/></r:block>"
-  tem: "/add_drag_id\(\"drag_\#\{@node.zip\}\", .*hooba/"
-  res: "<div id='list1'><div class='drag' id='drag_22'><span class='hooba'>&nbsp;</span><a href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a></div></div>"
+  tem: "/add_drag_id\(%Q\{drag_\#\{@node.zip\}\}, .*hooba/"
+  res: "<div id='list1'><span class='drag' id='drag_22'><span class='hooba'>&nbsp;</span><a href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a></span></div>"
   js:  "/Zena.draggable\(item, \"hooba\"\)/"
 
 draggable_with_id_set:
   # should not change original id
   src: "<h1 id='title' do='title' draggable='true'/>"
-  tem: "/<h1 id='title'><span class='drag' id='<%= %Q\{drag_#\{@node.zip\}\} %>'><span class='drag_handle'>&nbsp;</span><% add_drag_id\(\"drag_#\{@node.zip\}/"
+  tem: "/<h1 id='title'><span class='drag' id='<%= %Q\{drag_#\{@node.zip\}\} %>'><span class='drag_handle'>&nbsp;</span><% add_drag_id\(%Q\{drag_#\{@node.zip\}/"
 
 unlink:
   context:
@@ -235,7 +294,7 @@ drop_add_link:
   # without the ugly inspect, this would be '#{id}' or "\#{id}"
   tem: "/drop_node_path.*\"node\[favorite_id\]\" => \"\\\\#\{id\}\"/"
   res: "<div class='drop' id='list1'>drop</div>"
-  js: "/Droppables.add\('list1'.*/nodes/22/drop.*node%5Bfavorite_id%5D=%23%7Bid%7D"
+  js: "/Droppables.add\('list1'.*/nodes/22/drop.*node\[favorite_id\]=%23%7Bid%7D"
 
 drop_var_scope:
   src: "<div do='visitor.node'><div do='drop' add='favorite' change='receiver'><r:favorites>.</r:favorites></div></div>"
@@ -247,17 +306,17 @@ drop_done_remove:
 
 drop_param:
   src: "<r:drop change='params' d='foo'>params[:d] = <r:show eval='params[:d]'/></r:drop>"
-  tem: "/<div class='drop' id='list1'><% add_drop_id\(\"list1\", :url => drop_node_path\(@node.*:change => \"params\", :d => \"foo\"/"
+  tem: "/<div class='drop' id='list1'><% add_drop_id\(%Q\{list1\}, :url => drop_node_path\(@node.*:change => \"params\", :d => \"foo\"/"
   res: "<div class='drop' id='list1'>params[:d] = </div>"
   js: '/Droppables.add\(.list1.*d=foo/'
 
 drop_param_in_each:
   src: "<r:pages do='each' do='drop' change='params' d='foo'><r:show eval='params[:d]'/></r:pages>"
-  tem: "/<div class='drop' id='<%= %Q\{list1_#\{var2.zip\}\} %>'><% add_drop_id\(\"list1_#\{var2.zip\}\"/"
+  tem: "/<div class='drop' id='<%= %Q\{list1_#\{var2.zip\}\} %>'><% add_drop_id\(%Q\{list1_#\{var2.zip\}\}/"
 
 update_target:
   src: "UT: <div id='foo' do='block'>...</div> <r:link update='foo'/>"
-  tem: "/UT: <div id='foo'>...</div> .*Ajax.Request.*:dom_id => \"foo\"/"
+  tem: "/UT: <div id='foo'>...</div> .*Ajax.Request.*:dom_id => %Q\{foo\}/"
 
 update_target_encode_params:
   context:
@@ -268,7 +327,7 @@ update_target_encode_params:
 
 include_update_target:
   src: "IUT: <r:include template='/ajax/update/target'><r:with part='foo'><r:show attr='title'/></r:with></r:include>"
-  tem: "/IUT: UT: <div id='foo'><%= @node.prop\['title'\] %></div> <a .*zen_path.*onclick='new Ajax.Request/"
+  tem: "/IUT: UT: <div id='foo'><%= h @node.prop\['title'\] %></div> <a .*zen_path.*onclick='new Ajax.Request/"
 
 id_in_each_group_should_be_scoped:
   src: "<ul do='comments from nodes in site' do='group' by='discussion_id'><li do='each'><r:node do='block' do='title'/></li></ul>"
@@ -277,7 +336,7 @@ id_in_each_group_should_be_scoped:
 link_page_next:
   context:
     pak: 2
-  src: "<div id='foo' do='block' do='nodes in site' limit='3' order='zip' paginate='pak'><r:link page='previous'/> | <r:pak/> | <r:link update='foo' page='next'/> || <r:each join=',' do='[id]'/></div>"
+  src: "<div id='foo' do='block' do='nodes in site' limit='3' order='zip' paginate='pak'><r:link page='previous'/> | <r:pak/> | <r:link update='foo' page='next'/></div>"
   res: "/<a href='/oo/projects-list/Clean-Water-project/page22.html\?pak=1'>1</a> \| 2 \| .*22/zafu\?dom_id=foo.*pak=3.*>3</a>/"
 
 link_page_list:
@@ -314,4 +373,26 @@ toggle_bad_rel:
     rel: bad
   src: "<ul do='pages'><li do='each' toggle='#{params[:rel]}' for='visitor.node' do='title'/></ul>"
   res: "/<ul><li class='toggle' id='list1_26'>crocodiles</li>/"
-  js: "/list1_26.*each/"
+  js: "/list1_26.*each/"
+
+js:
+  src: "x <r:js>alert('ho');</r:js> y"
+  tem: "x <% js_data << \"alert('ho');\" %> y"
+  res: "x  y"
+  js: "<script type=\"text/javascript\">\n//<![CDATA[\nalert('ho');\n//]]>\n</script>"
+
+js_dyn:
+  src: "x <r:js>alert('ho <r:title/>');</r:js> y"
+  tem: "x <% js_data << capture do %>alert('ho <%= @node.prop['title'] %>');<% end %> y"
+  res: "x  y"
+  js: "<script type=\"text/javascript\">\n//<![CDATA[\nalert('ho status title');\n//]]>\n</script>"
+
+filter_in_list:
+  # Should move to up node and not raise an error.
+  src: "<ul do='pages in site'><r:block></r:block><li do='filter' live='true'/></ul>"
+  tem: "/zafu_node_path\(@node\)/"
+  res: "/nodes/22/zafu/"
+
+ajax:
+  src: "<r:ajax? do='js'>alert('ajax');</r:ajax?>"
+  tem: "<% if params[:s] %><% js_data << \"alert('ajax');\" %><% end %>"

data/test/integration/zafu_compiler/basic.yml

@@ -9,21 +9,6 @@ default:
 
 #----------- fixed up to here
 
-flash_messages_both:
-  src: "<r:flash_messages/>"
-  tem: "/id.*messages.*notice.*flash.*notice.*error.*flash.*error/"
-  res: "<div id='messages'></div>"
-
-flash_messages_error:
-  src: "<r:flash_messages show='error'/>"
-  tem: "/id.*messages.*error.*flash.*error/"
-  res: "<div id='messages'></div>"
-
-flash_messages_notice:
-  src: "<r:flash_messages show='notice'/>"
-  tem: "/id.*messages.*notice.*flash.*notice/"
-  res: "<div id='messages'></div>"
-
 show_author_short:
   src: "<div class='subtitle' do='show_author'><b>SI</b> - 05.12</div>"
   tem: "<div class='subtitle'><b><%= @node.version.author.initials %></b> - <%= format_date(@node.version.updated_at, :format => \"%m.%d\") %></div>"
@@ -196,34 +181,6 @@ do_ignore:
   src: "<ul do='ignore' do='children' do='each' tag='li'><r:link/></ul>"
   res: ""
 
-name_title:
-  src: "title: <h1 id='lala' do='show' name='title' attr='title'>blah</h1>"
-  res: "title: <h1 id='lala'>status title</h1>"
-
-include_with:
-  src: "include_with: <r:include template='/basic/name/title'><h1 do='with' part='title' attr='id'/>"
-  res: "include_with: title: <h1 id='lala'>22</h1>"
-
-include_with_empty:
-  src: "include_with: <r:include template='/basic/name/title'><r:with part='title'/>"
-  res: "include_with: title: "
-
-id_name:
-  src: "name_with_name: My name is <b do='void' name='bob'>Bob</b>.<r:void id='comment'> I am happy.</r:void>"
-  res: "name_with_name: My name is <b>Bob</b>. I am happy."
-
-include_named:
-  src: "include_named: <r:include template='/id/name'><r:with part='bob'>John</r:with></r:include>"
-  res: "include_named: name_with_name: My name is <b>John</b>. I am happy."
-
-# this test is a dummy used by include_context
-context_dummy:
-  src: "CD: <r:pages in='site' where='title like \"s%\"' name='pages'><r:each join=', ' do='title'/></r:pages>"
-  res: "CD: skins, status"
-
-include_context:
-  src: "IC: <r:include template='/context/dummy'><r:with part='pages'><r:each join=' / ' do='title'/></r:with></r:include>"
-  res: "IC: CD: skins / status"
 
 content_for_layout:
   src: "<r:content_for_layout>blah blah</r:content_for_layout>"
@@ -316,15 +273,6 @@ design_by_options:
   src: "<li do='design' skin='dark' by='vador' href='http://teti.ch'></li>"
   res: "<li><i>dark</i>, design by <a href='http://teti.ch'>vador</a></li>"
 
-#comments_with_params:
-#  src: "<r:comments order='date desc'><r:each join=', ' do='[title]'/></r:comments>"
-#  tem: "."
-
-comments_shown_if_empty_but_can_comment:
-  src: "<r:comments><r:each do='[title]'/><r:add/></r:comments>"
-  tem: "/if \(list1 = @node.comments\) \|\| \(@node.can_comment\? && list1=\[\]\) %>/"
-
-
 
 captcha:
   context:

data/test/integration/zafu_compiler/calendar.yml

@@ -7,29 +7,53 @@ default:
 
 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-list/Clean-Water-project/post27.html'>opening</a></li></ul><\/td>/"
+    date: "2006-03-18"
+  src: "<div do='calendar' attr='date' select='posts where #{cal_start} <= date and date < #{cal_end} in project'/>"
+  res: "/<td><p>15</p><ol><li><a href='/oo/projects-list/Clean-Water-project/post27.html'>parc openi…</a></li></ol><\/td>.*<td class='sat ref'>18</td>/"
 
-calendar_default_else:
+calendar_tz:
   context:
-    # no notes here
-    ref_date: "2008-01-30"
-  src: "<div do='calendar'>---</div>"
-  res: "/<td class='sun'>27<\/td>/"
+    date: "2006-03-18"
+  src: "<div do='calendar' attr='date' tz='America/New_York' select='posts where #{cal_start} <= date and date < #{cal_end} in project'/>"
+  res: "/<td><p>14</p><ol><li><a href='/oo/projects-list/Clean-Water-project/post27.html'>parc openi…</a></li></ol><\/td>.*<td class='sat ref'>18</td>/"
 
-calendar_l_date:
+calendar_with_blocks:
   context:
-    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-list/Clean-Water-project/post27.html'>opening</a></li></ul></td>/"
+    date: "2006-03-18"
+  src: "<div do='calendar' attr='date' select='posts where #{cal_start} <= date and date < #{cal_end} in project'>
+    <h3 do='header'>
+      <r:link date='#{date.advance(:months =&gt; -1).strftime(\"%Y-%m-%d\", tz)}' text='PREV'/>
+      <r:date format='%B'/>
+      <r:link date='#{date.advance(:months =&gt; 1).strftime(\"%Y-%m-%d\", tz)}' text='NEXT'/>
+    </h3><r:cell><b do='date' format='%e.%m'/></r:cell></div>"
+  res: "/date=2006-02-18'>PREV.*date=2006-04-18'>NEXT.*<b>15.03</b>/"
 
-calendar_hours:
+calendar_node_attr:
   context:
-    ref_date: "2009-7-17"
-    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='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>/"
+    date: '2006-03-10'
+  src: "<div do='calendar' attr='created_at' select='nodes where #{cal_start} <= created_at and created_at < #{cal_end} in project'/>"
+  res: "/p>10</p>.*Keeping th…/"
+
+calendar_bad_query:
+  src: "<div do='calendar' attr='date' select='posts where #{cal_start} <= starsky and hutch < #{cal_end} in project'/>"
+  res: "/<span class='method'>calendar</span> <span class='message'>Unknown field 'starsky'/"
+
+calendar_bad_attr:
+  src: "<div do='calendar' attr='date' select='posts where #{cal_start} <= starsky and hutch < #{cal_end} in project'/>"
+  res: "/<span class='method'>calendar</span> <span class='message'>Unknown field 'starsky'/"
+
+#calendar_l_date:
+#  context:
+#    ref_date: "2009-7-17"
+#    node: 'zena'
+#  src: "<div do='calendar' select='added_notes' date='l_date' />"
+#  res: "/<td class='ref'><span>17</span><ol><li><a href='/oo/projects-list/Clean-Water-project/post27.html'>opening</a></li></ol></td>/"
+#
+#calendar_hours:
+#  context:
+#    ref_date: "2009-7-17"
+#    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='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/comments.yml

@@ -0,0 +1,53 @@
+default:
+  context:
+    lang: 'en'
+    visitor: 'ant'
+    node: 'status'
+
+#comments_with_params:
+#  src: "<r:comments order='date desc'><r:each join=', ' do='[title]'/></r:comments>"
+#  tem: "."
+
+comments_shown_if_empty_but_can_comment:
+  src: "<r:comments><r:each do='[title]'/><r:add/></r:comments>"
+  tem: "/if \(var1 = @node.comments\) \|\| \(@node.can_comment\? && var1=\[\]\) %>/"
+
+discussion:
+  src: "<r:discussion do='comments' do='title'></r:discussion>"
+  tem: "<% if var1 = @node.discussion %><% if var2 = var1.comments %><%= var2.first.title %><% end %><% end %>"
+  # no error
+  res: "What about rivers ?"
+
+comments_order_desc:
+  context:
+    visitor: ant
+    #  tz='UTC'
+  src: "<r:comments order='created_at desc'><r:each join=', '><r:show attr='created_at' format='%Y-%m-%d'/>:<b do='[title]'/></r:each></r:comments>"
+  res: "2008-05-21:<b>re: What about rivers ?</b>, 2006-12-20:<b>What about rivers ?</b>, 2006-12-20:<b>Nice site</b>"
+
+comments_where_title:
+  src: "<r:comments where='title like \"%rivers%\"'><r:each join=', '><r:show attr='created_at' format='%Y-%m-%d'/>:<b do='title'/></r:each></r:comments>"
+  tem: '/var1 = Comment.do_find/'
+  res: "2006-12-20:<b>What about rivers ?</b>, 2008-05-21:<b>re: What about rivers ?</b>"
+
+comments_no_discussion:
+  context:
+    node: letter
+  src: "<r:comments order='created_at desc'><r:each join=', '><r:show attr='created_at' format='%Y-%m-%d'/>:<b do='[title]'/></r:each><r:else>-- no comment yet --</r:else></r:comments>"
+  res: "-- no comment yet --"
+
+comments_previous_node:
+  src: "<r:comments><r:each do='zazen' attr='text'/></r:comments>"
+  tem: "/zazen\(var2.text, :node => @node/"
+
+comments_in_site_node:
+  src: "<r:comments from='nodes in site' order='created_at desc' limit='2' do='each' join=', '><r:node do='title'/>: <r:show attr='title'/></r:comments>"
+  res: "status title: re: What about rivers ?, status title: What about rivers ?"
+
+author_name:
+  src: "<r:comments from='nodes in site' order='status desc' limit='2' do='each' join=', '><r:title/> (<r:author_name/>)</r:comments>"
+  res: "Nice site (Super casinos), re: What about rivers ? (simpson)"
+
+form:
+  src: "<r:comments><r:add/><r:each></r:each><r:form>xxx</r:form></r:comments>"
+  tem: "/name='node_id' value='<%= @node.zip %>'/"

data/test/integration/zafu_compiler/complex.yml

@@ -60,33 +60,33 @@ 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='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>"
+  src: "<r:emp_form_dates where='repeat_every is not null' do='each' join=', '><r:show attr='title'/>(<r:show attr='priority'/>, <r:show attr='last_date' format='%Y-%m-%d'/>, <r:show attr='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, title ASC' do='each' join=', '><r:show attr='title'/>: <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 attr='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='title'/>: <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 attr='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='title'/>: <r:show date='event_at'/></r:formations>"
+  src: "<r:formations in='site' do='each' join=', '><r:show attr='title'/>: <r:show attr='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='title'/>: <r:show date='event_at'/> (<r:formation_for find='all' do='each' join=', ' do='title'/>)</r:formations>"
+  src: "<r:formations in='site' do='each' join=', '><r:show attr='title'/>: <r:show attr='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='title'/> (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 attr='last_date'/>, next:<r:show attr='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:
@@ -96,7 +96,7 @@ all_people_related_to_a_course_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='title'/> (last:<r:show date='last_date'/>, next:<r:show date='next_date'/>)</li>
+          <li do='each'><r:show attr='title'/> (last:<r:show attr='last_date'/>, next:<r:show attr='next_date'/>)</li>
         </ol>
       </li>
     </ol>
@@ -118,7 +118,7 @@ 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='title'/> (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 attr='last_date'/>, next:<r:show attr='next_date'/>)</r:course_emp_dates>"
   res: "mike (last:, next:), roger (last:2002-05-05, next:2003-05-05)"
 
 all_course_emp_date:
@@ -127,7 +127,7 @@ all_course_emp_date:
     <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='title'/> (<r:show attr='emp_count'/>)</li>
+          <li do='each'><r:if test='min_next_date'><r:show attr='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>
@@ -170,7 +170,7 @@ all_course_emp_dates_in_six_months:
     <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='title'/> (<r:show attr='emp_count'/>)</li>
+          <li do='each'><r:if test='min_next_date'><r:show attr='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>
@@ -210,7 +210,7 @@ all_course_emp_dates_in_six_months_later:
     <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='title'/> (<r:show attr='emp_count'/>)</li>
+          <li do='each'><r:if test='min_next_date'><r:show attr='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>

data/test/integration/zafu_compiler/complex_ok.yml

@@ -5,8 +5,9 @@ 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='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)'
+  src: "<r:emp_form_dates do='each' join=', '><r:show attr='title'/>(<r:priority/>)[<r:last_date format='%Y-%m'/>]</r:emp_form_dates>"
+  tem: '/var2.attributes\["priority"\].*\[<%= format_date\(var2.attributes\["last_date"\], :format => "%Y-%m"\) %>\]/'
+  res: 'how to use the winch(10)[], secure a site(10)[], dangerous transportations(10)[2004-03], engine maintenance(5)[], information transmission(5)[2002-05], fiber junction(5)[2003-03], problem formulation(5)[2006-03], how to use the radio(1)[]'
 
 it_should_group_by_custom_select:
   context:
@@ -16,4 +17,16 @@ it_should_group_by_custom_select:
     site: complex
     ref_date: 2004-09-01
   src: "<r:emp_form_dates do='group' by='priority' do='each_group' join=', '><r:show attr='priority'/></r:emp_form_dates>"
-  res: '10, 5, 1'
+  res: '10, 5, 1'
+
+it_should_secure_table:
+  context:
+    node_name: '@node'
+    node: roger
+    visitor: complex_admin
+    site: complex
+    ref_date: 2004-09-01
+  src: "<r:secure_tables do='count'/>"
+  tem: "/secure_scope\('other'\)/"
+  # Only show nodes from the 'complex' site
+  res: '41'

data/test/integration/zafu_compiler/conditional.yml

@@ -97,13 +97,13 @@ if_has_discussion:
   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='title'/></b></r:when><r:else><r:show attr='title'/></r:else></r:case></r:each></r:pages></r:root>"
+  src: "<r:root><r:pages><r:each join=', '><r:case><r:when eval='is_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='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\)/'
+  src: "<r:root><r:pages><li do='each' on_if='is_ancestor?(main)' join=', '><r:show attr='title'/></li></r:pages></r:root>"
+  tem: '/var3.is_ancestor\?\(@node\)/'
   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:
@@ -117,8 +117,8 @@ 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='title'/></r:parent>"
-  tem: "/_zpapa = var1.*\(_zpapa\.ancestor\?\(var4\)\)/"
+  src: "<r:parent do='parent' set_papa='this' do='pages'><div do='each' super_if='papa.is_ancestor?(this)' do='title'/></r:parent>"
+  tem: "/_zpapa = var1.*\(_zpapa\.is_ancestor\?\(var4\)\)/"
   res: "<div class=''>a wiki with Zena</div><div class=' super'>Clean Water project</div>"
 
 on_if_kind_of:
@@ -180,3 +180,13 @@ test_in_each:
   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>"
+
+render_test:
+  src: "<r:can_write?>hello</r:can_write?>"
+  tem: "<% if @node.can_write? %>hello<% end %>"
+
+
+do_complex_clause:
+  src: "<div do='log_at &gt; now'>future<r:else>past</r:else></div>"
+  tem: "<% if (@node.log_at ? (@node.log_at>Time.now) : nil) %><div>future</div><% elsif true %><div>past</div><% end %>"
+  res: "<div>past</div>"