zena 1.2.2 → 1.2.3

data/test/integration/zafu_compiler/query.yml

@@ -37,8 +37,10 @@ literal:
   res: "para = \"hello\""
 
 literal_date:
+  context:
+    lang: fr
   tem: "<%= query_parse('para' => %{2.12.1983}) %>"
-  res: "para = '1983-12-02'"
+  res: "para = '1983-12-01 23:00'"
 
 number:
   tem: "<%= query_parse('para' => %{45}) %>"
@@ -55,8 +57,10 @@ greater_then:
 greater_then_date:
   context:
     lang: fr
+    tz: Asia/Jakarta
   tem: "<%= query_parse('para' => %{>7.5.1965}) %>"
-  res: "para >'1965-05-07'"
+  # Uses visitor timezone to UTC
+  res: "para >'1965-05-06 17:00'"
 
 greater_or_equal_then:
   tem: "<%= query_parse('para' => %{>=32}) %>"
@@ -86,19 +90,19 @@ 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'"
+  res: "para >= '2009-12-31 23:00' and para <= '2010-12-30 23:00'"
 
 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')"
+  res: "not (para >= '2009-12-31 23:00' and para <= '2010-12-30 23:00')"
 
 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'"
+  res: "para >= '2009-12-31 23:00' and para <= '2010-12-30 23:00'"
 
 like:
   tem: "<%= query_parse('para' => %{*bar}) %>"
@@ -242,7 +246,7 @@ query_count:
 
 simple_select:
   src: "<div do='nodes select title as ti' find='first' do='ti'/>"
-  tem: '/<%= var1.attributes\["ti"\] %>/'
+  tem: '/<%=h var1.attributes\["ti"\] %>/'
   res: "<div>crocodiles</div>"
 
 select_with_type:
@@ -252,12 +256,12 @@ select_with_type:
 
 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"\] %>/'
+  tem: '/<%=h var2.attributes\["pt"\] %>: <%=h var2.attributes\["it"\] %>/'
   res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it's a lake</div>"
 
 select_in_from_saved:
   src: "<div do='images select title as it from projects select title as pt in site' do='set' list='this' do='list' do='each' join=', '><r:pt/>: <r:it/></div>"
-  tem: '/<%= var3.attributes\["pt"\] %>: <%= var3.attributes\["it"\] %>/'
+  tem: '/<%=h var3.attributes\["pt"\] %>: <%=h var3.attributes\["it"\] %>/'
   res: "<div>a wiki with Zena: bird, a wiki with Zena: flower, Clean Water project: it's a lake</div>"
 
 select_group:
@@ -278,13 +282,27 @@ query_errors:
   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>"
 
+query_count:
+  context:
+    c: 'badaboum'
+  src: "<r:query default='nodes in site' find='count' select='pages in site'/>"
+  tem: "/:find => :count/"
+  res: "19"
+
+query_count_string_context:
+  context:
+    c: 'badaboum'
+  src: "<r:void do='%q{2007}'><r:query default='nodes in site' find='count' select='pages where created_at.year < #{this} in site'/></r:void>"
+  tem: '/.Node., "@node".*:find => :count/'
+  res: "19"
+  
 find_with_rubyless:
   src: "<b do='find(\"images in site limit 2\")' do='each' join=', ' do='title'/>"
   res: "<b>Autumn Tree, bird</b>"
 
 find_loads_class:
   src: "<div do='find(11)'><r:origin/></div>"
-  tem: "<% if var1 = find_node_by_zip(11) %><div><%= var1.prop['origin'] %></div><% end %>"
+  tem: "<% if var1 = find_node_by_zip(11) %><div><%=h var1.prop['origin'] %></div><% end %>"
 
 query_on_vclass:
   # typical syntax error (should be Contact?)

data/test/integration/zafu_compiler/relations.yml

@@ -43,7 +43,7 @@ pages:
 
 root:
   src: "<r:root do='title'/>"
-  tem: "<% if var1 = visitor.site.root_node %><%= var1.prop['title'] %><% end %>"
+  tem: "<% if var1 = visitor.site.root_node %><%=h var1.prop['title'] %><% end %>"
   res: 'Zena the wild CMS'
 
 root_should_be_a_project_for_relations:
@@ -52,7 +52,7 @@ root_should_be_a_project_for_relations:
 
 root_should_be_a_project_for_attributes:
   src: "<r:root do='origin'/>"
-  tem: "<% if var1 = visitor.site.root_node %><%= var1.prop['origin'] %><% end %>"
+  tem: "<% if var1 = visitor.site.root_node %><%=h var1.prop['origin'] %><% end %>"
 
 notes:
   context:
@@ -118,11 +118,11 @@ author:
 
 public_readable_link:
   src: "<r:show attr='set_tag_ids'/>"
-  tem: '<%= h @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: '<%= h @node.rel["hot_for"].try(:other_zips) %>'
+  tem: '<%=h @node.rel["hot_for"].try(:other_zips) %>'
   res: '21'
 
 public_readable_link_id:
@@ -140,7 +140,7 @@ context_root:
 
 parent:
   src: "<r:parent do='title'/>"
-  tem: "<% if var1 = @node.parent %><%= var1.prop['title'] %><% end %>"
+  tem: "<% if var1 = @node.parent %><%=h var1.prop['title'] %><% end %>"
   res: "Clean Water project"
 
 parent_no_parent:
@@ -418,7 +418,7 @@ nodes_in_site_group_by_year:
 
 find_by_zip:
   src: "<div do='find(30)' do='img'/>"
-  res: '/image30_std.jpg/'
+  res: '/image30_std.75a9a.jpg/'
 
 find_count:
   context:
@@ -433,7 +433,7 @@ same_name_as_class:
 
 start:
   src: "<r:start do='title'/>"
-  tem: "<% var1 = start_node %><%= var1.prop['title'] %>"
+  tem: "<% var1 = start_node %><%=h var1.prop['title'] %>"
   res: 'status title'
 
 from_class_start:
@@ -466,12 +466,12 @@ array_count:
 
 first:
   src: "<div do='nodes in site'><r:first do='link'/></div>"
-  tem: "/if var2 = var1.first %><a href='<%= zen_path\(var2\) %>'><%= var2.prop\['title'\] %>/"
+  tem: "/if var2 = var1.first %><a href='<%= zen_path\(var2\) %>'><%=h var2.prop\['title'\] %>/"
   res: '/a href.*a wiki with Zena/'
 
 rubyless_first:
   src: "<div do='nodes in site'><span do='first.title'/></div>"
-  tem: "/span><%= \(var1.first \? var1.first.prop\['title'\] : nil\) %>/"
+  tem: "/span><%=h \(var1.first \? var1.first.prop\['title'\] : nil\) %>/"
   res: '<div><span>a wiki with Zena</span></div>'
 
 query_in_array:

data/test/integration/zafu_compiler/roles.yml

@@ -10,7 +10,7 @@ default:
 
 show_property_filter_vclass:
   src: "<r:Letter? do='paper'/>"
-  tem: "<% if @node.kpath_match?('NNL') %><%= @node.prop['paper'] %><% end %>"
+  tem: "<% if @node.kpath_match?('NNL') %><%=h @node.prop['paper'] %><% end %>"
 
 show_property_filter_role_no_role:
   src: "<r:Original?>Has an origin</r:Original?>"
@@ -59,12 +59,12 @@ vclass_name:
   context:
     node: letter
   src: "<r:vclass do='name'/>"
-  tem: "<% var1 = @node.virtual_class %><%= var1.name %>"
+  tem: "<% var1 = @node.virtual_class %><%=h var1.name %>"
   res: "Letter"
 
 vclass_icon:
   src: " <r:Letter do='icon'/>"
-  tem: "<% if var1 = VirtualClass[\"Letter\"] %> <%= var1.prop['icon'] %><% end %>"
+  tem: "<% if var1 = VirtualClass[\"Letter\"] %> <%=h var1.prop['icon'] %><% end %>"
   res: " /images/page.png"
 
 vclass_img:
@@ -89,7 +89,7 @@ vclass_column_size:
 
 vclass_context:
   src: "<r:Image><r:name/></r:Image>"
-  tem: "<% if var1 = VirtualClass[\"Image\"] %><%= var1.name %><% end %>"
+  tem: "<% if var1 = VirtualClass[\"Image\"] %><%=h var1.name %><% end %>"
   res: "Image"
 
 vclass_scope:
@@ -101,7 +101,7 @@ vclass_scope:
 
 vclass_in_rubyless:
   src: "<b do='Contact.name'/>"
-  tem: "<b><%= (VirtualClass[\"Contact\"] ? VirtualClass[\"Contact\"].name : nil) %></b>"
+  tem: "<b><%=h (VirtualClass[\"Contact\"] ? VirtualClass[\"Contact\"].name : nil) %></b>"
   res: "<b>Contact</b>"
 
 grid_manual:
@@ -137,4 +137,4 @@ inspect_display_links:
         <li do='each' do='link'/>
       </ul>
     </r:Template>
-  tem: '/<h3><%= _zrel %></h3>/'
+  tem: '/<h3><%=h _zrel %></h3>/'

data/test/integration/zafu_compiler/rubyless.yml

@@ -4,6 +4,11 @@ default:
     visitor: 'anon'
     node: 'status'
 
+show_literal:
+  src: "<r:void do='%Q{&}'/>"
+  tem: "&amp;"
+  res: "&amp;"
+  
 tagged_relation:
   context:
     node: 'art'
@@ -24,11 +29,11 @@ tagged_rubyless:
   context:
     node: 'status'
   src: "<r:tagged do='keys'><r:each join=', ' do='show'/></r:tagged>"
-  res: "sky, blue"
+  res: "/sky, blue|blue, sky/"
 
 optional_hash:
   src: "<r:dummy do='hello' lang='fr'/>"
-  tem: "<% var1 = @node.dummy %><%= var1.hello({:lang => \"fr\"}) %>"
+  tem: "<% var1 = @node.dummy %><%=h var1.hello({:lang => \"fr\"}) %>"
   res: "Salut poilu!"
 
 build_query:

data/test/integration/zafu_compiler/safe_definitions.yml

@@ -12,7 +12,7 @@ params:
     d: 'hello ladies'
   old_src: "<i do='show' param='d'/>"
   src: "<i do='params[:d]'/>"
-  tem: "<i><%= params[:d] %></i>"
+  tem: "<i><%=h params[:d] %></i>"
   res: "<i>hello ladies</i>"
 
 string_gsub:
@@ -140,14 +140,20 @@ array_include:
   src: "<b do='[1,2,3].include?(2)'/>"
   tem: "<% if [1,2,3].include?(2) %><b></b><% end %>"
 
+range:
+  context:
+    x: 4
+  src: "<r:void do='(0..params[:x].to_i).to_a'><span do='each' join=' ' do='this'/></r:void>"
+  res: '<span>0</span> <span>1</span> <span>2</span> <span>3</span> <span>4</span>'
+  
 hash_to_params:
   context:
     q:
       one: '1'
       two: '2'
   src: "<b do='{:q => params[:q]}' do='to_param'/>"
-  tem: "<% var1 = {:q => params[:q]} %><b><%= var1.to_param %></b>"
-  res: '<b>q%5Bone%5D=1&q%5Btwo%5D=2</b>'
+  tem: "<% var1 = {:q => params[:q]} %><b><%=h var1.to_param %></b>"
+  res: '<b>q%5Bone%5D=1&amp;q%5Btwo%5D=2</b>'
 
 string_hash:
   src: "<b do='set' a='string_hash'>AAA<r:eval>a['foo']</r:eval></b>"
@@ -158,4 +164,27 @@ string_hash_with_params:
   src: "<b do='set' a='string_hash(:foo => \"men\")'>AAA<r:eval>a['foo']</r:eval></b>"
   res: "<b>AAAmen</b>"
   tem: "/StringHash.from_hash\(\{:foo => \"men\"\}\)/"
-  
+  
+aparams:
+  context:
+    par: 'a, b, '
+  src: "<div do='aparams[:par]'><r:each join='==' do='this'/></div>"
+  res: "<div>a==b</div>"
+  
+aparams_array:
+  context:
+    par:
+      - a
+      - b
+      - ''
+  src: "<div do='aparams[:par]'><r:each join='==' do='this'/></div>"
+  res: "<div>a==b</div>"
+
+hparams:
+  context:
+    par:
+      x: 'a'
+      y: 'b'
+  src: "<div do='hparams[:par][:x]'/><div do='hparams[:par][:y]'/>"
+  res: "<div>a</div><div>b</div>"
+

data/test/integration/zafu_compiler/security.yml

@@ -45,7 +45,52 @@ build_erb_with_void:
     lang: fr
   src: "ABC: <r:void><</r:void><r:void>%= 5+8 %</r:void><r:void>></r:void></r:load>"
   tem: "ABC: <span class='parser_error'>Invalid tag near '&lt;&lt;/r:void&gt;&lt;'</span>"
-  
+
+erb_in_trans_do:
+  context:
+    lang: fr
+  src: |
+    <r:load dictionary='/Default skin/translations'>
+      <p do='t'>mean</p>
+    </r:load>
+  res: "!/13/"
+
+erb_in_trans_do_t:
+  context:
+    lang: fr
+  src: |
+    <r:load dictionary='/Default skin/translations'>
+      <p do='t("mean")'/>
+    </r:load>
+  res: "!/13/"
+
+erb_in_trans_r_t:
+  context:
+    lang: fr
+  src: |
+    <r:load dictionary='/Default skin/translations'>
+      <r:t>mean</r:t>
+    </r:load>
+  res: "!/13/"
+
+erb_in_trans_dyn_t:
+  context:
+    lang: fr
+  src: |
+    <r:load dictionary='/Default skin/translations'>
+      <p do='t("#{origin}mean")'/>
+    </r:load>
+  res: "!/13/"
+
+erb_in_trans_link:
+  context:
+    lang: fr
+  src: |
+    <r:load dictionary='/Default skin/translations'>
+      <p do='link' t='mean'/>
+    </r:load>
+  res: "!/13/"
+
 mean_inc:
   src: '<'
   res: '&lt;'

data/test/integration/zafu_compiler/urls.yml

@@ -44,7 +44,7 @@ path_with_mode:
 
 link:
   src: "<r:link/>"
-  tem: "<a href='<%= zen_path(@node) %>'><%= @node.prop['title'] %></a>"
+  tem: "<a href='<%= zen_path(@node) %>'><%=h @node.prop['title'] %></a>"
   res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a>"
 
 link_not_logged:
@@ -75,7 +75,7 @@ link_class:
 
 link_set_class:
   src: "<r:link class='#{title}_foo'/>"
-  tem: "<a class='<%= \"#{@node.prop['title']}_foo\" %>' href='<%= zen_path(@node) %>'><%= @node.prop['title'] %></a>"
+  tem: "<a class='<%= \"#{@node.prop['title']}_foo\" %>' href='<%= zen_path(@node) %>'><%=h @node.prop['title'] %></a>"
   res: "<a class='status title_foo' href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a>"
 
 link_set_title:
@@ -84,7 +84,7 @@ link_set_title:
 
 link_attr:
   src: "<r:link attr='ref_lang'/>"
-  tem: "<a href='<%= zen_path(@node) %>'><%= @node.ref_lang %></a>"
+  tem: "<a href='<%= zen_path(@node) %>'><%=h @node.ref_lang %></a>"
   res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'>en</a>"
 
 link_tattr:
@@ -108,19 +108,19 @@ link_parent:
 
 link_with_block:
   src: "<r:link href='parent'>look at <b do='title'>her</b></r:link>"
-  tem: "<a href='<%= zen_path(@node.parent) %>'>look at <b><%= @node.prop['title'] %></b></a>"
+  tem: "<a href='<%= zen_path(@node.parent) %>'>look at <b><%=h @node.prop['title'] %></b></a>"
   res: "<a href='/oo/projects-list/Clean-Water-project'>look at <b>status title</b></a>"
 
 link_project:
   context:
     node: 'bird_jpg'
   src: "<r:link href='project'/>"
-  tem: "<a href='<%= zen_path(@node.project) %>'><%= @node.prop['title'] %></a>"
+  tem: "<a href='<%= zen_path(@node.project) %>'><%=h @node.prop['title'] %></a>"
   res: "<a href='/oo/blog29.html'>bird</a>"
 
 link_root:
   src: "<r:link href='root'/>"
-  tem: "<a href='<%= zen_path(visitor.site.root_node) %>'><%= @node.prop['title'] %></a>"
+  tem: "<a href='<%= zen_path(visitor.site.root_node) %>'><%=h @node.prop['title'] %></a>"
   res: "<a href='/oo'>status title</a>"
 
 link_anchor:
@@ -200,14 +200,14 @@ link_with_custom_params:
   context:
     year: 2010
   src: "<r:link class='foo' href='main' y='params[:year]'/>"
-  tem: "<a class='foo' href='<%= zen_path(@node, {:y => params[:year]}) %>'><%= @node.prop['title'] %></a>"
+  tem: "<a class='foo' href='<%= zen_path(@node, {:y => params[:year]}) %>'><%=h @node.prop['title'] %></a>"
   res: "<a class='foo' href='/oo/projects-list/Clean-Water-project/page22.html?y=2010'>status title</a>"
 
 link_format_data:
   context:
     node: bird_jpg
   src: "<r:link format='data'/>"
-  res: "<a href='/en/image30.jpg?1144713600'>bird</a>"
+  res: "<a href='/en/image30.11fbc.jpg'>bird</a>"
 
 live_link_format:
   old_src: "<h2 do='title' link='details.xml'/>"
@@ -219,7 +219,7 @@ live_link_data_mode:
     node: 'bird_jpg'
   old_src: "<h2 do='title' link='pv.data'>super title</h2>"
   src: "<h2 do='link' live='true' mode='pv' format='data'/>"
-  res: "<h2><a id='_title30' href='/en/image30_pv.jpg?967816914293'>bird</a></h2>"
+  res: "<h2><a id='_title30' href='/en/image30_pv.7f6f0.jpg'>bird</a></h2>"
 
 url_with_lang:
   context:
@@ -239,8 +239,17 @@ link_in_list_context:
   res: '/a href.*page22.html.*status title/'
 
 link_trans:
-  src: "<r:link t='img_next_page'/>"
-  res: "/a href.*/images/control_fastforward.png/"
+  context:
+    lang: fr
+  src: |
+    <r:load dictionary='/Default skin/translations'>
+      <r:link t='view_live'/>
+    </r:load>
+  tem: "/view live <img src='/images/bullet_go.png'/>/"
+  
+link_trans_block:
+  src: "<r:link do='t'>img_next_page</r:link>"
+  res: "/a href.*<img src='/images/control_fastforward.png'/"
 
 link_date_complex:
   context:
@@ -294,8 +303,8 @@ encode_blank_values:
 
 cachestamp:
   # 26 would be the template for rendering JS's id.
-  src: "<script src='#{path(project, :format => \"js\", :tstamp => find(26).updated_at.to_i)}'></script>"
-  res: "<script src='/oo/projects-list/Clean-Water-project.js?1144713600&tstamp=1176249600'></script>"
+  src: "<script src='#{path(project, :format => \"js\")}'></script>"
+  res: "<script src='/oo/projects-list/Clean-Water-project.11fbc.js'></script>"
 
 node_in_argument:
   src: "<r:link node[done_by]='visitor_node'/>"
@@ -311,6 +320,12 @@ link_page_next_with_block:
   src: "<r:nodes in='site' limit='3' order='zip' paginate='pak'><r:link page='next' do='t'>next</r:link></r:nodes>"
   res: "<a href='/oo/projects-list/Clean-Water-project/page22.html?pak=2'>next</a>"
 
+link_page_next_relation:
+  context:
+    node: art
+  src: "<r:Tag?><div id='a' do='block' do='tagged order by l_status asc limit 1 paginate pak'><r:link page='next' update='a' do='t'>next</r:link></div></r:Tag?>"
+  res: "!/parser_error/"
+
 link_page_list:
   context:
     pak: 2

data/test/integration/zafu_compiler/user.yml

@@ -10,7 +10,7 @@ default:
 
 login:
   src: "<r:visitor do='login'/>"
-  tem: "<% var1 = visitor %><%= var1.login %>"
+  tem: "<% var1 = visitor %><%=h var1.login %>"
   res: "ant"
 
 lang:
@@ -23,25 +23,30 @@ is_anon:
 
 user_is_a_user:
   src: "<b do='user.login'/>"
-  tem: "<b><%= @node.user.login %></b>"
+  tem: "<b><%=h @node.user.login %></b>"
   res: '<b>ant</b>'
 
 user_node_is_a_node:
   src: "<b do='user.node.title'/>"
-  tem: "<b><%= (@node.user.node ? @node.user.node.prop['title'] : nil) %></b>"
+  tem: "<b><%=h (@node.user.node ? @node.user.node.prop['title'] : nil) %></b>"
   res: '<b>Solenopsis Invicta</b>'
   
 version_user_is_a_user:
   src: "<b do='v.user.login'/>"
-  tem: "<b><%= @node.version.user.login %></b>"
+  tem: "<b><%=h @node.version.user.login %></b>"
   res: '<b>ant</b>'
 
 author_is_a_node:
   src: "<b do='author.title'/>"
-  tem: "<b><%= (@node.author ? @node.author.prop['title'] : nil) %></b>"
+  tem: "<b><%=h (@node.author ? @node.author.prop['title'] : nil) %></b>"
   res: '<b>Solenopsis Invicta</b>'
 
 version_author_is_a_node:
   src: "<b do='v.author.title'/>"
-  tem: "<b><%= (@node.version.author ? @node.version.author.prop['title'] : nil) %></b>"
-  res: '<b>Solenopsis Invicta</b>'
+  tem: "<b><%=h (@node.version.author ? @node.version.author.prop['title'] : nil) %></b>"
+  res: '<b>Solenopsis Invicta</b>'
+
+in_group:
+  src: <r:if test='visitor.in_group?("managers")'>managers</r:if>
+  tem: "<% if visitor.in_group?(\"managers\") %>managers<% end %>"
+  res: ""

data/test/integration/zafu_compiler/zafu_attributes.yml

@@ -85,7 +85,7 @@ store_node:
 store_in_block:
   src: "<r:block><r:void set_found='this' do='node' where='id = 18 in site' do='page'><r:found do='title'/>: <r:show attr='title'/></r:void></r:block>"
   res: "<div id='list1' data-z='22'>status title: a wiki with Zena</div>"
-  'zafu_attributes/store/in/block/en/list1.erb': "/_zfound = @node.*<% var3 = _zfound %><%= var3.prop\['title'\] %>:/"
+  'zafu_attributes/store/in/block/en/list1.erb': "/_zfound = @node.*<% var3 = _zfound %><%=h var3.prop\['title'\] %>:/"
 
 set_var_outside_block:
   old_src: "<r:node select='18' set_found='this' do='pages'><r:block><r:show attr='title'/>: <r:context select='found' do='title'/></r:block></r:node>"

data/test/integration/zafu_compiler/zazen.yml

@@ -33,7 +33,7 @@ link_anchor_in_blank_prop:
 
 complex_link:
   tem: <%= zazen("p<. !<.31_pv!:22\n\nh4(clear). \"\":22") %>
-  res: "<p style=\"text-align:left;\"><div class='img_left'><a href=\"/oo/projects-list/Clean-Water-project/page22.html\"><img src='/en/image31_pv.jpg?967816914293' width='70' height='70' alt='flower' class='pv'/></a></div></p>\n\n\n\t<h4 class=\"clear\"><a href=\"/oo/projects-list/Clean-Water-project/page22.html\">status title</a></h4>"
+  res: "<p style=\"text-align:left;\"><div class='img_left'><a href=\"/oo/projects-list/Clean-Water-project/page22.html\"><img src='/en/image31_pv.7f6f0.jpg' width='70' height='70' alt='flower' class='pv'/></a></div></p>\n\n\n\t<h4 class=\"clear\"><a href=\"/oo/projects-list/Clean-Water-project/page22.html\">status title</a></h4>"
 
 at_code:
   tem: "<%= zazen(\"Try this: @ruby|puts 'Hello'@ or this @zafu|<r:link/>@\") %>"
@@ -71,15 +71,15 @@ data_on_obj:
 
 zip_shortcut_link_with_mode_format:
   tem: "<%= zazen('Look \"here\"::lake+_life.rss, \"\"::lake_life.data.') %>"
-  res: "/<p>Look <a href.*contact23_life.rss.*projects list/Clean Water project/Lake Tanganyika_life.rss</a>, <a href=.*image24_life.jpg.*projects list/Clean Water project/it&#8217;s a lake_life.jpg</a>./"
+  res: "/<p>Look <a href.*contact23_life.rss.*projects list/Clean Water project/Lake Tanganyika_life.rss</a>, <a href=.*image24_life.[0-9a-f]+.jpg.*projects list/Clean Water project/it&#8217;s a lake_life.jpg</a>./"
 
 zip_shortcut_image:
   tem: "<%= zazen('Look !:lake+! or !:lake!') %>"
-  res: "/<p>Look \[projects list/Clean Water project/Lake Tanganyika is not a document\] or <img src=.*image24_std.jpg/"
+  res: "/<p>Look \[projects list/Clean Water project/Lake Tanganyika is not a document\] or <img src=.*image24_std.75a9a.jpg/"
 
 zip_shortcut_image_with_options:
   tem: "<%= zazen('Look !<.:lake+_med! or !=.:lake_pv!') %>"
-  res: "/<p>Look \[projects list/Clean Water project/Lake Tanganyika is not a document\] or .*center.*<img src=.*image24_pv.jpg/"
+  res: "/<p>Look \[projects list/Clean Water project/Lake Tanganyika is not a document\] or .*center.*<img src=.*image24_pv.7f6f0.jpg/"
 
 zip_shortcut_gallery:
   tem: "<%= zazen('Look ![30,:lake]!') %>"
@@ -111,7 +111,7 @@ unknown_link:
 
 host:
   tem: "<%= zazen('this is a \"link\":12. !30!', :host => 'foo.com') %>"
-  res: "/http://foo.com/oo/section12.html\">link.*http://foo.com/en/image30_std.jpg/"
+  res: "/http://foo.com/oo/section12.html\">link.*http://foo.com/en/image30_std.75a9a.jpg/"
 
 amp:
   tem: "<%= zazen('this & that') %>"

data/test/integration/zafu_compiler_test.rb

@@ -362,6 +362,24 @@ class ZafuCompilerTest < Zena::Controller::TestCase
     node.update_attributes!(:date => Time.utc(2012,1,1,0,0))
     yt_do_test('dates', 'time_year')
   end
+  
+  def test_display_with_a_custom_img_tag_field
+    login(:lion)
+    node = secure(Node) { nodes(:status) }
+    node.prop['img_tag_std'] = "<foobar>PATH=PATH_std.html uuid=UUID</foobar>"
+    node.send(:dump_properties)
+    Zena::Db.execute "UPDATE versions SET properties = #{Zena::Db.quote(node.version[:properties])}"
+    yt_do_test('display', 'with_a_custom_img_tag_field')
+  end
+  
+  def test_display_with_a_custom_img_tag_field_with_JS
+    login(:lion)
+    node = secure(Node) { nodes(:status) }
+    node.prop['img_tag_std'] = "blah blah [JS]some js[/JS]blah blah [JS]more JS[/JS]"
+    node.send(:dump_properties)
+    Zena::Db.execute "UPDATE versions SET properties = #{Zena::Db.quote(node.version[:properties])}"
+    yt_do_test('display', 'with_a_custom_img_tag_field_with_JS')
+  end
 
   yt_make
 end

data/test/selenium/Filter/filter3.rsel

@@ -0,0 +1,20 @@
+open '/oo/testnode37.html?test=filter3'
+# Should render preview_node with current values
+verify_text 'filter3_title', 'Kill the bugs'
+type 'filter31_title', 'Foobar'
+wait_for_element_present 'filter3_msg'
+verify_text 'filter3_title', 'Foobar'
+type 'filter31_text', '*hop*'
+wait_for_element_present 'css=#filter3_zazen strong'
+
+# submit
+click_and_wait 'css=input[type=submit]'
+
+# Redirected to same page
+# Parameter on [form] properly passed
+verify_text 'filter3_title', 'Foobar'
+type 'filter31_title', 'Kill the bugs'
+type 'filter31_text', ''
+click_and_wait 'css=input[type=submit]'
+# Reverted changes
+verify_text 'filter3_title', 'Kill the bugs'

data/test/selenium/Filter/filter4.rsel

@@ -0,0 +1,20 @@
+open '/oo/testnode37.html?test=filter4'
+# Should render preview_node with current values
+verify_text 'filter4_title', 'Kill the bugs'
+type 'filter4_b_title', 'Foobar'
+wait_for_element_present 'filter4_msg'
+verify_text 'filter4_title', 'Foobar'
+type 'filter4_b_text', '*hop*'
+wait_for_element_present 'css=#filter4_zazen strong'
+
+# submit
+click_and_wait 'css=input[type=submit]'
+
+# Redirected to same page
+# Parameter on [form] properly passed
+verify_text 'filter4_title', 'Foobar'
+type 'filter4_b_title', 'Kill the bugs'
+type 'filter4_b_text', ''
+click_and_wait 'css=input[type=submit]'
+# Reverted changes
+verify_text 'filter4_title', 'Kill the bugs'

data/test/sites/zena/versions.yml

@@ -547,6 +547,8 @@ wiki_node_en:
       <r:include template='/Default skin/Node'>
         <r:with part='main'>
           WIKI
+          //! This is used for testing cache on non-root paths.
+          <r:cache allow_query='p=\d'/>
         </r:with>
       </r:include>
     format:        html