zena 1.0.0.beta3 → 1.0.0.rc1

data/test/integration/query_node_test.rb

@@ -38,17 +38,17 @@ class QueryNodeTest < Zena::Unit::TestCase
     login @context[:visitor].to_sym
 
     @context[:rubyless_helper] = self
+    defaults = (@context[:default] ||= {})
+    defaults[:order] ||= 'zip asc'
 
     if klass = @context.delete(:class)
-      klass = Node.get_class(klass)
-      klass = Zena::Acts::Enrollable.make_class(klass)
-      @context[:main_class] = klass
+      @context[:main_class] = VirtualClass[klass]
     end
 
     begin
       query  = Node.build_query(:all, yt_get('src', file, test), @context)
       sql, node_class = query.to_s, query.main_class
-    rescue QueryBuilder::Error => err
+    rescue ::QueryBuilder::Error => err
       errors = err.message
     end
 
@@ -72,11 +72,7 @@ class QueryNodeTest < Zena::Unit::TestCase
 
           res = node_class.do_find(:all, sql)
 
-          if node_class == Comment
-            res = res ? res.map {|r| r[:title]}.join(', ') : ''
-          else
-            res = res ? res.map {|r| r[:node_name]}.join(', ') : ''
-          end
+          res = res ? res.map(&:title).join(', ') : ''
 
           yt_assert test_res, class_prefix + res
         else
@@ -145,7 +141,7 @@ class QueryNodeTest < Zena::Unit::TestCase
     login(:ant)
     page = secure!(Node) { nodes(:cleanWater) }
 
-    sql = Node.build_query(:all, 'nodes where node_name like "a%" in site').to_s(:count)
+    sql = Node.build_query(:all, 'nodes where title like "a%" in site').to_s(:count)
     assert_equal 3, Node.do_find(:count, eval(sql))
   end
 

data/test/integration/zafu_compiler/action.yml

@@ -12,7 +12,7 @@ logout_link:
     # Forces NodesController type of url and params
     fake_controller: 'nodes'
   src: "<r:login_link/>"
-  res: '<a href="/logout?redirect=%2Fen%2Fprojects%2FcleanWater%2Fpage22.html">logout</a>'
+  res: '<a href="/logout?redirect=%2Fen%2Fprojects-list%2FClean-Water-project%2Fpage22.html">logout</a>'
 
 login_link:
   context:
@@ -20,7 +20,7 @@ login_link:
     # Forces NodesController type of url and params
     fake_controller: 'nodes'
   src: "<r:login_link/>"
-  res: '<a href="/oo/projects/cleanWater/page22.html">login</a>'
+  res: '<a href="/oo/projects-list/Clean-Water-project/page22.html">login</a>'
 
 logout_link_other_controller:
   src: "<r:login_link/>"
@@ -33,13 +33,13 @@ login_link_other_controller:
   res: '<a href="/login">login</a>'
 
 login_link_with_blocks:
-  src: "<r:login_link>ONE ONE<r:else do='node_name'/></r:login_link>"
-  res: "<a href='/logout'>status</a>"
+  src: "<r:login_link>ONE ONE<r:else do='title'/></r:login_link>"
+  res: "<a href='/logout'>status title</a>"
 
 login_link_with_blocks_not_logged_in:
   context:
     visitor: 'anon'
-  src: "<r:login_link><r:title/><r:else do='node_name'/></r:login_link>"
+  src: "<r:login_link><r:title/><r:else do='title'/></r:login_link>"
   res: "<a href='/login'>status title</a>"
 
 visitor_link_not_logged_in:
@@ -64,4 +64,17 @@ visitor_link_blocks:
 
 action:
   src: "<p do='action' select='edit' do='t'>hello</p>"
-  res: "/nodes/22/versions/0/edit.*Open the edition window to edit the node.*Zena.open_window/"
+  res: "/nodes/22/versions/0/edit.*Open the edition window to edit the node.*Zena.open_window/"
+
+swap:
+  src: "<span do='block' do='swap' attr='custom_a' states='100,-100' do='custom_a'/>"
+  tem: '/:dom_id => "list1", :t_url => "action/swap/list1"/'
+  '/action/swap/en/list1.erb': "/<span id='list1'>/"
+
+swap_in_each:
+  src: "<r:pages><li do='each'><span do='swap' attr='origin' states='todo,done,alert'/></li></r:pages>"
+  tem: "/\"node\[origin\]\" => \"#\{next_in_list_s\(var2.prop\['origin'\], \"todo,done,alert\"/"
+
+hand_made_swap:
+  src: "<r:link update='_page' node[origin]='#{next_in_list(origin, \"todo,done\")}' action='update'/>"
+  tem: "/:_method => .put., :.node\[origin\]. => .#\{next_in_list_s\(@node.prop\['origin'\], .todo,done.\)/"

data/test/integration/zafu_compiler/ajax.yml

@@ -5,9 +5,9 @@ default:
     node: 'status'
 
 block:
-  src: "<r:parent><r:block name='foobar' do='node_name'/></r:parent>"
-  tem: "<% if var1 = @node.parent -%><div id='foobar'><%= var1.node_name %></div><% end -%>"
-  'ajax/block/en/foobar.erb': "<div id='foobar'><%= @node.node_name %></div>"
+  src: "<r:parent><r:block name='foobar' do='title'/></r:parent>"
+  tem: "<% if var1 = @node.parent %><div id='foobar'><%= var1.prop['title'] %></div><% end %>"
+  'ajax/block/en/foobar.erb': "<div id='foobar'><%= @node.prop['title'] %></div>"
 
 add:
   src: "<ul id='children' do='nodes'><li do='each' do='link'/><li do='add'/></ul>"
@@ -20,8 +20,8 @@ edit_not_each:
   res: "/<li class='blah'>this is a post <a href='/nodes/22/edit'>edit</a></li>/"
 
 add_each_no_form:
-  src: "<ul do='children' id='things'><li do='each'>I <p do='node_name'>blah</p></li><li do='add'/></ul>"
-  res: "/<ul><li.*id='things_add'.*li.*class='form' id='things_form'.*form.*I <p><input id=.things_node_name. name=.node\[node_name\]. .*type=.text..*hidden/"
+  src: "<ul do='children' id='things'><li do='each'>I <p do='title'>blah</p></li><li do='add'/></ul>"
+  res: "/<ul><li.*id='things_add'.*li.*class='form' id='things_form'.*form.*I <p><input id=.things_title. name=.node\[title\]. .*type=.text..*hidden/"
 
 add_each_no_form_date:
   src: "<ul do='children' id='things'><li do='each'>I <p do='show' date='event_at' tformat='short_date'>blah</p></li><li do='add'/></ul>"
@@ -36,11 +36,11 @@ each_add_with_form:
     node: 'wiki'
   src: |
     <ol do='children'>
-      <li do='each' do='node_name'>blah</li>
+      <li do='each' do='title'>blah</li>
       <li do='add'>add new</li>
       <li do='form'><input name='title'/> this is the form</li>
     </ol>
-  res: "/<li id='list2_30'>bird.*<li id='list2_31'>flower.*<li.*list1_add.*list1_form.*toggle.*<li style.*none.*list1_form.*Ajax.Request.*input type='hidden' name='t_url' value=.ajax/each/add/with/form/list1.*input type='hidden' name='node\[parent_id\]' value=.29./"
+  res: "/<li id='list1_30'>bird.*<li id='list1_31'>flower.*<li.*list1_add.*list1_form.*toggle.*<li style.*none.*list1_form.*Ajax.Request.*input type='hidden' name='t_url' value=.ajax/each/add/with/form/list1.*input type='hidden' name='node\[parent_id\]' value=.29./"
 
 each_add_with_form_in_sub_block:
   context:
@@ -48,7 +48,7 @@ each_add_with_form_in_sub_block:
   src: |
     <r:children>
     <ol do='void' name='boo'>
-      <li do='each' do='node_name'>blah</li>
+      <li do='each' do='title'>blah</li>
       <li do='add'>add new</li>
       <li do='form'><input name='title'/> this is the form</li>
     </ol>
@@ -60,43 +60,43 @@ each_add_with_form_klass_set:
     node: 'wiki'
   src: |
     <r:children>
-      <li do='each' do='node_name'>blah</li>
+      <li do='each' do='title'>blah</li>
       <li do='add'>add new</li>
       <li do='form'><input name='title'/> <select name='klass' root_class='Note' selected='Post'/> this is the form</li>
     </r:children>
   res: "!/hidden.*node\[klass\].*Node.*select.*node\[klass\]/"
 
 each_add_with_select:
-  src: "<r:children><r:each do='node_name'/><r:add/><r:form><select name='icon_id' nodes='images in project' selected='[main.icon_id]_abc'/></r:form></r:children>"
-  'ajax/each/en/add/with/select/list1_form.erb': '/map.|r| \[r.name, r.zip.to_s\]., \"#.@node.icon_zip._abc\"\)/'
+  src: "<r:children><r:each do='title'/><r:add/><r:form><select name='icon_id' nodes='images in project' selected='[main.icon_id]_abc'/></r:form></r:children>"
+  'ajax/each/add/with/select/en/list1_form.erb': '/map.|r| \[r.name, r.zip.to_s\]., \"#.@node.icon_zip._abc\"\)/'
   tem: "/nodes.kpath LIKE 'NDI%'/"
 
 each_edit_with_form:
   context:
     node: 'wiki'
-  src: "<r:children><li do='each'><r:show attr='node_name'>blah</r:show> <r:edit>edit</r:edit></li>\n<r:form><li><form>this is the form</form></li></r:form></r:children>"
-  res: "/<li id='list2_30'>bird <a href='/nodes/30/edit' onclick='new Ajax.Request\(\"/nodes/30/edit\?.*t_url=ajax%2Feach%2Fedit%2Fwith%2Fform%2Flist2_form/"
+  src: "<r:children><li do='each'><r:show attr='title'>blah</r:show> <r:edit>edit</r:edit></li>\n<r:form><li><form>this is the form</form></li></r:form></r:children>"
+  res: "/<li id='list1_30'>bird <a href='/nodes/30/edit' onclick='new Ajax.Request\(\"/nodes/30/edit\?.*t_url=ajax%2Feach%2Fedit%2Fwith%2Fform%2Flist1_form/"
 
 make_form:
-  src: "<ul do='children'><li do='each' do='node_name'/><li do='add'/></ul>"
+  src: "<ul do='children'><li do='each' do='title'/><li do='add'/></ul>"
   tem: "/<li style='display:none;' class='form' id='list1_form'>.*remote_form_for\(:node, var2_new"
-  'ajax/make/en/form/list1.erb': "<li id='<%= ndom_id(@node) %>'><%= @node.node_name %></li>"
-  'ajax/make/en/form/list1_form.erb': "/<li class='form' id='<%= ndom_id\(@node\) %>'>/"
+  'ajax/make/form/en/list1.erb': "<li id='<%= ndom_id(@node) %>'><%= @node.prop['title'] %></li>"
+  'ajax/make/form/en/list1_form.erb': "/<li class='form' id='<%= ndom_id\(@node\) %>'>/"
 
 each_edit_cannot_write:
   context:
     node: 'cleanWater'
     visitor: 'anon'
-  src: "<r:children><li do='each'><r:show attr='node_name'>blah</r:show> <r:edit>edit</r:edit></li>\n</r:children>"
-  res: "/<li id='list2_24'>lake</li>.*/"
+  src: "<r:children><li do='each'><r:show attr='title'>blah</r:show> <r:edit>edit</r:edit></li>\n</r:children>"
+  res: "/<li id='list1_24'>it's a lake</li>.*/"
 
 add_each_publish:
-  src: "<ul do='children' id='things'><li do='each'>I <p do='node_name'>blah</p></li><li do='add' publish='true'/></ul>"
+  src: "<ul do='children' id='things'><li do='each'>I <p do='title'>blah</p></li><li do='add' publish='true'/></ul>"
   res: "/hidden.*name=.node\[v_status\]. value=.50./"
 
 block_edit_form:
-  src: "<r:block><p do='node_name'/> <r:edit/> <r:form>please enter name: <input name='name'/> <r:input type='submit'/></r:form></r:block>"
-  res: "/<p>status<\/p>.*edit/"
+  src: "<r:block><p do='title'/> <r:edit/> <r:form>please enter name: <input name='name'/> <r:input type='submit'/></r:form></r:block>"
+  res: "/<p>status title<\/p>.*edit/"
 
 query_in_block:
   src: "<r:block><r:tagged where='title like \"%#{params[:tag]}%\"' in='site'/></r:block>"
@@ -104,17 +104,22 @@ query_in_block:
 
 saved_each_block:
   src: "<ol do='pages'><li do='each' on_if='ancestor' do='link'/><li do='add'/></ol>"
-  'ajax/saved/en/each/block/list1.erb': "!/var1/"
+  'ajax/saved/each/block/en/list1.erb': "!/var1/"
 
 no_recursion_in_saved_block:
-  src: "<r:void name='grp'><r:show attr='node_name'/><r:pages><r:each><r:include part='grp'/></r:each><r:add/></r:pages></r:void>"
-  'ajax/no/en/recursion/in/saved/block/grp1.erb': "!/no_recursion_in_saved_block_grp/"
+  src: "<r:void name='grp'><r:show attr='title'/><r:pages><r:each><r:include part='grp'/></r:each><r:add/></r:pages></r:void>"
+  'ajax/no/recursion/in/saved/block/en/grp1.erb': "!/no_recursion_in_saved_block_grp/"
 
-each_in_each:
+each_in_each_form:
   # should render correct form
   src: "<r:pages><r:form>FORM1</r:form><r:each><r:pages>sub-pages <r:form>FORM2</r:form></r:pages></r:each><r:add/></r:pages>"
   res: "/FORM1/"
 
+each_in_each_dom_id:
+  # should render correct form
+  src: "<r:pages do='each'><r:title/><r:edit/><r:pages do='each'><r:title/><r:edit/></r:pages></r:pages>"
+  tem: "/list2_#\{var.\.zip\}_#\{var.\.zip\}/"
+
 default_focus_field:
   src: "<ol do='comments'><li do='each'/><li do='form'><input name='author_name'/> ... <input name='text'/></li><li do='add'/></ol>"
   res: "/\$\(\"list1_form_t\"\).focusFirstElement\(\)/"
@@ -122,49 +127,76 @@ default_focus_field:
 live_filter:
   context:
     node: cleanWater
-  src: "<r:filter live='true'/><r:block><ol do='pages where node_name like \"#{params[:f]}%\"'><li do='each' do='node_name'/></ol></r:block>"
-  tem: "/nodes.node_name LIKE \?.*, \"#\{params\[:f\]\}%\"/"
-  'ajax/live/en/filter/list1.erb': "/<div id='list1.*, \"#\{params\[:f\]\}%\".*var2.node_name/"
-  res: "/<input type='text' name='f'.*<div id='list1'><ol><li>crocodiles</li><li>status</li><li>track</li></ol></div>/"
+  src: "<r:filter live='true'/><r:block><ol do='pages where title like \"#{params[:f]}%\"'><li do='each' do='title'/></ol></r:block>"
+  tem: "/ml1.value LIKE \?.*, \"#\{params\[:f\]\}%\"/"
+  'ajax/live/filter/en/list1.erb': "/<div id='list1.*, \"#\{params\[:f\]\}%\".*var2.prop\['title'\]/"
+  res: "/<input type='text' name='f'.*<div id='list1'><ol><li>crocodiles</li><li>Keeping things clean !</li><li>status title</li></ol></div>/"
 
 live_filter_single_element:
   context:
     node: cleanWater
-  src: "<r:filter live='true'/><r:block><r:page where='node_name like \"#{params[:f]}%\"' find='first'><b do='node_name'/></r:page></r:block>"
+  src: "<r:filter live='true'/><r:block><r:page where='title like \"#{params[:f]}%\"' find='first'><b do='title'/></r:page></r:block>"
   tem: "/, \"#\{params\[:f\]\}%\"/"
-  'ajax/live/en/filter/single/element/list1.erb': "/<div id='list1.*params\[:f\].*var1.node_name/"
+  'ajax/live/filter/single/element/en/list1.erb': "/<div id='list1.*params\[:f\].*var1.prop\['title'\]/"
   res: "/<input type='text' name='f'.*<div id='list1'><b>crocodiles</b></div>/"
 
 live_filter_select_options:
   context:
     node: cleanWater
-  src: "<r:filter live='true' do='select' name='f' values='1,2'/><r:block><ol do='pages where node_name like \"#{params[:f]}%\"'><li do='each' do='node_name'/></ol></r:block>"
+  src: "<r:filter live='true' do='select' name='f' values='1,2'/><r:block><ol do='pages where title like \"#{params[:f]}%\"'><li do='each' do='title'/></ol></r:block>"
   tem: "/select name=.f.><%= options_for_select\(\[.1., .2.\], params\[:f\].to_s/"
-  'ajax/live/en/filter/select/options/list1.erb': "/<div id='list1'.*params\[:f\]/"
-  res: "/<select name='f'.*<div id='list1'><ol><li>crocodiles</li><li>status</li><li>track</li></ol></div>/"
+  'ajax/live/filter/select/options/en/list1.erb': "/<div id='list1'.*params\[:f\]/"
+  res: "/<select name='f'.*<div id='list1'><ol><li>crocodiles</li><li>Keeping things clean !</li><li>status title</li></ol></div>/"
 
 draggable_do_syntax:
   src: "<r:images in='site' do='each' draggable='all' do='img' mode='pv'/>"
-  tem: "/add_drag_id\(\"list1_#\{var2.zip\}\"/"
-  res: "/id='list1_30'><img src='/en/image30_pv.jpg\?967816914293'/"
-  js: '/"list1_40"\].each.*Zena.draggable\(item, false\)/'
+  tem: "/add_drag_id\(\"drag_#\{var2.zip\}\"/"
+  res: "/id='drag_30'><img src='/en/image30_pv.jpg\?967816914293'/"
+  js: '/"drag_24"\].each.*Zena.draggable\(item, false\)/'
 
 draggable_true:
   # should use 'drag_handle' class
-  src: "<r:link draggable='true'/>"
-  tem: "/add_drag_id\(\"list1_\#\{@node.zip\}\", .*drag_handle/"
+  src: "<r:link draggable='true'><b do='title'/></r:link>"
+  tem: "/span class='drag_handle'.*add_drag_id\(\"drag_\#\{@node.zip\}\", .*drag_handle/"
+
+draggable_on_each_with_id:
+  src: "<ul do='pages in site'><li do='each'><b do='link' draggable='true'/> <r:edit/></li></ul>"
+  # should not use each id
+  tem: "/li id='<%= %Q\{list1_#\{var2.zip\}\}.*%Q\{drag_#\{var2.zip\}\}.*add_drag_id\(\"drag_#\{var2.zip\}\"/"
+
+drag_with_form:
+  src: "<table do='pages in site'>
+      <tr do='add'/>
+      <tr do='each'>
+        <td><r:link draggable='true'><b do='title'/></r:link></td>
+        <td class='edit'> <r:edit class='edit'>éditer</r:edit></td>
+      </tr>
+    </table>"
+  tem: "/tr id='<%= %Q\{list1_#\{var2.zip\}\}.*<div[^>]+id='<%= %Q\{drag_#\{var2.zip\}\}.*add_drag_id\(\"drag_#\{var2.zip\}\"/"
+
+draggable_existing_class:
+  # should use 'drag_handle' class
+  src: "<r:link draggable='true'><r:img class='drag_handle' mode='tiny'/> <r:title/></r:link>"
+  tem: "!/span class='drag_handle'/"
+  res: "/div class='drag' id='drag_22'><a href='.*22.*img src='/images/ext/page_tiny.png' .*class='drag_handle'/> status title/"
+
+draggable_existing_class_do:
+  # should use 'drag_handle' class
+  src: "<r:link draggable='drag_img'><b class='drag_img' do='img' mode='tiny'/> blah</r:link>"
+  tem: "!/span class='drag_handle'|span class='drag_img'/"
+  res: "/div class='drag' id='drag_22'><a href='.*22.*<b class='drag_img'.*img src='/images/ext/page_tiny.png'/"
 
 draggable_in_block:
   # should use 'hooba' class
-  src: "<r:block><r:link draggable='true'/></r:block>"
-  tem: "/add_drag_id\(\"list1_\#\{@node.zip\}\", .*hooba/"
-  res: "<div class='drag' id='list1_22'><a href='/oo/projects/cleanWater/page22.html'>status title</a></div>"
+  src: "<r:block><r:link draggable='hooba'/></r:block>"
+  tem: "/add_drag_id\(\"drag_\#\{@node.zip\}\", .*hooba/"
+  res: "<div id='list1'><div class='drag' id='drag_22'><span class='hooba'>&nbsp;</span><a href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a></div></div>"
   js:  "/Zena.draggable\(item, \"hooba\"\)/"
 
 draggable_with_id_set:
   # should not change original id
   src: "<h1 id='title' do='title' draggable='true'/>"
-  tem: "/<h1 id='title'><span class='drag' id='<%= %Q\{title_#\{@node.zip\}\} %>'><% add_drag_id\(\"title_#\{@node.zip\}/"
+  tem: "/<h1 id='title'><span class='drag' id='<%= %Q\{drag_#\{@node.zip\}\} %>'><span class='drag_handle'>&nbsp;</span><% add_drag_id\(\"drag_#\{@node.zip\}/"
 
 unlink:
   context:
@@ -186,11 +218,11 @@ edit_link:
     node: 'art'
     class: Tag
     lang: 'fr'
-  src: "<r:context select='tagged'><r:each><r:show attr='node_name'/>: <r:show attr='l_status'/> <r:edit/></r:each></r:context>"
+  src: "<r:context select='tagged'><r:each><r:show attr='title'/>: <r:show attr='l_status'/> <r:edit/></r:each></r:context>"
   # The link_id should be sent with the url.
   res: "/link_id.*éditer/"
-  'ajax/edit/fr/link/list1_form.erb': "/<input type='hidden' name='link_id' value=.<%= @node.link_id %>./>/"
-  'ajax/edit/fr/link/list1.erb': "/:link_id => @node.link_id/"
+  'ajax/edit/link/fr/list1_form.erb': "/<input type='hidden' name='link_id' value=.<%= @node.link_id %>./>/"
+  'ajax/edit/link/fr/list1.erb': "/:link_id => @node.link_id/"
 
 start_id:
   src: "<r:form><input type='hidden' name='s' value='#{start_id}'/></r:form>"
@@ -198,13 +230,17 @@ start_id:
 
 drop_add_link:
   context:
-    class: BaseContact
+    class: Contact
   src: "<div do='drop' add='favorite'></div>"
   # without the ugly inspect, this would be '#{id}' or "\#{id}"
   tem: "/drop_node_path.*\"node\[favorite_id\]\" => \"\\\\#\{id\}\"/"
   res: "<div class='drop' id='list1'>drop</div>"
   js: "/Droppables.add\('list1'.*/nodes/22/drop.*node%5Bfavorite_id%5D=%23%7Bid%7D"
 
+drop_var_scope:
+  src: "<div do='visitor.node'><div do='drop' add='favorite' change='receiver'><r:favorites>.</r:favorites></div></div>"
+  tem: "/var2 = Node.do_find.*ml1.value ASC\}, var1.id\]\)/"
+
 drop_done_remove:
   src: "<div do='drop' set='reference' done='remove'></div>"
   js: "/done=remove/"
@@ -217,15 +253,22 @@ drop_param:
 
 drop_param_in_each:
   src: "<r:pages do='each' do='drop' change='params' d='foo'><r:show eval='params[:d]'/></r:pages>"
-  tem: "/<div class='drop' id='<%= %Q\{list2_#\{var2.zip\}\} %>'><% add_drop_id\(\"list2_#\{var2.zip\}\"/"
+  tem: "/<div class='drop' id='<%= %Q\{list1_#\{var2.zip\}\} %>'><% add_drop_id\(\"list1_#\{var2.zip\}\"/"
 
 update_target:
   src: "UT: <div id='foo' do='block'>...</div> <r:link update='foo'/>"
   tem: "/UT: <div id='foo'>...</div> .*Ajax.Request.*:dom_id => \"foo\"/"
 
+update_target_encode_params:
+  context:
+    a:
+      b: 'c'
+  src: "UT: <div id='foo' do='block'>...</div> <r:link update='foo' encode_params='a'/>"
+  res: "/Ajax.Request\([^\)]+a%5Bb%5D=c/"
+
 include_update_target:
-  src: "IUT: <r:include template='/ajax/update/target'><r:with part='foo'><r:show attr='node_name'/></r:with></r:include>"
-  tem: "/IUT: UT: <div id='foo'><%= @node.node_name %></div> <a .*zen_path.*onclick='new Ajax.Request/"
+  src: "IUT: <r:include template='/ajax/update/target'><r:with part='foo'><r:show attr='title'/></r:with></r:include>"
+  tem: "/IUT: UT: <div id='foo'><%= @node.prop\['title'\] %></div> <a .*zen_path.*onclick='new Ajax.Request/"
 
 id_in_each_group_should_be_scoped:
   src: "<ul do='comments from nodes in site' do='group' by='discussion_id'><li do='each'><r:node do='block' do='title'/></li></ul>"
@@ -235,7 +278,7 @@ link_page_next:
   context:
     pak: 2
   src: "<div id='foo' do='block' do='nodes in site' limit='3' order='zip' paginate='pak'><r:link page='previous'/> | <r:pak/> | <r:link update='foo' page='next'/> || <r:each join=',' do='[id]'/></div>"
-  res: "/<a href='/oo/projects/cleanWater/page22.html\?pak=1'>1</a> \| 2 \| .*22/zafu\?dom_id=foo.*pak=3.*>3</a>/"
+  res: "/<a href='/oo/projects-list/Clean-Water-project/page22.html\?pak=1'>1</a> \| 2 \| .*22/zafu\?dom_id=foo.*pak=3.*>3</a>/"
 
 link_page_list:
   context:
@@ -255,3 +298,20 @@ toggle_attribute_in_each:
   src: "<ul do='pages'><li do='each' toggle='favorite' for='visitor.node' do='title'/></ul>"
   res: "/<ul><li class='toggle' id='list1_26'>crocodiles</li>/"
   js: "/list1_26.*each/"
+
+toggle_dyn_attribute_in_each:
+  context:
+    node: cleanWater
+    rel: favorite
+  src: "<ul do='pages'><li do='each' toggle='#{params[:rel]}' for='visitor.node' do='title'/></ul>"
+  tem: "/add_toggle_id\(\"list1_#\{var2.zip\}\", \"var2_tog\", \"#\{params\[:rel\]\}\"\)/"
+  res: "/<ul><li class='toggle' id='list1_26'>crocodiles</li>/"
+  js: "/list1_26.*each/"
+
+toggle_bad_rel:
+  context:
+    node: cleanWater
+    rel: bad
+  src: "<ul do='pages'><li do='each' toggle='#{params[:rel]}' for='visitor.node' do='title'/></ul>"
+  res: "/<ul><li class='toggle' id='list1_26'>crocodiles</li>/"
+  js: "/list1_26.*each/"

data/test/integration/zafu_compiler/apphelper.yml

@@ -29,7 +29,7 @@ zen_url:
   context:
     node: status
   tem: "<%= zen_url(@node, :mode=>'rss', :format=>'xml') %>"
-  res: "http://test.host/oo/projects/cleanWater/page22_rss.xml"
+  res: "http://test.host/oo/projects-list/Clean-Water-project/page22_rss.xml"
 
 zen_url_root_mode_format:
   context:

data/test/integration/zafu_compiler/asset.yml

@@ -9,5 +9,5 @@ default:
 
 
 rename_asset:
-  src: "<link href='/default/style.css' rel='Stylesheet' type='text/css'/>"
+  src: "<link href='/Default skin/style.css' rel='Stylesheet' type='text/css'/>"
   tem: "<link href='/en/textdocument53.css?1144713600' rel='Stylesheet' type='text/css'/>"

data/test/integration/zafu_compiler/basic.yml

@@ -9,16 +9,6 @@ default:
 
 #----------- fixed up to here
 
-show_path:
-  src: "<ul id='path' do='show_path'><ul><li><a href='#'>first</a></li> / <li><a href='#'>second</a></li> / <li><a href='#' class='current'>here</a></li></ul></div>"
-  tem: "<ul id='path'><%= show_path(:node=>@node) %></ul>"
-  res: "/<ul id='path'><li>.*zena.*<li>.*oo/page18.html.*<li><.*/projects/cleanWater.*cleanWater</a>.*/oo/projects/cleanWater/page22.html.*class='current'>status</a>/"
-
-show_path_options:
-  src: "<div id='path' do='show_path' wrap='p'/>"
-  res: "/<div id='path'><p>.*zena.*<p>.*oo/page18.html.*<p><.*/projects/cleanWater.*cleanWater</a>.*/oo/projects/cleanWater/page22.html.*class='current'>status</a>/"
-
-
 flash_messages_both:
   src: "<r:flash_messages/>"
   tem: "/id.*messages.*notice.*flash.*notice.*error.*flash.*error/"
@@ -46,7 +36,7 @@ show_author_large:
 
 each_traductions:
   src: "<r:traductions except='current'><ul><li do='each'><r:show attr='title'/></li></ul></r:traductions>"
-  tem: "<% if list1 = @node.traductions(:conditions=>\"lang != 'en'\") -%><ul><% list1.each do |var1| -%><li><%= var1.title %></li><% end -%></ul><% end -%>"
+  tem: "<% if list1 = @node.traductions(:conditions=>\"lang != 'en'\") %><ul><% list1.each do |var1| %><li><%= var1.title %></li><% end %></ul><% end %>"
   res: "<ul><li>Etat des travaux</li></ul>"
 
 each_traductions_except_list:
@@ -60,50 +50,50 @@ each_traductions_only_list:
 each_alternate_class:
   context:
     node: 'cleanWater'
-  src: "<ol do='pages'><li do='each' alt_class='blue' do='node_name'/></ol>"
-  res: "<ol><li class=''>crocodiles</li><li class='blue'>status</li><li class=''>track</li></ol>"
+  src: "<ol do='pages'><li do='each' alt_class='blue' do='title'/></ol>"
+  res: "<ol><li class=''>crocodiles</li><li class='blue'>status title</li><li class=''>Keeping things clean !</li></ol>"
 
 each_alternate_class_reverse:
   context:
     node: 'cleanWater'
-  src: "<ol do='pages' limit='2'><li do='each' alt_class='blue' alt_reverse='true' do='node_name'/></ol>"
-  res: "<ol><li class='blue'>crocodiles</li><li class=''>status</li></ol>"
+  src: "<ol do='pages' limit='2'><li do='each' alt_class='blue' alt_reverse='true' do='title'/></ol>"
+  res: "<ol><li class='blue'>crocodiles</li><li class=''>status title</li></ol>"
 
 each_alternate_class_two:
   context:
     node: 'collections'
-  src: "<ol do='pages'><li class='post' do='each' alt_class='stripe' do='node_name'/></ol>"
+  src: "<ol do='pages'><li class='post' do='each' alt_class='stripe' do='title'/></ol>"
   res: "<ol><li class='post '>art</li><li class='post stripe'>menu</li><li class='post '>news</li><li class='post stripe'>wikiSkin</li></ol>"
 
 each_alternate_class_ajax:
   context:
     node: 'cleanWater'
-  src: "<ol do='pages' limit='2'><li do='each' alt_class='blue' do='node_name'/><li do='add'/></ol>"
+  src: "<ol do='pages' limit='2'><li do='each' alt_class='blue' do='title'/><li do='add'/></ol>"
   res: "/<li>crocodiles<\/li><li class=\"blue\">status/"
 
 each_else:
   context:
     node: 'opening'
-  src: "<div do='pages'>has pages (<r:each join=', ' do='node_name'/>)<r:else>no pages</r:else></div>"
-  tem: "/<% if var1.* -%><div>has pages \(<% var1.each_with_index .* -%><%= var2.node_name %><% end -%>\)</div><% elsif true -%><div>no pages</div><% end -%>/"
+  src: "<div do='pages'>has pages (<r:each join=', ' do='title'/>)<r:else>no pages</r:else></div>"
+  tem: "/<% if var1.* %><div>has pages \(<% var1.each_with_index .* %><%= var2.prop\['title'\] %><% end %>\)</div><% elsif true %><div>no pages</div><% end %>/"
   res: "<div>no pages</div>"
 
 
 simple_each:
-  src: "<r:children><r:each><r:show attr='node_name'/></r:each></r:children>"
-  tem: "/.*if var1.*each.*var2.node_name/"
+  src: "<r:children><r:each><r:show attr='title'/></r:each></r:children>"
+  tem: "/.*if var1.*each.*var2.prop\['title'\]/"
   res: ""
 
 each_join:
   context:
     node: 'wiki'
-  src: "<r:children><r:each join=', '><r:show attr='node_name'/></r:each></r:children>"
+  src: "<r:children><r:each join=', '><r:show attr='title'/></r:each></r:children>"
   res: "bird, flower"
 
 each_join_if:
   context:
     node: 'status'
-  src: "<r:pages in='site' order='name'><r:each join=', ' join_if='prev.id ne main.id and id ne main.id'><r:show attr='node_name'/></r:each></r:pages>"
+  src: "<r:pages in='site' order='name'><r:each join=', ' join_if='prev.id ne main.id and id ne main.id'><r:show attr='title'/></r:each></r:pages>"
   res: "/projects, skinsstatustalk, track/"
 
 set_attribute:
@@ -124,27 +114,27 @@ set_node_param_main_other_class:
   res: "<p class='class_22'></p>"
 
 set_attribute_with_inner:
-  src: "<p set_id='node[id]' do='show' attr='node_name' set_class='s[v_status]'>some blah blah</p>"
-  res: "<p class='s50' id='node22'>status</p>"
+  src: "<p set_id='node[id]' do='show' attr='title' set_class='s[v_status]'>some blah blah</p>"
+  res: "<p class='s50' id='node22'>status title</p>"
 
 set_in_ztag:
-  src: "<r:show attr='node_name' set_id='node[id]'/>"
-  res: "<div id='node22'>status</div>"
+  src: "<r:show attr='title' set_id='node[id]'/>"
+  res: "<div id='node22'>status title</div>"
 
 set_attribute_stored_node:
-  src: "<r:void store='foo'><r:parent><p do='node_name' set_id='test_[foo.id]'>hey</p></r:parent></r:void>"
-  res: "<p id='test_22'>cleanWater</p>"
+  src: "<r:void store='foo'><r:parent><p do='title' set_id='test_[foo.id]'>hey</p></r:parent></r:void>"
+  res: "<p id='test_22'>Clean Water project</p>"
 
 set_attribute_main_node:
-  src: "<r:parent><p id='test_#{main.node_name}' do='node_name'>hey</p></r:parent>"
-  res: "<p id='test_status'>cleanWater</p>"
+  src: "<r:parent><p id='test_#{main.zip}' do='title'>hey</p></r:parent>"
+  res: "<p id='test_22'>Clean Water project</p>"
 
 set_attribute_in_list:
   context:
     node: 'projects'
-  src: "<div do='pages'><p id='#{node_name}'>...</p></div>"
+  src: "<div do='pages'><p id='#{id}'>...</p></div>"
   tem: /var1.first/
-  res: "<div><p id='cleanWater'>...</p></div>"
+  res: "<div><p id='21'>...</p></div>"
 
 set_attribute_with_namespace:
   src: "<entry do='void' set_xml:base='[name]'>..</entry>"
@@ -153,13 +143,13 @@ set_attribute_with_namespace:
 each_join_html:
   context:
     node: 'wiki'
-  src: "<r:children><r:each join='&lt;br/&gt;'><r:show attr='node_name'/></r:each></r:children>"
+  src: "<r:children><r:each join='&lt;br/&gt;'><r:show attr='title'/></r:each></r:children>"
   res: "bird<br/>flower"
 
 each_join_nasty_erb:
   context:
     node: 'wiki'
-  src: "<r:children><r:each join='&lt;% puts \'nasty\' -%&gt;'><r:show attr='node_name'/></r:each></r:children>"
+  src: "<r:children><r:each join='&lt;% puts \'nasty\' -%&gt;'><r:show attr='title'/></r:each></r:children>"
   res: "bird&lt;% puts 'nasty' -%&gt;flower"
 
 test_children_plural:
@@ -169,7 +159,7 @@ test_children_plural:
 each_do:
   context:
     node: 'wiki'
-  src: "<r:children><r:each join=', ' do='show' attr='node_name'/></r:children>"
+  src: "<r:children><r:each join=', ' do='show' attr='title'/></r:children>"
   res: "bird, flower"
 
 parent_do:
@@ -187,7 +177,7 @@ do_each:
 do_with_inner:
   context:
     node: 'wiki'
-  src: "<ul do='children' do='each' tag='li'><r:show attr='node_name'/></ul>"
+  src: "<ul do='children' do='each' tag='li'><r:show attr='title'/></ul>"
   res: "<ul><li>bird</li><li>flower</li></ul>"
 
 do_each_do:
@@ -207,8 +197,8 @@ do_ignore:
   res: ""
 
 name_title:
-  src: "title: <h1 id='lala' do='show' name='title' attr='node_name'>blah</h1>"
-  res: "title: <h1 id='lala'>status</h1>"
+  src: "title: <h1 id='lala' do='show' name='title' attr='title'>blah</h1>"
+  res: "title: <h1 id='lala'>status title</h1>"
 
 include_with:
   src: "include_with: <r:include template='/basic/name/title'><h1 do='with' part='title' attr='id'/>"
@@ -228,21 +218,21 @@ include_named:
 
 # this test is a dummy used by include_context
 context_dummy:
-  src: "CD: <r:pages in='site' where='name like \"s%\"' node_name='pages'><r:each join=', ' do='node_name'/></r:pages>"
+  src: "CD: <r:pages in='site' where='title like \"s%\"' name='pages'><r:each join=', ' do='title'/></r:pages>"
   res: "CD: skins, status"
 
 include_context:
-  src: "IC: <r:include template='/context/dummy'><r:with part='pages'><r:each join=' / ' do='node_name'/></r:with></r:include>"
+  src: "IC: <r:include template='/context/dummy'><r:with part='pages'><r:each join=' / ' do='title'/></r:with></r:include>"
   res: "IC: CD: skins / status"
 
 content_for_layout:
   src: "<r:content_for_layout>blah blah</r:content_for_layout>"
-  tem: "<% if content_for_layout = yield -%><%= content_for_layout %><% else -%>blah blah<% end -%>"
+  tem: "<% if content_for_layout = yield %><%= content_for_layout %><% else %>blah blah<% end %>"
   res: "blah blah"
 
 title_for_layout:
   src: "<r:title_for_layout>blah blih</r:title_for_layout>"
-  res: "zena/projects/cleanWater/status"
+  res: "zena/projects-list/Clean-Water-project/status"
 
 tada:
   context:
@@ -332,7 +322,7 @@ design_by_options:
 
 comments_shown_if_empty_but_can_comment:
   src: "<r:comments><r:each do='[title]'/><r:add/></r:comments>"
-  tem: "/if \(list1 = @node.comments\) \|\| \(@node.can_comment\? && list1=\[\]\) -%>/"
+  tem: "/if \(list1 = @node.comments\) \|\| \(@node.can_comment\? && list1=\[\]\) %>/"
 
 
 
@@ -357,12 +347,12 @@ find_count:
 link_page_next:
   context:
     pak: 2
-  src: "<r:nodes in='site' limit='3' order='zip' paginate='pak'><r:link page='previous'/> | <r:show var='pak'/> | <r:link page='next'/> || <r:each join=',' do='node_name'/></r:nodes>"
-  res: "<a href='/oo/projects/cleanWater/page22.html?pak=1'>1</a> | 2 | <a href='/oo/projects/cleanWater/page22.html?pak=3'>3</a> || tiger,lion,myLife"
+  src: "<r:nodes in='site' limit='3' order='zip' paginate='pak'><r:link page='previous'/> | <r:show var='pak'/> | <r:link page='next'/> || <r:each join=',' do='title'/></r:nodes>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html?pak=1'>1</a> | 2 | <a href='/oo/projects-list/Clean-Water-project/page22.html?pak=3'>3</a> || tiger,lion,myLife"
 
 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/cleanWater/page22.html?pak=2'>next</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html?pak=2'>next</a>"
 
 link_page_list:
   context:
@@ -408,7 +398,7 @@ link_page_previous_else_page2:
   context:
     pak: 2
   src: "<r:nodes in='site' limit='3' order='zip' paginate='pak'><r:link page='previous' do='else'>noprev</r:link></r:nodes>"
-  res: "<a href='/oo/projects/cleanWater/page22.html?pak=1'>1</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html?pak=1'>1</a>"
 
 link_page_list_else:
   context:
@@ -420,14 +410,14 @@ debug_params:
   context:
     foo: 'bar'
     dev: true
-  src: "DEBUG: <r:debug title='no idea for a title' show='params'/><r:debug do='node_name'/>"
+  src: "DEBUG: <r:debug title='no idea for a title' show='params'/><r:debug do='title'/>"
   tem: "DEBUG: <div class='debug'><p>no idea for a title</p><pre><%= params.inspect %></pre></div><div class='debug'><%= @node.name %></div>"
-  res: "/DEBUG: <div class='debug'><p>no idea for a title</p><pre>.*\"foo\"=>\"bar\".*</pre></div><div class='debug'>status</div>/"
+  res: "/DEBUG: <div class='debug'><p>no idea for a title</p><pre>.*\"foo\"=>\"bar\".*</pre></div><div class='debug'>status title</div>/"
 
 debug_params_not_in_dev_mode:
   context:
     foo: 'bar'
-  src: "DEBUG: <r:debug show='params'/><r:debug do='node_name'/><r:debug title='help needed'/>"
+  src: "DEBUG: <r:debug show='params'/><r:debug do='title'/><r:debug title='help needed'/>"
   tem: 'DEBUG: '
   res: 'DEBUG: '
 
@@ -443,4 +433,4 @@ expand_with_set_host:
     node: 'projects'
   src: "relative:<r:link/> absolute:<r:expand_with set_host='[site.host]' do='link'/>"
   tem: "/relative:.*zen_path\(@node\).*absolute:.*zen_path\(@node, :host => \"#\{current_site.host\}\"/"
-  res: "relative:<a href='/oo/page18.html'>projects list</a> absolute:<a href='http://test.host/oo/page18.html'>projects list</a>"
+  res: "relative:<a href='/oo/page18.html'>projects list</a> absolute:<a href='http://test.host/oo/page18.html'>projects list</a>"