zena 1.0.0.beta3 → 1.0.0.rc1

data/test/integration/zafu_compiler/roles.yml

@@ -9,37 +9,37 @@ default:
 
 
 show_property_filter_vclass:
-  src: "<r:Letter do='paper'/>"
-  tem: "<% if @node.kpath_match?('NNL') -%><%= @node.prop['paper'] %><% end -%>"
+  src: "<r:Letter? do='paper'/>"
+  tem: "<% if @node.kpath_match?('NNL') %><%= @node.prop['paper'] %><% end %>"
 
 show_property_filter_role_no_role:
-  src: "<r:Original>Has an origin</r:Original>"
+  src: "<r:Original?>Has an origin</r:Original?>"
   res: ''
 
 show_property_filter_role_has_role:
   context:
     node: tree_jpg
-  src: "<r:Original>Has an original</r:Original>"
-  tem: "<% if @node.has_role?(493147733) -%>Has an original<% end -%>"
+  src: "<r:Original?>Has an original</r:Original?>"
+  tem: "<% if @node.has_role?(493147733) %>Has an original<% end %>"
   res: 'Has an original'
 
 show_bad_role:
-  src: "<r:Foo>abc</r:Foo>"
+  src: "<r:Foo?>abc</r:Foo?>"
   tem: "/Invalid role or class 'Foo'/"
 
 form_with_all_roles:
   context:
     node: tree_jpg
   src: |
-    <r:possible_roles>
+    <r:vclass do='roles'>
       <fieldset do='each'>
         <legend do='name'/>
         <ul do='columns'>
           <li do='each'><label do='name'/> <r:input/></li>
         </ul>
       </fieldset>
-    </r:possible_roles>
-  res: "/label.weight.*node\[weight\].*origin.*value='Big Bang'.*assigned/"
+    </r:vclass>
+  res: "/label.origin.*node\[origin\].*value='Big Bang'.*weight.*assigned/"
 
 show_all_properties:
   context:
@@ -53,4 +53,80 @@ show_all_properties:
         </ul>
       </fieldset>
     </r:roles>
-  res: "/<label>origin</label> Big Bang</li>/"
+  res: "/<label>origin</label> Big Bang</li>/"
+
+vclass_name:
+  context:
+    node: letter
+  src: "<r:vclass do='name'/>"
+  tem: "<% var1 = @node.virtual_class %><%= var1.name %>"
+  res: "Letter"
+
+vclass_roles:
+  context:
+    node: letter
+  src: "<r:vclass do='roles' do='each' join=', '><r:name/> (<r:columns do='each' join=',' do='name'/>)</r:vclass>"
+  tem: "/var1 = @node\.virtual_class .* var2 = var1.sorted_roles/"
+  res: "Node (summary,text,title), Original (origin,tz,weight), Task (assigned), Letter (paper,search,search_mono)"
+
+vclass_column_size:
+  context:
+    node: letter
+  src: "<r:vclass do='roles' do='each' join=', '><r:name/> (<r:columns do='size'/>)</r:vclass>"
+  res: "Node (3), Original (3), Task (1), Letter (3)"
+
+vclass_context:
+  src: "<r:Image><r:name/></r:Image>"
+  tem: "<% if var1 = VirtualClass[\"Image\"] %><%= var1.name %><% end %>"
+  res: "Image"
+
+vclass_scope:
+  context:
+    node: bird_jpg
+  src: "<r:Image?>I am an image</r:Image?>"
+  tem: "<% if @node.kpath_match?('NDI') %>I am an image<% end %>"
+  res: "I am an image"
+
+vclass_in_rubyless:
+  src: "<b do='Contact.name'/>"
+  tem: "<b><%= (VirtualClass[\"Contact\"] ? VirtualClass[\"Contact\"].name : nil) %></b>"
+  res: "<b>Contact</b>"
+
+grid_manual:
+  src: |
+    <table do='images in site'>
+      <tr do='Image' do='roles'><th colspan='#{columns.size}' do='each' do='name'/></tr>
+      <tr do='Image' do='roles' do='each' do='columns'><th do='each' do='name'/></tr>
+      <tr do='each'><r:Image do='roles' do='each' do='columns'><td do='each' do='@node.send(name)'/></r:Image></tr>
+    </table>
+  res: "/<th colspan='3'>Node.*<th colspan='3'>Original.*<th>exif</th><th>height</th><th>width</th>.*<td>image/jpeg</td><td>jpg</td>/"
+
+grid:
+  src: "<r:images in='site' do='grid'/>"
+  res: "/<table class='grid'>.*<th class='role' colspan='3'>Node.*<th class='role' colspan='3'>Original.*<th>exif</th><th>height</th><th>width</th>.*<td>image/jpeg</td><td>jpg</td>/"
+
+list_relations:
+  src: "<r:Contact do='relations' do='each' join=', ' do='name'/>"
+  res: "collaborator_for, favorite, favorite_for, home_for, hot_for, icon, reference, reference_for, set_tag"
+
+list_relations_filter_group:
+  src: "<r:Contact do='relations(\"doc\")' do='each' join=', ' do='name'/>"
+  res: "reference, reference_for, set_tag"
+
+input_relation_name:
+  src: "<r:select name='rel' eval='Contact.relations(\"doc\").map(:name)'/>"
+  res: "<select name='node[rel]'><option value=\"reference\">reference</option>\n<option value=\"reference_for\">reference_for</option>\n<option value=\"set_tag\">set_tag</option></select>"
+
+manual_select:
+  src: "<select name='node[rel]' do='Contact.relations(\"doc\")'><option value='#{name}' do='each' do='eval'>trans(\"rel_#{name}\")</option></select>"
+  res: "<select name='node[rel]'><option value='reference'>rel_reference</option><option value='reference_for'>rel_reference_for</option><option value='set_tag'>rel_set_tag</option></select>"
+
+inspect_display_links:
+  src: |
+    <r:Template do='relations' do='each' set_rel='name' do='main'>
+      <h3 do='rel'/>
+      <ul do='query' default='nodes' select='#{rel}s'>
+        <li do='each' do='link'/>
+      </ul>
+    </r:Template>
+  tem: '/<h3><%= _zrel %></h3>/'

data/test/integration/zafu_compiler/rubyless.yml

@@ -9,16 +9,16 @@ tagged_relation:
     node: 'art'
     class: Tag
     dev: 'true'
-  src: "<r:context select='tagged'><r:each join=', '><r:show attr='node_name'/></r:each></r:context>"
-  res: "cleanWater, opening"
+  src: "<r:context select='tagged'><r:each join=', '><r:show attr='title'/></r:each></r:context>"
+  res: "Clean Water project, parc opening"
 
 tagged_relation:
   context:
     node:  art
     class: Tag
     dev: 'true'
-  src: "<r:tagged foo='bar'><r:each join=', '><r:show attr='node_name'/></r:each></r:tagged>"
-  res: "cleanWater, opening"
+  src: "<r:tagged foo='bar'><r:each join=', '><r:show attr='title'/></r:each></r:tagged>"
+  res: "Clean Water project, parc opening"
 
 tagged_rubyless:
   context:
@@ -28,9 +28,52 @@ tagged_rubyless:
 
 optional_hash:
   src: "<r:dummy do='hello' lang='fr'/>"
-  tem: "<% var1 = @node.dummy -%><%= var1.hello({:lang => \"fr\"}) %>"
+  tem: "<% var1 = @node.dummy %><%= var1.hello({:lang => \"fr\"}) %>"
   res: "Salut poilu!"
 
 build_query:
   src: "<div id='notes' do='notes' in='project' limit='10' order='log_at DESC'>"
-  tem: "/SELECT nodes\.\* FROM nodes/"
+  tem: "/SELECT nodes\.\* FROM nodes/"
+
+next_in_list_s:
+  context:
+    node: letter
+    class: Letter
+  eval: "next_in_list(paper, %q{Kraft, Tyvek})"
+  tem: "<%= next_in_list_s(@node.prop['paper'], \"Kraft, Tyvek\") %>"
+  res: 'Tyvek'
+
+next_in_list_new_value:
+  context:
+    node: letter
+    class: Letter
+  eval: "next_in_list(paper, %q{Foo, Tyvek})"
+  tem: "<%= next_in_list_s(@node.prop['paper'], \"Foo, Tyvek\") %>"
+  res: 'Foo'
+
+next_in_list_nil:
+  context:
+    node: letter
+    class: Letter
+  eval: "next_in_list(paper, %q{Kraft, })"
+  tem: "<%= next_in_list_s(@node.prop['paper'], \"Kraft, \") %>"
+  res: ''
+
+next_in_list_i:
+  context:
+    node: wiki
+  eval: "next_in_list(id, %q{12, 29, 36})"
+  tem: "<%= next_in_list_i(@node.zip, \"12, 29, 36\") %>"
+  res: '36.0'
+
+ancestors:
+  # used to be implemented with 'show_path'
+  src: "<ul id='path' do='ancestors'><li do='each' do='link'/></ul>"
+  tem: "/if var1 = @node.z_ancestors/"
+  res: "/<ul id='path'><li>.*Zena.*<li>.*en/page18.html.*<li><.*/projects-list/Clean-Water-project.*Clean Water project</a></li></ul>/"
+
+ancestors_on_root:
+  context:
+    node: 'zena'
+  src: "<ul id='path' do='ancestors'><li do='each' do='link'/></ul>"
+  res: ''

data/test/integration/zafu_compiler/safe_definitions.yml

@@ -18,9 +18,9 @@ params:
 gsub:
   context:
     node: 'tiger'
-  old_src: "<r:BaseContact do='addres.gsub(/\\n/,\";\";')'/>"
-  src: "<r:BaseContact do='eval'>address.gsub(/\\n/, ';')</r:BaseContact>"
-  tem: "<% if @node.kpath_match?('NRC') -%><%= (@node.prop['address'] ? @node.prop['address'].gsub(/\\n/, \";\") : nil) %><% end -%>"
+  old_src: "<r:Contact? do='addres.gsub(/\\n/,\";\";')'/>"
+  src: "<r:Contact? do='eval'>address.gsub(/\\n/, ';')</r:Contact?>"
+  tem: "<% if @node.kpath_match?('NRC') %><%= (@node.prop['address'] ? @node.prop['address'].gsub(/\\n/, \";\") : nil) %><% end %>"
   res: "Small Island;In the Wild"
 
 gsub_static:
@@ -32,16 +32,31 @@ gsub_static:
 gsub_newline:
   context:
     node: 'tiger'
-  src: "<r:BaseContact do='address.gsub(/\\n/, \"\\\\n\")'/>"
+  src: "<r:Contact? do='address.gsub(/\\n/, \"\\\\n\")'/>"
   res: 'Small Island\nIn the Wild'
 
+upcase:
+  eval: "title.upcase"
+  tem: "<%= (@node.prop['title'] ? @node.prop['title'].upcase : nil) %>"
+  res: "STATUS TITLE"
+
+strip:
+  eval: "%Q{ #{id}}.strip"
+  tem: "<%= \" #{@node.zip}\".strip %>"
+  res: "22"
+
+to_i:
+  eval: "%Q{ #{id}}.to_i"
+  tem: "<%= \" #{@node.zip}\".to_i %>"
+  res: "22"
+
 blank:
   eval: 'this.blank?'
   tem:  "<%= @node.blank? %>"
 
 blank_on_string:
-  eval: 'node_name.blank?'
-  tem:  "<%= @node.node_name.blank? %>"
+  eval: 'id.blank?'
+  tem:  "<%= @node.zip.blank? %>"
 
 blank_on_could_be_nil:
   eval: 'parent.blank?'
@@ -63,3 +78,17 @@ kind_of_class:
 kind_of_role:
   eval: "kind_of?(Original)"
   tem: "<%= @node.has_role?(493147733) %>"
+
+map_join:
+  context:
+    node: 'cleanWater'
+  src: "<r:children do='map(:title).join(\",\")'/>"
+  tem: "/var1.map\{\|_map_obj\| _map_obj.prop\['title'\]\}/"
+  res: "crocodiles,it's a lake,Keeping things clean !,The lake we love,parc opening,status title,water"
+
+map_on_can_be_nil:
+  context:
+    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/"

data/test/integration/zafu_compiler/search.yml

@@ -9,5 +9,5 @@ default:
 
 search_results_without_values:
   src: "<r:search_results>..</r:search_results>"
-  tem: '<% if var1 = @nodes -%>..<% end -%>'
+  tem: '<% if var1 = @nodes %>..<% end %>'
   res: ''

data/test/integration/zafu_compiler/security.yml

@@ -28,3 +28,40 @@ mean_eval:
   src: "<r:show eval='puts \"bad\"'/>"
   tem: "/unknown method 'puts\(String\)'/"
 
+mean_in_translation:
+  context:
+    lang: fr
+  src: "<r:load dictionary='/Default skin/translations'><r:t>mean</r:t></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) %>&lt;%= 5 + 8 %&gt;"
+
+build_erb_with_trans:
+  context:
+    lang: fr
+  src: "<r:load dictionary='/Default skin/translations'><r:t>mean_m</r:t><r:void>%= 5+8 %</r:void><r:void>></r:void></r:load>"
+  tem: "<% _zdict = load_dictionary(828931430) %>&lt;%= 5+8 %>"
+
+build_erb_with_void:
+  context:
+    lang: fr
+  src: "<r:void><</r:void><r:void>%= 5+8 %</r:void><r:void>></r:void></r:load>"
+  tem: "/>%= 5\+8 %>/"
+  
+mean_inc:
+  src: '<'
+  res: '&lt;'
+
+build_erb_with_include:
+  src: "<r:include template='/security/mean/inc'/><r:void>%= 5+8 %</r:void><r:void>></r:void>"
+  tem: "!/<%= 5/"
+
+mean_part:
+  src: "<<div id='foo'></div>"
+  res: "<<div id='foo'></div>"
+  
+build_erb_with_include_remove_part:
+  src: "<r:include template='/security/mean/part'><r:with part='foo'/></r:include><r:void>%= 5+8 %</r:void><r:void>></r:void>"
+  tem: "!/<%= 5/"
+
+build_erb_with_rubyless:
+  src: "<r:void do='\"<\"'/><r:void>%= 5+8 %</r:void><r:void>></r:void>"
+  tem: "!/<%= 5/"

data/test/integration/zafu_compiler/urls.yml

@@ -6,72 +6,72 @@ default:
 
 url:
   src: "<r:url/>"
-  res: "http://test.host/oo/projects/cleanWater/page22.html"
+  res: "http://test.host/oo/projects-list/Clean-Water-project/page22.html"
 
 use_url_in_attribute:
   src: "<a href='#{url}'>blah</a>"
-  res: "<a href='http://test.host/oo/projects/cleanWater/page22.html'>blah</a>"
+  res: "<a href='http://test.host/oo/projects-list/Clean-Water-project/page22.html'>blah</a>"
 
 show_url_in_script:
   src: "<script type='text/javascript'>
   digg_url = '<r:url/>';
   </script>"
-  res: "/http://test.host/oo/projects/cleanWater/page22.html/"
+  res: "/http://test.host/oo/projects-list/Clean-Water-project/page22.html/"
 
 url_with_param:
   src: "<p do='eval'>url(parent)</p>"
-  res: "<p>http://test.host/oo/projects/cleanWater</p>"
+  res: "<p>http://test.host/oo/projects-list/Clean-Water-project</p>"
 
-show_path:
+path:
   src: "<a href='#{path}'>blah</a>"
-  res: "<a href='/oo/projects/cleanWater/page22.html'>blah</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'>blah</a>"
 
 link:
   src: "<r:link/>"
   tem: "<a href='<%= zen_path(@node) %>'><%= @node.prop['title'] %></a>"
-  res: "<a href='/oo/projects/cleanWater/page22.html'>status title</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a>"
 
 link_not_logged:
   context:
     visitor: anon
   src: "<r:link/>"
-  res: "<a href='/en/projects/cleanWater/page22.html'>status title</a>"
+  res: "<a href='/en/projects-list/Clean-Water-project/page22.html'>status title</a>"
 
 do_link:
   src: "<li class='super' do='link'>sample text</li>"
-  res: "<li class='super'><a href='/oo/projects/cleanWater/page22.html'>status title</a></li>"
+  res: "<li class='super'><a href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a></li>"
 
 do_link_t:
   src: "<li class='super' do='link' do='t'>blah</li>"
-  res: "<li class='super'><a href='/oo/projects/cleanWater/page22.html'>blah</a></li>"
+  res: "<li class='super'><a href='/oo/projects-list/Clean-Water-project/page22.html'>blah</a></li>"
 
 a_link:
   src: "<a class='bob' do='link'>sample text</a> <a id='bar' do='link' do='t'>click here</a>"
-  res: "<a class='bob' href='/oo/projects/cleanWater/page22.html'>status title</a> <a id='bar' href='/oo/projects/cleanWater/page22.html'>click here</a>"
+  res: "<a class='bob' href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a> <a id='bar' href='/oo/projects-list/Clean-Water-project/page22.html'>click here</a>"
 
 zafu_link_with_blocks:
   src: "<a id='branding' do='link'><div do='zazen(text)'/></a>"
-  res: "/<a id='branding' href='/oo/projects/cleanWater/page22.html'>.*zazen.*<\/a>/"
+  res: "/<a id='branding' href='/oo/projects-list/Clean-Water-project/page22.html'>.*zazen.*<\/a>/"
 
 link_class:
   src: "<r:link class='hello'/>"
-  res: "<a class='hello' href='/oo/projects/cleanWater/page22.html'>status title</a>"
+  res: "<a class='hello' href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a>"
 
 link_set_class:
-  src: "<r:link class='#{node_name}_foo'/>"
-  tem: "<a class='<%= \"#{@node.node_name}_foo\" %>' href='<%= zen_path(@node) %>'><%= @node.prop['title'] %></a>"
-  res: "<a class='status_foo' href='/oo/projects/cleanWater/page22.html'>status title</a>"
+  src: "<r:link class='#{title}_foo'/>"
+  tem: "<a class='<%= \"#{@node.prop['title']}_foo\" %>' href='<%= zen_path(@node) %>'><%= @node.prop['title'] %></a>"
+  res: "<a class='status title_foo' href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a>"
 
 link_attr:
   src: "<r:link attr='ref_lang'/>"
   tem: "<a href='<%= zen_path(@node) %>'><%= @node.ref_lang %></a>"
-  res: "<a href='/oo/projects/cleanWater/page22.html'>en</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'>en</a>"
 
 link_tattr:
   old_src: "<r:link tattr='ref_lang'/>"
   src: "<r:link eval='trans(ref_lang)'/>"
   tem: "<a href='<%= zen_path(@node) %>'><%= trans(@node.ref_lang) %></a>"
-  res: "<a href='/oo/projects/cleanWater/page22.html'>english</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'>english</a>"
 
 link_trans:
   context:
@@ -79,24 +79,24 @@ link_trans:
   old_src: "<r:link trans='Monday'/>"
   src: "<r:link do='t' text='Monday'/>"
   tem: "<a href='<%= zen_path(@node) %>'>lundi</a>"
-  res: "<a href='/oo/projects/cleanWater/page22.html'>lundi</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'>lundi</a>"
 
 link_parent:
   src: "<r:link href='parent' text='click here'/>"
   tem: "<a href='<%= zen_path(@node.parent) %>'>click here</a>"
-  res: "<a href='/oo/projects/cleanWater'>click here</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project'>click here</a>"
 
 link_with_block:
-  src: "<r:link href='parent'>look at <b do='node_name'>her</b></r:link>"
-  tem: "<a href='<%= zen_path(@node.parent) %>'>look at <b><%= @node.node_name %></b></a>"
-  res: "<a href='/oo/projects/cleanWater'>look at <b>status</b></a>"
+  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>"
+  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>"
-  res: "<a href='/oo/project29.html'>bird</a>"
+  res: "<a href='/oo/blog29.html'>bird</a>"
 
 link_root:
   src: "<r:link href='root'/>"
@@ -107,24 +107,24 @@ link_anchor:
   src: "<r:link anchor='true'/>"
   res: "<a href='#node22'>status title</a>"
 
-link_anchor_name:
+link_anchor_title:
   old_src: "<r:link anchor='[name]'/>"
-  src: "<r:link anchor='#{node_name}'/>"
-  res: "<a href='#status'>status title</a>"
+  src: "<r:link anchor='#{title.urlencode}'/>"
+  res: "<a href='#status-title'>status title</a>"
 
 link_anchor_in:
   src: "<r:link anchor='true' href='project' mode='tree'/>"
-  res: "<a href='/oo/projects/cleanWater_tree#node22'>status title</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project_tree#node22'>status title</a>"
 
 link_anchor_name_in:
   old_src: "<r:link anchor='[name]' in='parent'/>"
-  src: "<r:link anchor='#{node_name}' href='parent'/>"
-  res: "<a href='/oo/projects/cleanWater#status'>status title</a>"
+  src: "<r:link anchor='#{title.urlencode}' href='parent'/>"
+  res: "<a href='/oo/projects-list/Clean-Water-project#status-title'>status title</a>"
 
 link_stored:
-  old_src: "<r:void store='foo'><r:parent><r:link href='foo' do='node_name'/></r:parent></r:void>"
+  old_src: "<r:void store='foo'><r:parent><r:link href='foo' do='title'/></r:parent></r:void>"
   src: "<r:void set_foo='this'><r:parent><r:link href='foo' do='title'/></r:parent></r:void>"
-  res: "<a href='/oo/projects/cleanWater/page22.html'>Clean Water project</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'>Clean Water project</a>"
 
 link_stored_not_a_node:
   src: "<r:void set_foo='45'><r:parent><r:link href='foo' do='title'/></r:parent></r:void>"
@@ -146,40 +146,50 @@ link_date:
   context:
     ref_date: '2008-06-27'
   old_src: "<r:link date='current_date'/>"
-  src: "<r:link date='#{date}'/>"
+  src: "<r:link date='#{main_date}'/>"
   tem: '/:date => "#\{main_date\}"'
-  res: "<a href='/oo/projects/cleanWater/page22.html?date=2008-06-27T00%3A00%3A00%2B00%3A00'>status title</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html?date=2008-06-27T00%3A00%3A00%2B00%3A00'>status title</a>"
 
 link_url_params:
   src: "<r:link plob='hopla'/>"
-  res: "<a href='/oo/projects/cleanWater/page22.html?plob=hopla'>status title</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html?plob=hopla'>status title</a>"
 
 link_url_params_parsed_values:
   src: "<r:link plob='haha #{title}'/>"
-  res: "<a href='/oo/projects/cleanWater/page22.html?plob=haha+status+title'>status title</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html?plob=haha+status+title'>status title</a>"
+
+encode_params:
+  context:
+    a:
+      b: 'Bee'
+    c: 'Sea'
+    x: ''
+  src: "<r:link encode_params='a,c,x,y'/>"
+  tem: "/:encode_params => \"a,c,x,y\"/"
+  res: "/page22\.html\?a%5Bb%5D=Bee&c=Sea'/"
 
 title_link_mode:
   old_src: "<h2 do='title' link='details'/>"
   src: "<h2 do='link' mode='details' do='title' live='true'/>"
-  res: "<h2><a href='/oo/projects/cleanWater/page22_details.html'><span id='_title22'>status title</span></a></h2>"
+  res: "<h2><a href='/oo/projects-list/Clean-Water-project/page22_details.html'><span id='_title22'>status title</span></a></h2>"
 
 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>"
-  res: "<a class='foo' href='/oo/projects/cleanWater/page22.html?y=2010'>status 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>"
-  
+
 live_link_format:
   old_src: "<h2 do='title' link='details.xml'/>"
   src: "<h2 do='link' live='true' format='xml' mode='details'/>"
-  res: "<h2><a id='_title22' href='/oo/projects/cleanWater/page22_details.xml'>status title</a></h2>"
+  res: "<h2><a id='_title22' href='/oo/projects-list/Clean-Water-project/page22_details.xml'>status title</a></h2>"
 
 live_link_data_mode:
   context: