zena 1.0.0.beta3 → 1.0.0.rc1

data/test/integration/zafu_compiler/errors.yml

@@ -20,15 +20,15 @@ bad_query:
   tem: "<span class='parser_error'><span class='method'>images</span> <span class='message'>Syntax error near \"oo bar baz\".</span></span>"
 
 bad_field_in_query:
-  src: "<r:images where='node_name = baz'>ok</r:images>"
+  src: "<r:images where='title = baz'>ok</r:images>"
   res: "<span class='parser_error'><span class='method'>images</span> <span class='message'>Unknown field 'baz'.</span></span>"
 
 bad_relation:
-  src: "<div do='categories in site' do='each' join=', ' do='node_name'/>"
+  src: "<div do='categories in site' do='each' join=', ' do='title'/>"
   tem: "<div><span class='parser_error'><span class='method'>categories in site</span> <span class='message'>Unknown relation 'categories'.</span></span></div>"
 
 bad_order_clause:
-  src: "<r:images order='l_status ASC' do='each' join=',' do='node_name'/>"
+  src: "<r:images order='l_status ASC' do='each' join=',' do='title'/>"
   res: "/Unknown field 'l_status'./"
 
 show_var:
@@ -52,11 +52,11 @@ bad_argument_list_in_eval:
   res: "/unterminated string meets end of file/"
 
 nil_value:
-  src: "<r:show eval='4 * custom_a'/>"
+  eval: "4 * custom_a"
   res: ""
 
 not_finished_block:
-  src: "<r:if kind_of='Document'><r:link format='data'><r:img mode='tiny'/> <r:show attr='node_name'/>.<r:show attr='ext'/></r:link><r:else do='link'/></r:if>"
+  src: "<r:if kind_of='Document'><r:link format='data'><r:img mode='tiny'/> <r:show attr='title'/>.<r:show attr='ext'/></r:link><r:else do='link'/></r:if>"
 
 missing_template:
   src: "<r:include template='Foo'/>"
@@ -76,4 +76,24 @@ zazen_bad_attr:
 
 toggle_bad_finder_class:
   src: "<span do='toggle' set='favorite' for='visitor'/>"
-  res: "/Invalid class 'for' parameter: User/"
+  res: "/Invalid class 'for' parameter: User/"
+
+map_join:
+  context:
+    node: 'cleanWater'
+  src: "<r:children do='map(:flobo).join(\",\")'/>"
+  tem: "/unknown method .*map\(:flobo\)/"
+
+query_on_vclass:
+  # typical syntax error (should be Contact?)
+  src: "<r:Contact><div do='pages in site'>...</div></r:Contact>"
+  # should not crash
+  tem: "/parser_error.*method.*pages in site.*No query builder for class VirtualClass/"
+
+datebox_on_vclass:
+  src: "<r:Contact><r:input type='date' name='log_at'/></r:Contact>"
+  tem: "/unknown method 'log_at\(\)' for .* VirtualClass./"
+
+bad_iconv:
+  src: "<r:iconv to='foobar'>écrit</r:iconv>"
+  tem: "/invalid encoding \"foobar\"/"

data/test/integration/zafu_compiler/eval.yml

@@ -12,13 +12,13 @@ sprintf:
   res: "<b>22.00</b>"
 
 set_var:
-  src: "<r:set var='foo'>I am <r:show attr='node_name'/></r:set> <p do='show' var='foo'/>"
-  tem: "<% set_foo = capture do %>I am <%= @node.name %><% end -%> <p><%= set_foo %></p>"
+  src: "<r:set var='foo'>I am <r:show attr='title'/></r:set> <p do='show' var='foo'/>"
+  tem: "<% set_foo = capture do %>I am <%= @node.name %><% end %> <p><%= set_foo %></p>"
   res: " <p>I am status</p>"
 
 eval_mult:
   src: "<r:set var='foo'>134</r:set><r:show eval='foo * 0.1'/>"
-  tem: "<% set_foo = capture do %>134<% end -%><%= (set_foo.to_f * 0.1) %>"
+  tem: "<% set_foo = capture do %>134<% end %><%= (set_foo.to_f * 0.1) %>"
   res: "13.4"
 
 eval_with_attr:
@@ -47,7 +47,7 @@ show_var:
   res: "<b>12345</b>"
 
 show_var_overwrites_attribute:
-  src: "<r:set var='name'>12345</r:set><b do='node_name'/>"
+  src: "<r:set var='name'>12345</r:set><b do='title'/>"
   res: "<b>12345</b>"
 
 test_var:

data/test/integration/zafu_compiler/forms.yml

@@ -9,7 +9,7 @@ default:
 
 add_btn:
   src: "<table do='pages' in='site' limit='1'>
-  <tr do='each'><td do='node_name'/></tr>
+  <tr do='each'><td do='title'/></tr>
   <tr do='add'><td><b><r:add_btn/></b></td></tr>
   </table>"
   res: "/<tr class='btn_add' id='list1_add'><td><b><a href='#' onclick/"
@@ -20,15 +20,21 @@ form_put:
   tem: "/form_for.*:url.*node_path\(@node\.zip\)/"
   res: '/<form action="/nodes/\d+".*method="post".*input name="_method" type="hidden" value="put"/'
 
+form_should_not_insert_parent_id:
+  context:
+    node: 'zena'
+  src: "<r:form></r:form>"
+  tem: "!/parent_id/"
+
 form_post:
   # Should make a post on new objects
-  src: "<r:new klass='Post' title='Joe'><r:form></r:form></r:new>"
+  src: "<r:new klass='Post' title='\"Joe\"'><r:form></r:form></r:new>"
   tem: "/if var1 = new_instance\(\"Post\", :title => \"Joe\"\)/"
   res: "!/\"put\"/"
 
 new:
   # Should accept allowed params (from class and roles) and transform ids to zip (back and forth)
-  src: "<r:new klass='Letter' title='Joe' parent_id='#{project.id}' paper='white' origin='Mars' bad='value'><r:form><r:input name='title'/> <r:input name='parent_id'/></r:form></r:new>"
+  src: "<r:new klass='Letter' title='%q{Joe}' parent_id='project.id' paper='%q{white}' origin='%q{Mars}' bad='%q{value}'><r:form><r:input name='title'/> <r:input name='parent_id'/></r:form></r:new>"
   tem: "/:title => \"Joe\", :parent_id => .*@node.project.zip.*, :paper => \"white\", :origin => \"Mars\"/"
   res: "/<input type='text' name='node\[title\]' value='Joe'/> <input type='text' name='node\[parent_id\]' value='21'/><div class='hidden'><input type='hidden' name='node\[klass\]' value='Letter'/><input type='hidden' name='node\[paper\]' value='white'/><input type='hidden' name='node\[origin\]' value='Mars'/></div>/"
 
@@ -48,10 +54,10 @@ select_class_new_node:
 
 select_nodes:
   src: "<r:form><select nodes='images in site' name='foo'></select></r:form>"
-  res: "/name='node\[foo\]'><option value=\"\" selected=\"selected\"></option>\n<option value=\"30\">bird</option>\n<option value=\"31\">flower</option>/"
+  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:
-  src: "<r:children><r:each do='node_name'/><r:add/><r:form><r:select name='parent_id' nodes='projects in site'/><input name='title'/></r:form></r:children>"
+  src: "<r:children><r:each do='title'/><r:add/><r:form><r:select name='parent_id' nodes='projects in site'/><input name='title'/></r:form></r:children>"
   res: "!/node\[parent_id\].\s+value/"
 
 select_nodes_selected:
@@ -59,8 +65,8 @@ select_nodes_selected:
   res: "/option\s* value=.21.\s* selected=.selected.>Clean Water/"
 
 select_nodes_in_ajax:
-  src: "<r:pages><r:each do='node_name'/><r:add/><r:form><r:select nodes='images in site' name='d_ref'/></r:form></r:pages>"
-  res: "/name=.node\[d_ref\].><option value=\"\" selected=\"selected\"></option>\n<option value=\"30\">bird</option>\n<option value=\"31\">flower</option>/"
+  src: "<r:pages><r:each do='title'/><r:add/><r:form><r:select nodes='images in site' name='d_ref'/></r:form></r:pages>"
+  res: "/name=.node\[d_ref\].><option value=\"\" selected=\"selected\"></option>\n<option value=\"40\">Autumn Tree</option>\n<option value=\"30\">bird</option>/"
 
 select_nodes_show_attr:
   src: "<r:form><r:select name='title' nodes='images in site' attr='ext' show='title'/></r:form>"
@@ -82,14 +88,32 @@ form_publish:
 checkbox:
   context:
     node: 'opening'
-  src: "<r:checkbox role='calendar' values='11'/>"
-  res: "/input type='checkbox' name='node\[calendar_ids\]\[\]' value='11' checked='checked'.*Zena.*hidden.*node\[calendar_ids\]\[\]' value=''/"
+  src: "<r:checkbox role='calendar' nodes='11'/>"
+  res: "/hidden.*node\[calendar_ids\]\[\]' value=''.*input type='checkbox' name='node\[calendar_ids\]\[\]' value='11' checked='checked'.*Zena/"
+
+checkbox_literal:
+  context:
+    node: 'people'
+  src: "<r:checkbox name='assigned' values='gaspard,sophie'/>"
+  res: "/value='gaspard' checked='checked'/> <span>gaspard</span>/"
+
+checkbox_literal_show:
+  context:
+    node: 'people'
+  src: "<r:checkbox name='assigned' values='gaspard,sophie' show='slave,master'/>"
+  res: "/value='gaspard' checked='checked'/> <span>slave</span>/"
+
+checkbox_literal_tshow:
+  context:
+    node: 'people'
+  src: "<r:checkbox name='assigned' values='gaspard,sophie' tshow='fr,en'/>"
+  res: "/value='gaspard' checked='checked'/> <span>french</span>/"
 
 checkbox_finder:
   context:
     node: 'opening'
   src: "<r:checkbox role='calendar' nodes='projects in site'/>"
-  res: "/value=.21.*Clean Water.*input type=.checkbox. name=.node\[calendar_ids\]\[\]. value=.29. checked=.checked.*wiki/"
+  res: "/input type=.checkbox. name=.node\[calendar_ids\]\[\]. value=.29. checked=.checked.*wiki.*value=.21.*Clean Water/"
 
 checkbox_checked_value:
   src: "<r:input type='checkbox' name='tagged[sky]'/>"
@@ -109,10 +133,22 @@ input_set_value:
 input:
   context:
     node: 'ant'
-  src: "<r:BaseContact><r:input name='first_name'/></r:BaseContact>"
-  tem: "<% if @node.kpath_match?('NRC') -%><input type='text' name='node[first_name]' value='<%= fquote @node.prop['first_name'] %>'/><% end -%>"
+  src: "<r:Contact?><r:input name='first_name'/></r:Contact?>"
+  tem: "<% if @node.kpath_match?('NRC') %><input type='text' name='node[first_name]' value='<%= fquote @node.prop['first_name'] %>'/><% end %>"
   res: "<input type='text' name='node[first_name]' value='Solenopsis'/>"
 
+input_raw_name:
+  src: "<r:input param='first_name'/>"
+  tem: "<input type='text' name='first_name' value='<%= fquote params[:first_name] %>'/>"
+
+input_param_value:
+  context:
+    foo:
+      "bar.baz": 'xyz'
+  src: "<r:input param='foo[bar.baz]'/>"
+  tem: "<input type='text' name='foo[bar.baz]' value='<%= fquote param_value(\"foo[bar.baz]\") %>'/>"
+  res: "<input type='text' name='foo[bar.baz]' value='xyz'/>"
+
 input_style:
   src: "<r:input style='display:none;' type='submit'/>"
   res: "<input type='submit' style='display:none;'/>"
@@ -120,23 +156,61 @@ input_style:
 textarea:
   context:
     node: 'ant'
-  src: "<r:BaseContact do='textarea' name='first_name'/>"
+  src: "<r:Contact? do='textarea' name='first_name'/>"
   res: "<textarea name='node[first_name]'>Solenopsis</textarea>"
 
 textarea_with_blocks:
   context:
     node: 'ant'
-  src: "<r:BaseContact do='textarea' name='first_name'>Sir <r:show attr='first_name'/></r:BaseContact>"
+  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>/"
   res: "<textarea name='node[first_name]'>Sir Solenopsis</textarea>"
 
 input_new:
   context:
     node: 'ant'
-  src: "<r:base_contacts><r:each/><r:form><r:input name='first_name'/></r:form><r:add/></r:base_contacts>"
+  src: "<r:contacts><r:each/><r:form><r:input name='first_name'/></r:form><r:add/></r:contacts>"
   res: "/name='node\[first_name\]' [^>]*id='list1_first_name'/"
 
 show_in_form:
   src: "<r:form><b do='title'/></r:form>"
   tem: "/<b><%= @node.prop\['title'\] %></b>/"
   res: '/<b>status title</b>/'
+
+not_set_parent_id:
+  src: "<r:form></r:form>"
+  tem: "!/node\[parent_id\]/"
+
+set_parent_id_in_new:
+  src: "<r:new klass='Page' do='form'></r:new>"
+  tem: "/node\[parent_id\].*@node.zip/"
+  res: "/<input type='hidden' name='node\[parent_id\]' value='22'/>/"
+
+
+label_on_input:
+  context:
+    lang: fr
+  src: "<r:input label='t' name='title'/>"
+  res: "<label>titre</label> <span><input type='text' name='node[title]' value='Etat des travaux'/></span>"
+
+label_on_textarea:
+  context:
+    lang: fr
+  src: "<r:textarea label='t' name='title'/>"
+  res: "<label>titre</label> <span><textarea name='node[title]'>Etat des travaux</textarea></span>"
+
+label_on_checkbox:
+  context:
+    lang: fr
+  src: "<r:checkbox label='t' name='title' values='1,2'/>"
+  res: "/<label>titre</label>.*input type='checkbox'"
+
+label_on_select:
+  context:
+    lang: fr
+  src: "<r:select label='t' name='title' values='1,2'/>"
+  res: "/<label>titre</label> <span><select name='node\[title\]'/"
+
+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>"

data/test/integration/zafu_compiler/i18n.yml

@@ -87,7 +87,7 @@ trans_text_dyn_string:
 trans_rubyless_dyn_string:
   context:
     lang: 'fr'
-  src: "<r:load dictionary='/default/translations'><p do='t(\"lang_#{ref_lang}\")'/></r:load>"
+  src: "<r:load dictionary='/Default skin/translations'><p do='t(\"lang_#{ref_lang}\")'/></r:load>"
   res: "<p>anglais</p>"
 
 trans_literal_string:
@@ -112,51 +112,56 @@ complex_lang_list:
     <ul do='site.lang_list'>
       <li do='each' class='#{this == visitor.lang ? "on" : "off"}' do='zen_path(@node, :lang =&gt; this)'/>
     </ul>
-  res: "/li class='on'>/oo/projects/cleanWater/page22.html\?lang=en</"
+  res: "/li class='on'>/oo/projects-list/Clean-Water-project/page22.html\?lang=en</"
 
 html_lang_and_dict:
-  src: "<html xmlns='http://www.w3.org/1999/xhtml' lang='#{v.lang}' do='load' dictionary='/default/translations' xml:lang='en'></html>"
+  src: "<html xmlns='http://www.w3.org/1999/xhtml' lang='#{v.lang}' do='load' dictionary='/Default skin/translations' xml:lang='en'></html>"
   res: "<html xmlns='http://www.w3.org/1999/xhtml' lang='en'></html>"
 
 dictionary_fr:
   context:
     lang: 'fr'
-  src: "<r:load dictionary='/default/translations'><r:trans>foo</r:trans>: <r:t>I love</r:t> <r:trans>words</r:trans></r:load>"
-  tem: "<% _zdict = load_dictionary(828931430) -%>foo: j'aime les mots"
+  src: "<r:load dictionary='/Default skin/translations'><r:trans>foo</r:trans>: <r:t>I love</r:t> <r:trans>words</r:trans></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) %>foo: j'aime les mots"
   res: "foo: j'aime les mots"
 
 dynamic_dictionary_eval_fr:
   context:
     lang: 'fr'
     node: status
-  src: "<r:load dictionary='/default/translations'><r:eval>trans(node_name)</r:eval></r:load>"
-  tem: "<% _zdict = load_dictionary(828931430) -%><%= _zdict.get(@node.node_name) %>"
-  res: "statut"
+  src: "<r:load dictionary='/Default skin/translations'><r:eval>trans(title)</r:eval></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) %><%= _zdict.get(@node.prop['title']) %>"
+  res: "Etat des travaux"
 
 dynamic_dictionary_t_fr:
   context:
     lang: 'fr'
     node: status
-  src: "<r:load dictionary='/default/translations'><r:t attr='node_name'/></r:load>"
-  tem: "<% _zdict = load_dictionary(828931430) -%><%= _zdict.get(@node.node_name) %>"
-  res: "statut"
+  src: "<r:load dictionary='/Default skin/translations'><r:t attr='title'/></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) %><%= _zdict.get(@node.prop['title']) %>"
+  res: "Etat des travaux"
 
 dynamic_dictionary_literal_fr:
   context:
     lang: 'fr'
     node: status
-  src: "<r:load dictionary='/default/translations'><r:eval>trans('status')</r:eval></r:load>"
-  tem: "<% _zdict = load_dictionary(828931430) -%>statut"
+  src: "<r:load dictionary='/Default skin/translations'><r:eval>trans('status title')</r:eval></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) %>statut"
   res: "statut"
 
 dictionary_de:
   context:
     lang: 'de'
-  src: "<r:load dictionary='/default/translations'><r:trans>foo</r:trans>: <r:trans>I love</r:trans> <r:trans>words</r:trans></r:load>"
-  tem: "<% _zdict = load_dictionary(828931430) -%>foo: Ich liebe Wörter"
+  src: "<r:load dictionary='/Default skin/translations'><r:trans>foo</r:trans>: <r:trans>I love</r:trans> <r:trans>words</r:trans></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) %>foo: Ich liebe Wörter"
   res: "foo: Ich liebe Wörter"
 
 dictionary_tformat:
-  src: "<r:load dictionary='/default/translations'><r:show date='created_at' tformat='date_format'/></r:load>"
-  tem: "<% _zdict = load_dictionary(828931430) -%><%= format_date(@node.created_at, :format => \"[%d.%m]\") %>"
-  res: "[10.03]"
+  src: "<r:load dictionary='/Default skin/translations'><r:show date='created_at' tformat='date_format'/></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) %><%= format_date(@node.created_at, :format => \"[%d.%m]\") %>"
+  res: "[10.03]"
+
+iconv:
+  src: "<r:iconv to='latin1'>août</r:iconv>"
+  tem: "<% _zdata = capture do %>août<% end %><%= Iconv.iconv(\"latin1\", 'utf8', _zdata) %>"
+  res: "ao\xfbt"

data/test/integration/zafu_compiler/idx_scope.yml

@@ -0,0 +1,7 @@
+default:
+  context:
+    lang: 'en'
+    visitor: 'ant'
+    node: 'status'
+  src: "<b do='blog in site' do='scope_index.tag_title'/>"
+  tem: "/var1\.scope_index \? var1\.scope_index\.tag_title : nil/"

data/test/integration/zafu_compiler/later.yml

@@ -2,17 +2,17 @@
 # [set] should be reimplemented with RubyLess in mind
 if_test_param_var:
   src: "<r:set var='year'>3000</r:set><r:if test='year eq param:f'>funky!</r:if>"
-  tem: "<% set_year = capture do %>3000<% end -%><% if set_year == params[:f] -%>funky!<% end -%>"
+  tem: "<% set_year = capture do %>3000<% end %><% if set_year == params[:f] %>funky!<% end %>"
 
 # [zafu_attribute:edit] needs reimplementation with JS rendering (like drag/drop): use data attribute ? class name ?
 show_edit:
-  src: "<r:show attr='node_name' edit='true'/>"
-  tem: "<% if @node.can_write? -%><span class='show_edit' id='list1_name'><%= link_to_remote(@node.name, :url => edit_node_path(@node.zip) + \"?attribute=name&dom_id=list1_name\", :method => :get) %></span><% else -%><%= @node.name %><% end -%>"
+  src: "<r:show attr='title' edit='true'/>"
+  tem: "<% if @node.can_write? %><span class='show_edit' id='list1_name'><%= link_to_remote(@node.name, :url => edit_node_path(@node.zip) + \"?attribute=name&dom_id=list1_name\", :method => :get) %></span><% else %><%= @node.name %><% end %>"
   res: "/span class='show_edit' id='list1_name'>.*Ajax\.Request\('/nodes/22/edit\?attribute=name/"
 
 
 # The result should replace scoped ids "list1_#{var1.zip}_#{var2.zip}" by "#{ndom_id(@node)}_#{var2.zip}".
-each_in_each_dom_id:
+saved_each_in_each_dom_id:
   src: |
     <ul class='tags' do='tags in site'>
       <li do='each'><b do='link'/>
@@ -25,25 +25,19 @@ each_in_each_dom_id:
     </ul>
   'ajax/each/en/in/each/dom/id/list1.erb': "/id='<%= %Q\{#\{ndom_id(@node)\}_#\{var2.zip\}\} %>'>/"
 
-# [swap] needs to be reimplemented
-swap_in_each:
-  src: "<r:pages><li do='each'><span do='swap' attr='origin' states='todo,done,alert'/></li></r:pages>"
-  tem: "/<li id='list1_<%= var1.zip %>'><span>.*var1.can_write?.*tag_to_remote.*else.*var1.version.dyn\[\"status\"\]/"
-
-
 # [ajax] zazen edit=true (maybe should implement in zafu_attributes with filter_edit)
 zazen_edit:
-  src: "<r:zazen attr='node_name' edit='true'/>"
-  tem: "<div class='zazen' id='list1_name'><% if @node.can_write? -%><span class='zazen_edit'><%= link_to_remote(\"edit\", :url => edit_node_path(@node.zip) + \"?attribute=name&dom_id=list1_name&zazen=true\", :method => :get) %></span><% end -%><%= zazen(@node.node_name, :node=>@node) %></div>"
+  src: "<r:zazen attr='title' edit='true'/>"
+  tem: "<div class='zazen' id='list1_name'><% if @node.can_write? %><span class='zazen_edit'><%= link_to_remote(\"edit\", :url => edit_node_path(@node.zip) + \"?attribute=name&dom_id=list1_name&zazen=true\", :method => :get) %></span><% end %><%= zazen(@node.prop['title'], :node=>@node) %></div>"
   res: "/div class='zazen' id='list1_name'>.*Ajax\.Request\('/nodes/22/edit\?attribute=name/"
 
 zazen_edit_publish_force:
-  src: "<r:zazen attr='node_name' edit='true' publish='force'/>"
-  tem: "/attribute=node_name&dom_id=.*_node_name&publish=force&zazen=true/"
+  src: "<r:zazen attr='title' edit='true' publish='force'/>"
+  tem: "/attribute=title&dom_id=.*_title&publish=force&zazen=true/"
 
 zazen_edit_publish_true:
-  src: "<r:zazen attr='node_name' edit='true' publish='true'/>"
-  tem: "/attribute=node_name&dom_id=.*_node_name&publish=true&zazen=true/"
+  src: "<r:zazen attr='title' edit='true' publish='true'/>"
+  tem: "/attribute=title&dom_id=.*_title&publish=true&zazen=true/"
 
 # Update query builder for DataEntry
 select_nodes_data_list:

data/test/integration/zafu_compiler/off/off.yml

@@ -1,6 +1,6 @@
 
 cache_part:
-  src: "<r:cache><r:show attr='node_name'/></r:cache>"
+  src: "<r:cache><r:show attr='title'/></r:cache>"
   tem: "<% cache1 = Cache.with(visitor.id, visitor.group_ids, \"NP\", \"en\", \"/cache/part/list1\") do capture do %><%= @node.name %><% end; end %><%= cache1 %>"
 
 trans_show:
@@ -12,4 +12,4 @@ trans_show:
 
 node_path:
   src: "<r:context select='/projects/wiki'><r:link/></r:context>"
-  res: "<a href='/en/project29.html'>a wiki with zena</a>"
+  res: "<a href='/en/blog29.html'>a wiki with Zena</a>"

data/test/integration/zafu_compiler/query.yml

@@ -0,0 +1,207 @@
+default:
+  context:
+    lang: 'en'
+    visitor: 'ant'
+    node: 'cleanWater'
+  src: "simple text"
+  tem: "simple text"
+  res: "simple text"
+
+# ============= query_parse_param ========
+empty:
+  tem: "<%= query_parse('para' => %{}) %>"
+  res: "1=1"
+
+empty_quotes:
+  tem: "<%= query_parse('para' => %{\"\"}) %>"
+  res: "para = \"\""
+
+empty_single_quotes:
+  tem: "<%= query_parse('para' => %{''}) %>"
+  res: "para = ''"
+
+null_quoted:
+  tem: "<%= query_parse('para' => %{\"null\"}) %>"
+  res: "para = \"null\""
+
+is_null:
+  tem: "<%= query_parse('para' => %{null}) %>"
+  res: "para is null"
+
+is_not_null:
+  tem: "<%= query_parse('para' => %{!null}) %>"
+  res: "not (para is null)"
+
+literal:
+  tem: "<%= query_parse('para' => %{hello}) %>"
+  res: "para = \"hello\""
+
+literal_date:
+  tem: "<%= query_parse('para' => %{2.12.1983}) %>"
+  res: "para = '1983-12-02'"
+
+number:
+  tem: "<%= query_parse('para' => %{45}) %>"
+  res: "para = 45"
+
+not_number:
+  tem: "<%= query_parse('para' => %{!45}) %>"
+  res: "not (para = 45)"
+
+greater_then:
+  tem: "<%= query_parse('para' => %{>32}) %>"
+  res: "para >32"
+
+greater_then_date:
+  context:
+    lang: fr
+  tem: "<%= query_parse('para' => %{>7.5.1965}) %>"
+  res: "para >'1965-05-07'"
+
+greater_or_equal_then:
+  tem: "<%= query_parse('para' => %{>=32}) %>"
+  res: "para >=32"
+
+smaller_then:
+  tem: "<%= query_parse('para' => %{< 32}) %>"
+  res: "para < 32"
+
+smaller_or_equal_then:
+  tem: "<%= query_parse('para' => %{<=32}) %>"
+  res: "para <=32"
+
+equal:
+  tem: "<%= query_parse('para' => %{=32+3}) %>"
+  res: "para =32+3"
+
+not_equal:
+  tem: "<%= query_parse('para' => %{!=32}) %>"
+  res: "not (para =32)"
+
+interval:
+  tem: "<%= query_parse('para' => %{10..20}) %>"
+  res: "para >= 10 and para <= 20"
+
+interval_date:
+  context:
+    lang: fr
+  tem: "<%= query_parse('para' => %{1.1.2010..31.12.2010}) %>"
+  res: "para >= '2010-01-01' and para <= '2010-12-31'"
+
+not_interval_date:
+  context:
+    lang: fr
+  tem: "<%= query_parse('para' => %{!1.1.2010..31.12.2010}) %>"
+  res: "not (para >= '2010-01-01' and para <= '2010-12-31')"
+
+interval_date_en:
+  context:
+    lang: en
+  tem: "<%= query_parse('para' => %{2010/1/1..2010/12/31}) %>"
+  res: "para >= '2010-01-01' and para <= '2010-12-31'"
+
+like:
+  tem: "<%= query_parse('para' => %{*bar}) %>"
+  res: "para like \"%bar\""
+
+like_at_end:
+  tem: "<%= query_parse('para' => %{bar*}) %>"
+  res: "para like \"bar%\""
+
+literal_with_star:
+  tem: "<%= query_parse('para' => %{'*bar'}) %>"
+  res: "para = '*bar'"
+
+many_params:
+  tem: "<%= query_parse('anti' => %{'*bar'}, 'gone' => %{> 13}) %>"
+  res: "/anti = '\*bar' and gone > 13|gone > 13 and anti = '\*bar'/"
+
+rubyless_query_parse:
+  context:
+    p:
+      id: '> 45'
+      name: 'foo'
+  src: "<r:eval>query_parse(params[:p])</r:eval>"
+  res: "/id > 45 and name = \"foo\"|name = \"foo\" and id > 45/"
+
+paginate_list:
+  src: "<r:pages in='site' limit='10' paginate='p' do='link' page='list'/>"
+  # should define page_name
+  res: "1 <a href='/oo/projects-list/Clean-Water-project?p=2'>2</a>"
+
+paginate_count:
+  src: "<r:pages in='site' paginate='p' do='count'/>"
+  # should properly pass the query to sub-contexts.
+  tem: '/<%= _znodes %>/'
+  res: "18"
+
+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)"
+# ============= Dynamic query ========
+
+query:
+  # Live compile and query from params
+  context:
+    visitor: lion
+    node: cleanWater
+    qb: "nodes where updated_at.year = 2007 in project"
+  src: "<r:query default='nodes in project' do='each' join=', ' do='title'/>"
+  tem: "/if var1 = query\('Node', \"@node\", params\[:qb\] \|\| \"nodes in project\"\)/"
+  res: 'crocodiles'
+
+query_with_default:
+  # Live compile and query from params
+  context:
+    visitor: lion
+    node: cleanWater
+  src: "<r:query default='nodes in project' do='each' join=', ' do='title'/>"
+  res: "crocodiles, it's a lake, Keeping things clean !, The lake we love, Nice Bananas, parc opening, status title, water"
+
+query_with_param:
+  # Live compile and query from params
+  context:
+    visitor: lion
+    node: cleanWater
+    qb: "nodes where updated_at.year = #{params[:p]} in project"
+    p: 2007
+  src: "<r:query default='nodes in project' do='each' join=', ' do='title'/>"
+  res: 'crocodiles'
+
+query_eval:
+  # Live compile and query from params
+  context:
+    visitor: lion
+    node: cleanWater
+    scope: 'self'
+  src: "<r:query select='pages in #{params[:scope] || \"project\"}' default='pages in project' do='each' join=', ' do='title'/>"
+  res: 'crocodiles, Keeping things clean !, Nice Bananas, status title'
+
+query_with_parse:
+  context:
+    filter:
+      title: 'status title'
+  src: "<r:query default='pages in site' select='pages where #{query_parse(params[:filter])} in site' do='each' join=', ' do='title'/>"
+  tem: '/query.*pages where #\{query_parse\(params\[:filter\]\)\} in site\"\)/'
+  res: 'status title'
+
+query_with_parse_paginate:
+  src: "<r:query default='pages in site limit 4 paginate p' select='pages where #{query_parse(params[:q])} in site limit 2 paginate p' do='link' page='list'/>"
+  # should properly pass the query to sub-contexts.
+  tem: '/page_numbers/'
+  res: "/1.*2.*3.*4.*5/"
+
+query_can_be_nil_bad_argument_type:
+  context:
+    filter:
+      title: 'status title'
+  src: "<r:query default='pages in site' eval='params[:filter]' do='each' join=', ' do='title'/>"
+  tem: '/params\[:filter\] \|\| \"pages in site\"/'
+  res: ''
+
+query_truc:
+  tem: '<%= query("Page", "@node", "pages in site", :type => :count) %>'
+  res: '18'