zena 1.0.0.rc2 → 1.0.0.rc3

data/test/integration/zafu_compiler/context.yml

@@ -0,0 +1,9 @@
+default:
+  context:
+    lang: 'en'
+    visitor: 'ant'
+    node: 'cleanWater'
+
+each_group:
+  src: "<r:nodes do='group' by='kpath'><p do='each_group'><r:kpath/>: <r:each join=', ' do='title'/></p></r:nodes>"
+  res: "<p>NP: crocodiles, status title</p><p>NDI: it's a lake</p><p>NPA: Keeping things clean !</p><p>NRC: The lake we love</p><p>NNP: parc opening</p><p>ND: water</p>"

data/test/integration/zafu_compiler/dates.yml

@@ -53,19 +53,24 @@ show_date_foo:
   context:
     date: '2010-05-16'
     lang: fr
-  src: "<r:show eval='main_date' format='%A %d.%m.%Y'/>"
+  src: "<r:show eval='date' format='%A %d.%m.%Y'/>"
   tem: "/main_date/"
   res: 'dimanche 16.05.2010'
 
 strftime:
-  src: "<p do='log_at.strftime(\"%d-%m\")'/>"
-  res: "<p>05-04</p>"
+  src: "<p do='log_at.strftime(\"%d-%m %H:%M\")'/>"
+  tem: "/strftime_tz/"
+  res: "<p>05-04 02:00</p>"
+
+strftime_with_timezone:
+  src: "<p do='log_at.strftime(\"%d-%m %H:%M\", \"Asia/Jakarta\")'/>"
+  res: "<p>05-04 07:00</p>"
 
 date_tformat:
   context:
     node: 'people'
     lang: 'fr'
-  src: "<r:show date='created_at' tformat='%d %B %Y'/>"
+  src: "<r:show attr='created_at' tformat='%d %B %Y'/>"
   tem: "<%= format_date(@node.created_at, :format => \"%d %B %Y\") %>"
   res: "10 mars 2006"
 
@@ -74,39 +79,53 @@ date_tz:
     visitor: 'ant'
     node: 'people'
     lang: 'en'
-  src: "<r:show date='created_at' format='%H:%M'/> / <r:show date='created_at' format='%H:%M' tz='Asia/Jakarta'/>"
+  src: "<r:show attr='created_at' format='%H:%M'/> / <r:show attr='created_at' format='%H:%M' tz='Asia/Jakarta'/>"
   res: "01:00 / 07:00"
 
 date_tz_field:
   context:
     node: nature
-  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>"
+  src: "<r:nodes do='each' join=', '><r:show attr='title'/>: <r:show attr='created_at' format='%H:%M' tz='#{this.tz || \"Europe/Zurich\"}'/> | <r:show attr='created_at' format='%H:%M' tz='UTC'/></r:nodes>"
   res: "Autumn Tree: 07:00 | 00:00, Forest: 01:00 | 00:00"
 
+default_tz:
+  context:
+    visitor: 'ant'
+    node: 'people'
+    lang: 'en'
+  src: "<r:default tz='Asia/Jakarta'><r:show attr='created_at' format='%H:%M'/> <r:tz/></r:default>"
+  tem: "/_ztz = TZInfo::Timezone.get.*Asia/Jakarta.*:tz => _ztz/"
+  res: "07:00 Asia - Jakarta"
+
+date_date_tz:
+  context:
+  src: "<r:default tz='Asia/Jakarta'><ul do='notes where created_at.date = #{date(tz)} in site'></ul></r:default>"
+  tem: "/Timezone.get\(\"Asia/Jakarta\"\).*main_date\(_ztz\)/"
+
 date_fr:
   context:
     visitor: ant
     lang: 'fr'
-  src: "<r:show date='created_at' format='%a'/>"
+  src: "<r:show attr='created_at' format='%a'/>"
   res: "ven"
 
 date_fr_lang:
   context:
     lang: 'fr'
-  old_src: "<r:show date='created_at' format='%a' lang='en'/>"
+  old_src: "<r:show attr='created_at' format='%a' lang='en'/>"
   src: "<r:show attr='created_at' format='%a' lang='en'/>"
   tem: "<%= format_date(@node.created_at, :lang => \"en\", :format => \"%a\") %>"
   res: "Fri"
 
 date_context:
-  old_src: "<r:date select='2008-03-02'><r:show date='current_date' format='%A %d.%m.%Y'/></r:date>"
+  old_src: "<r:date select='2008-03-02'><r:show attr='current_date' format='%A %d.%m.%Y'/></r:date>"
   src: "<r:show eval='parse_date(\"2008-03-02\")' format='%A %d.%m.%Y'/>"
   res: "Sunday 02.03.2008"
 
 date_from_params:
   context:
     year: 1975
-  old_src: "<r:date select='[param:year]-01-01'><r:show date='current_date' format='%A %d.%m.%Y'/></r:date>"
+  old_src: "<r:date select='[param:year]-01-01'><r:show attr='current_date' format='%A %d.%m.%Y'/></r:date>"
   src: "<r:show eval='parse_date(\"#{params[:year]}-01-01\")' format='%A %d.%m.%Y'/>"
   tem: "<%= format_date(parse_date(\"#{params[:year]}-01-01\"), :format => \"%A %d.%m.%Y\") %>"
   res: "Wednesday 01.01.1975"
@@ -114,8 +133,8 @@ date_from_params:
 date_from_params_in_query:
   context:
     year: 2006
-  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\"\) %>/"
+  src: "<r:void set_date='parse_date(\"#{params[:year]}/04/03\", \"%Y/%m/%d\")' do='show' eval='date' format='%Y-%m-%d'/>"
+  tem: "/_zdate = parse_date.*format_date/"
   res: "2006-04-03"
 
 input_date:
@@ -123,12 +142,21 @@ input_date:
     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'/"
+  res: "/value='2006-03-15 01:00'/"
+
+input_date_no_time:
+  context:
+    node: opening
+  src: "<r:Post?><r:input type='date' name='date' time='false'/></r:Post?>"
+  tem: '/:time => "false"/'
+  res: "/value='2006-03-15'/"
+  js: "/showsTime *: *false/"
 
 test_date:
-  src: "<r:Post?><r:if test='date'></r:if></r:Post?>"
+  # test with 'date' tests contextual date (main_date).
+  src: "<r:Post?><r:if test='this.date'></r:if></r:Post?>"
   tem: "/@node.prop\['date'\]/"
-  
+
 format_date_empty_string:
   tem: "<%= format_date('') %>"
   res: ""

data/test/integration/zafu_compiler/display.yml

@@ -18,7 +18,7 @@ show_title_with_opts:
   old_src: "<h1 do='title' class='s70' status='true' actions='all'>this is the title</h1>"
   old_tem: "/<h1 class='s<%= @node.version.status %>'><%= show_title\(:node=>@node\) \+ node_actions\(:node=>@node, .*:actions=>\"all\"/"
   src: "<h1 do='title' prefix='status' actions='all' live='true'>this is the title</h1>"
-  tem: "<h1 class='s<%= @node.version.status %>'><span id='_title<%= @node.zip %>'><%= @node.prop['title'] %></span> <%= node_actions(@node, :actions => \"all\") %></h1>"
+  tem: "<h1 class='s<%= @node.version.status %>'><span id='_title<%= @node.zip %>'><%= h @node.prop['title'] %></span> <%= node_actions(@node, :actions => \"all\") %></h1>"
   old_res: "/<h1 class='s50'><span id='title22'.*class='actions'>/"
   res: "/<h1 class='s50'><span id='_title22'.*class='actions'>/"
 
@@ -140,13 +140,13 @@ show_width:
 show_else:
   old_src: "<r:show attr='comment' else='name'/>"
   src: "<r:show eval='origin || title'/>"
-  tem: "<%= (@node.prop['origin'] or @node.prop['title']) %>"
+  tem: "<%= h (@node.prop['origin'] or @node.prop['title']) %>"
   res: "status title"
 
 show_default:
   old_src: "<r:show attr='d_foo' default='baz'/>"
   src: "<r:show eval='origin || \"baz\"'/>"
-  tem: "<%= (@node.prop['origin'] or \"baz\") %>"
+  tem: "<%= h (@node.prop['origin'] or \"baz\") %>"
   res: "baz"
 
 javascripts:
@@ -264,7 +264,7 @@ admin_links_for_admin_with_list:
     visitor: lion
   src: "<ul do='admin_links' list='comments,sites'><li do='each' do='show'><a href='#'>do this</a></li></ul>"
   tem: '/if var1 = admin_links\(\{:list => "comments,sites"\}/'
-  res: '<ul><li><a href="/comments">manage comments</a></li><li><a href="/sites">manage sites</a></li></ul>'
+  res: '<ul><li><a href="/comments">comments</a></li><li><a href="/sites">sites</a></li></ul>'
 
 admin_links_for_anon:
   context:
@@ -281,7 +281,7 @@ 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 %>"
+  tem: "<% if !@node.prop['title'].blank? %><li><label>titre</label> <span><%= h @node.prop['title'] %></span></li><% end %>"
   res: "<li><label>titre</label> <span>Etat des travaux</span></li>"
 
 show_with_custom_label_shortcut:
@@ -291,6 +291,20 @@ show_with_custom_label_shortcut:
   tem: "/anglais/"
   res: "<li><label>anglais</label> <span>Etat des travaux</span></li>"
 
+render_h_label:
+  context:
+    lang: fr
+  src: "<r:default label='t'><li do='show' attr='title'/></r:default>"
+  res: "<li><label>titre</label> <span>Etat des travaux</span></li>"
+
+render_h_disabled:
+  src: "<r:default h='false'><r:show attr='title'/></r:default>"
+  tem: "<%= @node.prop['title'] %>"
+
+show_h_disabled:
+  src: "<r:show h='false' attr='title'/>"
+  tem: "<%= @node.prop['title'] %>"
+
 show_with_custom_tlabel_shortcut:
   context:
     lang: fr
@@ -298,6 +312,11 @@ show_with_custom_tlabel_shortcut:
   tem: "/anglais/"
   res: "<li><label>anglais</label> <span>Etat des travaux</span></li>"
 
+show_date_context:
+  src: "<b do='created_at' do='show' format='%Y'/><b do='event_at' do='show' format='%Y'/>"
+  # 'event_at' is a context. If nil ==> do not enter context.
+  res: "<b>2006</b>"
+
 rendering:
   src: "==<r:headers Content-Disposition='attachment; filename=special_#{title}.csv'/>=="
   tem: "==<% set_headers(\"Content-Disposition\" => \"attachment; filename=special_#{@node.prop['title']}.csv\") %>=="
@@ -307,4 +326,39 @@ 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"
+  res: "54\n12\n34\n.\n"
+
+set_class_before_query:
+  # Should use previous node (not list context)
+  src: "<div class='foo_#{title}' do='images in site'></div>"
+  res: "<div class='foo_status title'></div>"
+
+flash_messages:
+  src: "<r:flash_messages/>"
+  tem: "<%= flash_messages %>"
+  res: "<div id='flash_messages'></div>"
+
+date_without_set_var:
+  context:
+    node: opening
+    ref_date: '2011-04-22'
+  src: "<r:Post?><r:date format='%e'/>,<p do='this.date' format='%e'/><p do='date' format='%e'/></r:Post?>"
+  res: '22,<p>15</p><p>22</p>'
+
+date_with_set_var:
+  context:
+    node: opening
+    ref_date: '2011-04-22'
+  src: "<r:Post? set_date='parse_date(\"2011-04-03\")'><r:date format='%e'/>,<p do='this.date' format='%e'/><p do='date' format='%e'/></r:Post?>"
+  res: ' 3,<p>15</p><p> 3</p>'
+
+short_path:
+  src: "<r:short_path do='join(\" / \")'/>"
+  res: ".. / Clean Water project / status title"
+
+show_param:
+  context:
+    t: 'hello'
+  src: "<r:show param='t'/>"
+  tem: "<%= h params[:t] %>"
+  res: "hello"

data/test/integration/zafu_compiler/errors.yml

@@ -36,7 +36,7 @@ show_var:
   tem: "/unknown method 'boo\(\)' for Zena::ZafuCompiler/"
 
 show_bad_sprintf:
-  src: "<p do='show' date='updated_at' format='%.2f %i hop'/>"
+  src: "<p do='show' attr='updated_at' format='%.2f %i hop'/>"
   res: "<p>.2f i hop</p>"
 
 division_by_zero_in_eval:
@@ -96,4 +96,8 @@ datebox_on_vclass:
 
 bad_iconv:
   src: "<r:iconv to='foobar'>écrit</r:iconv>"
-  tem: "/invalid encoding \"foobar\"/"
+  tem: "/invalid encoding \"foobar\"/"
+
+add_bad_klass:
+  src: "<ol do='pages'><li do='each' do='link'/><li do='add' klass='page'/></ol>"
+  res: "!/backtrace/"

data/test/integration/zafu_compiler/forms.yml

@@ -45,15 +45,19 @@ translate_id_to_zip:
 select_class_existing_node:
   context:
     node: 'letter'
-  src: "<r:form><select name='klass' root_class='Note' selected='Post'/></r:form>"
+  src: "<r:form><r:select name='klass' root_class='Note' selected='Post'/></r:form>"
   res: "/<select name=.node\[klass\].><option value=\"Note\">Note<\/option>\n<option value=\"Letter\" selected=\"selected\">  Letter<\/option>\n<option value=\"Post\">  Post<\/option><\/select>/"
 
 select_class_new_node:
-  src: "<r:pages><r:each/><r:add/><r:form><select name='klass' root_class='Note' selected='Post'/></r:form>"
+  src: "<r:pages><r:each/><r:add/><r:form><r:select name='klass' root_class='Note' selected='Post'/></r:form>"
   res: "/<select.*name=.node\[klass\].*Note.*Letter.*Post. selected=.selected./"
 
+select_class_kpath:
+  src: "<r:select param='k' root_class='Note' attr='kpath'/>"
+  res: "/<select.*name=.k.*NN.*Note.*NNL.*Letter.*NNP.*Post/"
+
 select_nodes:
-  src: "<r:form><select nodes='images in site' name='foo'></select></r:form>"
+  src: "<r:form><r:select nodes='images in site' name='foo'></select></r:form>"
   res: "/name='node\[foo\]'><option value=\"\" selected=\"selected\"></option>\n<option value=\"40\">Autumn Tree</option>\n<option value=\"30\">bird</option>/"
 
 do_not_set_parent_id_if_form_contains_parent_id:
@@ -61,7 +65,7 @@ do_not_set_parent_id_if_form_contains_parent_id:
   res: "!/node\[parent_id\].\s+value/"
 
 select_nodes_selected:
-  src: "<r:form><select name='parent_id' nodes='projects in site'/></r:form>"
+  src: "<r:form><r:select name='parent_id' nodes='projects in site'/></r:form>"
   res: "/option\s* value=.21.\s* selected=.selected.>Clean Water/"
 
 select_nodes_in_ajax:
@@ -81,6 +85,16 @@ select_values_tshow:
   src: "<r:select name='origin' values='1,2,3' tshow='en,fr,de'/>"
   res: "/option value=.1.>english.*option value=.2.>french/"
 
+select_prop:
+  # Refactor select to use collection_select.
+  src: "<r:select name='origin' values='1,2,3' tshow='en,fr,de'/>"
+  tem: "/@node.prop\['origin'\].to_s/"
+
+select_l_status:
+  # Refactor select to use collection_select.
+  src: "<r:select name='l_status' values='1,2,3' tshow='en,fr,de'/>"
+  tem: "/@node.l_status.to_s/"
+
 form_publish:
   src: "<r:form publish='true'><r:select name='origin' values='bar,baz'/></r:form>"
   res: "/div.*name=.node\[v_status\]. value=.50.\/>.*<\/div>/"
@@ -163,7 +177,7 @@ textarea_with_blocks:
   context:
     node: 'ant'
   src: "<r:Contact? do='textarea' name='first_name'>Sir <r:show attr='first_name'/></r:Contact?>"
-  tem: "/<textarea name='node\[first_name\]'>Sir <%= @node.prop\['first_name'\] %></textarea>/"
+  tem: "/<textarea name='node\[first_name\]'>Sir <%= h @node.prop\['first_name'\] %></textarea>/"
   res: "<textarea name='node[first_name]'>Sir Solenopsis</textarea>"
 
 input_new:
@@ -211,6 +225,31 @@ label_on_select:
   src: "<r:select label='t' name='title' values='1,2'/>"
   res: "/<label>titre</label> <span><select name='node\[title\]'/"
 
+passiv_form:
+  # Should not transform 'form' or 'input' into 'r:form' or 'r:input'
+  src: "<form>xxx<input name='x' id='y' type='text'/> yyy<input name='x' id='y' type='text' value='#{id}'/></form>"
+  tem: "<form>xxx<input name='x' id='y' type='text'/> yyy<input name='x' id='y' type='text' value='<%= @node.zip %>'/></form>"
+
+passiv_input_in_form:
+  # Should not transform 'form' or 'input' into 'r:form' or 'r:input'
+  src: "<r:form>xxx<input name='x' id='y' type='text'/> yyy<input name='x' id='y' type='text' value='#{id}'/></r:form>"
+  tem: "/yyy<input name='x' id='y' type='text' value='<%= @node.zip %>'/>/"
+
 param_on_select:
   src: "<r:select param='q[contact.status]' values='0,-5,-10' tshow='active, being registered, inactive'/>"
-  res: "<select name='q[contact.status]'><option value=\"0\">active</option>\n<option value=\"-5\">being registered</option>\n<option value=\"-10\">inactive</option></select>"
+  res: "<select name='q[contact.status]'><option value=\"0\">active</option>\n<option value=\"-5\">being registered</option>\n<option value=\"-10\">inactive</option></select>"
+
+crop:
+  context:
+    node: 'bird_jpg'
+  src: "<r:Image? do='crop'/>"
+  res: "/node\[crop\]\[h\]/"
+  js: '/Zena.Div_editor\("imglist1"/'
+
+hidden_fields_in_form_tag:
+  src: "<r:form foo='bar'></r:form>"
+  tem: "/<input type='hidden' name='foo' value='bar'/>/"
+
+hidden_fields_in_form_tag_dynamic:
+  src: "<r:form  node[log]='#{title}'></r:form>"
+  tem: "/<input type='hidden' name='node\[log\]' value='<%= \"#\{@node.prop\['title'\]\}\" %>/"

data/test/integration/zafu_compiler/i18n.yml

@@ -125,6 +125,13 @@ dictionary_fr:
   tem: "<% _zdict = load_dictionary(828931430) %>foo: j'aime les mots"
   res: "foo: j'aime les mots"
 
+dictionary_missing:
+  context:
+    lang: 'fr'
+  src: "<r:load dictionary='barbaz' missing='ignore'><r:trans>foo</r:trans>: <r:t>I love</r:t> <r:trans>words</r:trans></r:load>"
+  tem: "foo: I love words"
+  res: "foo: I love words"
+
 dynamic_dictionary_eval_fr:
   context:
     lang: 'fr'
@@ -157,7 +164,7 @@ dictionary_de:
   res: "foo: Ich liebe Wörter"
 
 dictionary_tformat:
-  src: "<r:load dictionary='/Default skin/translations'><r:show date='created_at' tformat='date_format'/></r:load>"
+  src: "<r:load dictionary='/Default skin/translations'><r:show attr='created_at' tformat='date_format'/></r:load>"
   tem: "<% _zdict = load_dictionary(828931430) %><%= format_date(@node.created_at, :format => \"[%d.%m]\") %>"
   res: "[10.03]"
 

data/test/integration/zafu_compiler/meta.yml

@@ -0,0 +1,38 @@
+default:
+  context:
+    lang: 'en'
+    visitor: 'ant'
+    node: 'status'
+
+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='/meta/name/title'><r:with part='title'/>"
+  res: "include_with: title: "
+
+name_title:
+  src: "title: <h1 id='lala' do='show' name='title' attr='title'>blah</h1>"
+  res: "title: <h1 id='lala'>status title</h1>"
+
+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='/meta/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."
+
+include_part:
+  src: "include_part: <r:include template='/meta/id/name' part='bob'/>"
+  tem: "include_part: <b>Bob</b>"
+
+# 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 (layout themes), status title"
+
+include_context:
+  src: "IC: <r:include template='/meta/context/dummy'><r:with part='pages'><r:each join=' / ' do='title'/></r:with></r:include>"
+  res: "IC: CD: Skins (layout themes) / status title"

data/test/integration/zafu_compiler/query.yml

@@ -133,14 +133,20 @@ paginate_count:
   src: "<r:pages in='site' paginate='p' do='count'/>"
   # should properly pass the query to sub-contexts.
   tem: '/<%= _znodes %>/'
-  res: "18"
+  res: "19"
+
+count:
+  src: "<r:pages in='site' do='count'/>"
+  # should detect 'count' method and count nodes without pagination.
+  tem: '/<%= _znodes %>/'
+  res: "19"
 
 paginate_page_name:
   context:
     p: 5
   src: "<r:pages in='site' limit='3' paginate='p' do='link' page='list' page_count='4' do='each'><r:page_name/>(<r:this/>)</r:pages>"
   # should define page_name
-  res: "…(3) 4(4) 5 6(6)"
+  res: "…(4) 5 6(6) 7(7)"
 # ============= Dynamic query ========
 
 query:
@@ -202,6 +208,39 @@ query_can_be_nil_bad_argument_type:
   tem: '/params\[:filter\] \|\| \"pages in site\"/'
   res: ''
 
-query_truc:
+query_count:
   tem: '<%= query("Page", "@node", "pages in site", :type => :count) %>'
-  res: '18'
+  res: '19'
+
+simple_select:
+  src: "<div do='nodes select title as ti' find='first' do='ti'/>"
+  tem: '/<%= var1.attributes\["ti"\] %>/'
+  res: "<div>crocodiles</div>"
+
+select_in_from:
+  src: "<div do='images select title as it from projects select title as pt in site' do='each' join=', '><r:pt/>: <r:it/></div>"
+  tem: '/<%= var2.attributes\["pt"\] %>: <%= var2.attributes\["it"\] %>/'
+  res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it's a lake</div>"
+
+select_group:
+  src: "<div do='images select title as it from projects select title as pt in site' do='group' by='pt' do='each_group' join=' / '><r:pt/>: <r:each join=', ' do='it'/></div>"
+  res: "<div>a wiki with Zena: bird, flower / Clean Water project: it's a lake</div>"
+
+select_group_count:
+  src: "<div do='images select id.count as img_count from projects select id as pid, title as pt in site group by pid' do='each' join=', '><r:pt/>: <r:img_count/></div>"
+  res: "<div>a wiki with Zena: 2, Clean Water project: 1</div>"
+
+select_group_count_having:
+  src: "<div do='images select id.count as img_count from projects select id as pid, title as pt in site group by pid having img_count >= 2' do='each' join=', '><r:pt/>: <r:img_count/></div>"
+  res: "<div>a wiki with Zena: 2</div>"
+
+core_context:
+  # Ensure that :project rubyless method uses enrollable.
+  src: "<r:project do='origin || title'/>"
+  tem: "/ar1.prop\['origin'\] or var1.prop\['title'\]/"
+
+query_errors:
+  context:
+    c: 'badaboum'
+  src: "<r:query default='nodes' select='nodes in #{params[:c]}'><r:elsif test='query_errors' do='query_errors'/></r:query>"
+  res: "<span class='query'>nodes in badaboum</span> <span class='error'>Invalid scope 'badaboum'.</span>"

data/test/integration/zafu_compiler/relations.yml

@@ -79,7 +79,7 @@ pages_random:
   context:
     node: 'cleanWater'
   src: "<r:pages limit='3' order='random'><r:each join=', '><r:show attr='title'/></r:each></r:pages>"
-  tem: "/ORDER BY RAND/"
+  tem: "/ORDER BY (RAND|random)/"
 
 nodes_in_project:
   src: "<r:nodes in='project' limit='2'><r:each join=', '><r:show attr='title'/></r:each></r:nodes>"
@@ -110,11 +110,11 @@ author:
 
 public_readable_link:
   src: "<r:show attr='set_tag_ids'/>"
-  tem: '<%= @node.rel["set_tag"].try(:other_zips) %>'
+  tem: '<%= h @node.rel["set_tag"].try(:other_zips) %>'
 
 public_readable_link_for:
   src: "<r:show attr='hot_for_ids'/>"
-  tem: '<%= @node.rel["hot_for"].try(:other_zips) %>'
+  tem: '<%= h @node.rel["hot_for"].try(:other_zips) %>'
   res: '21'
 
 public_readable_link_id:
@@ -181,8 +181,14 @@ children_else:
 hot_else:
   context:
     class: Project
-  src: "<r:hot else='project'><r:show attr='title'/></r:hot>"
-  res: "Clean Water project"
+  src: "<div do='hot' else='project'><r:show attr='title'/></div>"
+  res: "<div>Clean Water project</div>"
+
+hot_else_query:
+  context:
+    class: Project
+  src: "<div do='hot' else='node where title like \"%wiki%\" in site'><r:show attr='title'/></div>"
+  res: "<div>a wiki with Zena</div>"
 
 updated_today:
   # date set in ZafuCompilerTest
@@ -315,6 +321,11 @@ visitor_node:
   src: "<r:visitor_node><b do='title'/></r:visitor_node>"
   res: "<b>Mr nobody</b>"
 
+relation_or_other:
+  src: "<ul do='posts' in='project' or='references' order='log_at desc' limit='8'>"
+  # should build a valid SQLiss query
+  tem: "/\) OR \(.*\)\) GROUP BY nodes.id ORDER BY nodes.log_at DESC LIMIT 8/"
+
 relation_in_site:
   src: "<r:tagged in='site' limit='10' do='each' join=',' do='title'/>"
   res: "Clean Water project,parc opening"
@@ -393,36 +404,10 @@ group_by_parent_sort:
   res: "<b>a wiki with Zena</b>: bird,flower<b>Clean Water project</b>: it's a lake"
 
 nodes_in_site_group_by_year:
-  old_src: "<r:nodes in='site' group='log_at:year' order='log_at:year asc, title ASC' do='each' join=', '><r:show date='log_at' format='%Y'/></r:nodes>"
-  src: "<r:nodes in='site' group='log_at.year' order='log_at.year asc, title ASC' do='each' join=', '><r:show date='log_at' format='%Y'/></r:nodes>"
+  old_src: "<r:nodes in='site' group='log_at:year' order='log_at:year asc, title ASC' do='each' join=', '><r:show attr='log_at' format='%Y'/></r:nodes>"
+  src: "<r:nodes in='site' group='log_at.year' order='log_at.year asc, title ASC' do='each' join=', '><r:show attr='log_at' format='%Y'/></r:nodes>"
   res: ", 2006, 2007"
 
-comments_order_desc:
-  context:
-    visitor: ant
-    #  tz='UTC'
-  src: "<r:comments order='created_at desc'><r:each join=', '><r:show date='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 date='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 date='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 ?"
-
 find_by_zip:
   src: "<div do='find(30)' do='img'/>"
   res: '/image30_std.jpg/'
@@ -461,3 +446,11 @@ count:
   src: "<p do='nodes in site order by id' find='count'/>"
   tem: "<p><%= Node.do_find(:count, %Q{SELECT COUNT(*) FROM nodes WHERE #{secure_scope('nodes')}}) %></p>"
   res: "<p>42</p>"
+
+query_in_array:
+  src: "<div do='posts' do='find(\"posts in site\")'/>"
+  tem: "/Node\.do_find.*Node\.do_find"
+
+query_in_array_without_find:
+  src: "<div do='posts' do='posts in site'/>"
+  tem: "/Node\.do_find.*Node\.do_find"

data/test/integration/zafu_compiler/rubyless.yml

@@ -77,3 +77,13 @@ ancestors_on_root:
     node: 'zena'
   src: "<ul id='path' do='ancestors'><li do='each' do='link'/></ul>"
   res: ''
+
+prop_in_list_context:
+  src: "<div do='nodes in site'><r:title/></div>"
+  tem: "/var1.first.prop\['title'\]/"
+  res: '<div>a wiki with Zena</div>'
+
+role_existing_class_name:
+  # Should understand 'Comment' as a Role.
+  src: "<r:Comment?>xx</r:Comment?>"
+  tem: "/<% if @node.has_role\?\(\d+\) %>xx<% end %>/"

data/test/integration/zafu_compiler/safe_definitions.yml

@@ -91,4 +91,24 @@ map_on_can_be_nil:
     node: 'cleanWater'
   eval: "Contact.relations.map(:name).join('-')"
   tem: "/VirtualClass\[\"Contact\"\] \? VirtualClass\[\"Contact\"\].all_relations.map\(&:other_role\).compact.join\(\"-\"\)/"
-  res: "/collaborator_for-favorite-favorite_for/"
+  res: "/collaborator_for-favorite-favorite_for/"
+
+min:
+  context:
+    h: 10
+    w: 0.1
+  src: "<r:show format='%.2f CHF' eval='params[:h].to_f * min(0.25, params[:w].to_f)'/>"
+  res: "1.00 CHF"
+
+max:
+  context:
+    h: 10
+    w: 0.1
+  src: "<r:show format='%.2f CHF' eval='params[:h].to_f * max(0.25, 10 * params[:w].to_f)'/>"
+  res: "10.00 CHF"
+
+time_advance:
+  context:
+    date: '2011-02-03'
+  src: "<b do='date.advance(:months =&gt; 1).strftime(\"%Y-%m-%d\")'/>"
+  res: "<b>2011-03-03</b>"