zena 1.0.0.beta3 → 1.0.0.rc1

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 %><%= var1.login %>"
   res: "ant"
 
 lang:
@@ -21,12 +21,27 @@ is_anon:
   eval: "visitor.is_anon?"
   res: "false"
 
-author_is_a_user:
-  src: "<b do='author.login'/>"
+user_is_a_user:
+  src: "<b do='user.login'/>"
   tem: "<b><%= @node.user.login %></b>"
   res: '<b>ant</b>'
 
-version_author_is_a_user:
-  src: "<b do='v.author.login'/>"
+user_node_is_a_node:
+  src: "<b do='user.node.title'/>"
+  tem: "<b><%= (@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>"
-  res: '<b>ant</b>'
+  res: '<b>ant</b>'
+
+author_is_a_node:
+  src: "<b do='author.title'/>"
+  tem: "<b><%= (@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>'

data/test/integration/zafu_compiler/version.yml

@@ -8,7 +8,7 @@ link:
   context:
     node: 'opening'
   src: "<r:traductions><r:each join=', '><r:link eval='trans(lang)'/></r:each></r:traductions>"
-  res: "<a href='/oo/projects/cleanWater/post27.html?lang=en'>english</a>, <a href='/oo/projects/cleanWater/post27.html?lang=fr'>french</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/post27.html?lang=en'>english</a>, <a href='/oo/projects-list/Clean-Water-project/post27.html?lang=fr'>french</a>"
 
 link_not_same_node:
   # version link where 'up' node is not the version's node
@@ -24,19 +24,19 @@ anchor:
   context:
     node: 'opening'
   src: "<r:traductions><r:each join=', '><r:anchor do='link' eval='trans(lang)'/></r:each></r:traductions>"
-  res: "<a class='anchor' name='version27_2'></a><a href='/oo/projects/cleanWater/post27.html?lang=en'>english</a>, <a class='anchor' name='version27_1'></a><a href='/oo/projects/cleanWater/post27.html?lang=fr'>french</a>"
+  res: "<a class='anchor' name='version27_2'></a><a href='/oo/projects-list/Clean-Water-project/post27.html?lang=en'>english</a>, <a class='anchor' name='version27_1'></a><a href='/oo/projects-list/Clean-Water-project/post27.html?lang=fr'>french</a>"
 
 node:
   context:
     node: 'opening'
-  src: "<r:traductions do='each' join=', '><r:lang/>:<r:eval>node.node_name</r:eval></r:traductions>"
-  res: "en:opening, fr:opening"
+  src: "<r:traductions do='each' join=', '><r:lang/>:<r:eval>node.id</r:eval></r:traductions>"
+  res: "en:27, fr:27"
 
 author:
   context:
     node: 'opening'
-  src: "<r:traductions do='each' join=', '><r:lang/>:<r:eval>author.login</r:eval></r:traductions>"
-  res: "en:tiger, fr:ant"
+  src: "<r:traductions do='each' join=', '><r:lang/>:<r:eval>author.name</r:eval></r:traductions>"
+  res: "en:Tigris Sumatran, fr:Invicta"
 
 created_at:
   src: "<p do='show' date='v.created_at' format='%d %b %y'/>"

data/test/integration/zafu_compiler/zafu_attributes.yml

@@ -66,66 +66,75 @@ prefix_lang_show:
 
 set_attribute:
   old_src: "<div do='void' set_class='[name]'>hop</div>"
-  src: "<div class='#{node_name}'>hop</div>"
-  res: "<div class='status'>hop</div>"
+  src: "<div class='#{title}'>hop</div>"
+  res: "<div class='status title'>hop</div>"
 
 set_attribute_empty_tag:
   old_src: "<div do='void' set_class='[name]'>hop</div>"
-  src: "<div class='#{node_name}'/>"
-  res: "<div class='status'></div>"
+  src: "<div class='#{title}'/>"
+  res: "<div class='status title'></div>"
 
 store_node:
-  src: "<r:void set_baz='this'><r:parent><r:show attr='node_name'/>: <r:baz do='node_name'/> + <r:main do='show' attr='id'/></r:parent></r:void>"
-  res: "cleanWater: status + 22"
+  src: "<r:void set_baz='this'><r:parent><r:show attr='title'/>: <r:baz do='title'/> + <r:main do='show' attr='id'/></r:parent></r:void>"
+  res: "Clean Water project: status title + 22"
 
 store_in_block:
-  src: "<r:block><r:void set_found='this' do='node' where='id = 18 in site' do='page'><r:found do='node_name'/>: <r:show attr='node_name'/></r:void></r:block>"
-  res: "<div id='list1'>status: cleanWater</div>"
-  'zafu_attributes/store/en/in/block/list1.erb': '/<% var3 = @node -%><%= var3.node_name %>:/'
+  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'>status title: a wiki with Zena</div>"
+  'zafu_attributes/store/in/block/en/list1.erb': "/_zfound = @node.*<% var3 = _zfound %><%= var3.prop\['title'\] %>:/"
 
 set_var_outside_block:
-  old_src: "<r:node select='18' set_found='this' do='pages'><r:block><r:show attr='node_name'/>: <r:context select='found' do='node_name'/></r:block></r:node>"
-  src: "<r:void set_found='this' do='pages from node where id = 18 in site' do='each' join=', '><r:block><r:found do='node_name'/>: <r:show attr='node_name'/></r:block></r:void>"
-  res: "<div id='list2_21'>status: cleanWater</div>, <div id='list2_29'>status: wiki</div>"
-  'zafu_attributes/set/en/var/outside/block/list1.erb': "/unknown method <span class='type'>found\(\)/"
+  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>"
+  src: "<r:void set_found='this' do='pages from node where id = 18 in site' do='each' join=', '><r:block><r:found do='title'/>: <r:show attr='title'/></r:block></r:void>"
+  res: "<div id='list1_29'>status title: a wiki with Zena</div>, <div id='list1_21'>status title: Clean Water project</div>"
+  'zafu_attributes/set/var/outside/block/en/list1.erb': "/unknown method <span class='type'>found\(\)/"
 
 store_node_as_relation:
-  src: "<r:void set_baz='this'><r:parent><r:show attr='node_name'/>: <r:baz do='node_name'/> + <r:main do='show' attr='id'/></r:parent></r:void>"
-  res: "cleanWater: status + 22"
+  src: "<r:void set_baz='this'><r:parent><r:show attr='title'/>: <r:baz do='title'/> + <r:main do='show' attr='id'/></r:parent></r:void>"
+  res: "Clean Water project: status title + 22"
 
 store_img:
-  src: "<r:parent><r:icon set_bob='this'><r:show attr='node_name'/><r:img link='bob'/></r:icon></r:parent>"
-  tem: "/if var1 = @node.parent.*var2 = Node.do_find.*relation_id = _ID(node_has_an_icon).*LIKE 'NDI%'.*var2.node_name.*zen_path\(var1\).*img_tag\(var2/"
+  src: "<r:parent><r:icon set_bob='this'><r:show attr='title'/><r:img link='bob'/></r:icon></r:parent>"
+  tem: "/if var1 = @node.parent.*_zbob = var1.*var2 = Node.do_find.*relation_id = _ID(node_has_an_icon).*LIKE 'NDI%'.*var2.prop\['title'\].*zen_path\(_zbob\).*img_tag\(var2/"
 
 store_var_in_html:
   src: "<p set_foo='this' do='parent' do='foo' do='title'/>"
   res: "<p>status title</p>"
 
+store_number:
+  src: "<p set_foo='34' do='void'><r:eval>foo + 15</r:eval></p>"
+  tem: "<p><% _zfoo = 34 %><%= (_zfoo+15) %></p>"
+  res: "<p>49</p>"
+
 stored_in_if_clause:
   src: "<r:parent set_base='this'><li do='void' on_if='id == base.id'>hop</li></r:parent>"
-  tem: "/var1.zip==@node.zip/"
+  tem: "/var1.zip==_zbase.zip/"
+
+syntax_error_in_store:
+  src: "<div do='void' set_foo='34)'></div>"
+  tem: "/parse error/"
 
 on_if_in_context:
-  src: "<div do='project' on_if='node_name == \"cleanWater\"' do='node_name'/>"
-  tem: "/var1.node_name==/"
-  res: "<div class=' on'>cleanWater</div>"
+  src: "<div do='project' on_if='title == \"Clean Water project\"' do='title'/>"
+  tem: "/var1.prop\['title'\]==/"
+  res: "<div class=' on'>Clean Water project</div>"
 
 on_if_with_link:
   # Make sure we do not insert an 'on_if' param in href
   src: "<p do='link' on_if='1 == 1'/>"
-  res: "<p class=' on'><a href='/oo/projects/cleanWater/page22.html'>status title</a></p>"
+  res: "<p class=' on'><a href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a></p>"
 
 on_if_on_each:
   context:
     node: cleanWater
   # We use 'this' to make sure we are not in a list context.
-  src: "<r:pages><p do='each' on_if='this.node_name == \"status\"' do='node_name'/></r:pages>"
-  tem: '/var2.node_name==\"status\"/'
-  res: "<p class=''>crocodiles</p><p class=' on'>status</p><p class=''>track</p>"
+  src: "<r:pages><p do='each' on_if='this.title == \"status title\"' do='title'/></r:pages>"
+  tem: "/var2.prop\['title'\]==\"status title\"/"
+  res: "<p class=''>crocodiles</p><p class=''>Keeping things clean !</p><p class=' on'>status title</p>"
 
 on_if_ancestor:
-  src: "<r:root><r:pages><li do='each' on_if='ancestor?(main)' class='hello' join=', ' do='node_name'/></r:pages></r:root>"
-  res: "<li class='hello'>collections</li>, <li class='hello'>nature</li>, <li class='hello'>people</li>, <li class='hello on'>projects</li>, <li class='hello'>skins</li>"
+  src: "<r:root><r:pages><li do='each' on_if='ancestor?(main)' class='hello' join=', ' do='title'/></r:pages></r:root>"
+  res: "<li class='hello'>Collections</li>, <li class='hello'>Nature</li>, <li class='hello'>people</li>, <li class='hello on'>projects list</li>, <li class='hello'>Skins (layout themes)</li>"
 
 on_if_empty:
   src: "<li do='void' on_if='custom_a.blank?'>hello</li>"
@@ -138,24 +147,24 @@ test_negative_value:
 
 anchor_attribute:
   # Use to_s so that the method executed replaces the dummy text.
-  src: "<p do='id.to_s' anchor='#{node_name}'>hello</p>"
-  res: "<a class='anchor' name='status'></a><p>22</p>"
+  src: "<p do='id.to_s' anchor='#{title.urlencode}'>hello</p>"
+  res: "<a class='anchor' name='status-title'></a><p>22</p>"
 
 anchor_true:
   src: "<r:title live='true' anchor='true'/>"
   res: "<a class='anchor' name='node22'></a><span id='_title22'>status title</span>"
 
 show_attr_anchor:
-  src: "<r:show attr='node_name' anchor='true'/>"
-  res: "<a class='anchor' name='node22'></a>status"
+  src: "<r:show attr='title' anchor='true'/>"
+  res: "<a class='anchor' name='node22'></a>status title"
 
 anchor_in_link:
   src: "<r:link class='xx' anchor='true'/>"
   res: "<a class='xx' href='#node22'>status title</a>"
 
 anchor_tag:
-  src: "<r:anchor/> <r:anchor anchor='#{node_name}'/>"
-  res: "<a class='anchor' name='node22'></a> <a class='anchor' name='status'></a>"
+  src: "<r:anchor/> <r:anchor anchor='#{title.urlencode}'/>"
+  res: "<a class='anchor' name='node22'></a> <a class='anchor' name='status-title'></a>"
 
 live_with_show:
   src: "<r:title live='true'/>"
@@ -167,4 +176,4 @@ live_with_zazen:
 
 live_with_link:
   src: "<h2 do='link' attr='title' live='true'>super titre</h2>"
-  res: "<h2><a id='_title22' href='/oo/projects/cleanWater/page22.html'>status title</a></h2>"
+  res: "<h2><a id='_title22' href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a></h2>"

data/test/integration/zafu_compiler/zazen.yml

@@ -16,20 +16,20 @@ link_anchor:
   res: "<p>see <a href=\"#node22\">status title</a></p>"
 
 link_anchor_attribute:
-  tem: "<%= zazen('see \"\":22#[node_name]') %>"
-  res: "<p>see <a href=\"#status\">status title</a></p>"
+  tem: "<%= zazen('see \"\":22#[title]') %>"
+  res: "<p>see <a href=\"#status-title\">status title</a></p>"
 
 link_anchor_in:
   tem: "<%= zazen('see \"\":22#[parent/]') %>"
-  res: "<p>see <a href=\"/oo/projects/cleanWater#node22\">status title</a></p>"
+  res: "<p>see <a href=\"/oo/projects-list/Clean-Water-project#node22\">status title</a></p>"
 
 link_anchor_in_name:
-  tem: "<%= zazen('see \"\":22#[parent/node_name]') %>"
-  res: "<p>see <a href=\"/oo/projects/cleanWater#status\">status title</a></p>"
+  tem: "<%= zazen('see \"\":22#[parent/title]') %>"
+  res: "<p>see <a href=\"/oo/projects-list/Clean-Water-project#status-title\">status title</a></p>"
 
 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/cleanWater/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/cleanWater/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.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>"
 
 at_code:
   tem: "<%= zazen(\"Try this: @ruby|puts 'Hello'@ or this @zafu|<r:link/>@\") %>"
@@ -45,19 +45,19 @@ line_break_list:
 
 zip_shortcut_link:
   tem: "<%= zazen('Look \"here\"::lake or \"\"::lake+') %>"
-  res: "/<p>Look <a href.*contact23.html.*projects/cleanWater/lakeAddress.*href=.*image24.html.*projects/cleanWater/lake/"
+  res: "/<p>Look <a href.*contact23.html.*projects list/Clean Water project/Lake Tanganyika.*href=.*image24.html.*projects list/Clean Water project/it&#8217;s a lake/"
 
 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/cleanWater/lakeAddress_life.rss</a>, <a href=.*image24_life.jpg.*projects/cleanWater/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.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/cleanWater/lakeAddress 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.jpg/"
 
 zip_shortcut_image_with_options:
   tem: "<%= zazen('Look !<.:lake_med! or !=.:lake+_pv!') %>"
-  res: "/<p>Look \[projects/cleanWater/lakeAddress 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.jpg/"
 
 zip_shortcut_gallery:
   tem: "<%= zazen('Look ![30,:lake+]!') %>"

data/test/integration/zafu_compiler_test.rb

@@ -1,15 +1,18 @@
 require 'test_helper'
 
 class ZafuCompilerTest < Zena::Controller::TestCase
+  include Zena::Use::Urls::Common
  OK = [
     'action',
     'asset',
     'conditional',
+#    'calendar',
     'dates',
     'display',
     'errors',
     'i18n',
-    'off',
+    'idx_scope',
+    'query',
     'recursion',
     'relations',
     'roles',
@@ -80,28 +83,20 @@ class ZafuCompilerTest < Zena::Controller::TestCase
 
   def yt_do_test(file, test)
     # Disable defined tests without loaded files
-    return unless (@@test_strings[file] || {})[test]
+    return unless test_data = (@@test_strings[file] || {})[test]
 
-    if @@test_strings[file][test].keys.include?('src')
+    if test_data.keys.include?('src')
       # we do not want src built from title
       src = yt_get('src', file, test)
     elsif src = yt_get('eval', file, test)
-      src = @@test_strings[file][test]['src'] = "<r:eval>#{src}</r:eval>"
+      src = test_data['src'] = "<r:eval>#{src}</r:eval>"
     end
 
-    tem = yt_get('tem', file, test)
-    res = yt_get('res', file, test)
-    js  = yt_get('js',  file, test)
-
-    compiled_files = {}
-    @@test_strings[file][test].each do |k,v|
-      next if ['src','tem','res','context','eval','js'].include?(k) || k =~ /^old/
-      compiled_files[k] = v
-    end
     context = yt_get('context', file, test)
     site = sites(context.delete('site') || 'zena')
     $_test_site = site.name
     @request.host = site.host
+
     # set context
     params = {}
     #params[:user_id] = users_id(context.delete('visitor').to_sym)
@@ -111,6 +106,17 @@ class ZafuCompilerTest < Zena::Controller::TestCase
     params['date']    = context['ref_date'] ? context.delete('ref_date').to_s : nil
     params['url'] = "#{file}/#{test.to_s.gsub('_', '/')}"
     params.merge!(context) # merge the rest of the context as query parameters
+
+    compiled_files = {}
+    test_data.each do |k,v|
+      next if ['src','tem','res','context','eval','js'].include?(k) || k =~ /^old/
+      compiled_files[k] = v
+    end
+
+    tem = yt_get('tem', file, test)
+    res = yt_get('res', file, test)
+    js  = yt_get('js',  file, test)
+
     Zena::TestController.templates = @@test_strings[file]
     if src
       post 'test_compile', params

data/test/sites/complex/nodes.yml

@@ -24,7 +24,6 @@ cskin:
 Node_zafu:
   class:           Template
   parent:          cskin
-  node_name:       Node
   title:           Node
   v_prop:
     target_klass:  Node
@@ -106,7 +105,6 @@ chief:
   class:           Job
   parent:          jobs
   title:           chief
-  node_name:       chief
 
 chief_motivation:
   class:           Page

data/test/sites/complex/roles.yml

@@ -3,9 +3,17 @@ DEFAULTS:
   icon:            ""
   type:            VirtualClass
 
+Reference:
+  kpath:           NR
+  real_class:      Node
+
+Contact:
+  kpath:           NRC
+  real_class:      Node
+
 Employee:
   kpath:           NRCE
-  real_class:      BaseContact
+  real_class:      Node
 
 Job:
   kpath:           NPPJ

data/test/sites/complex/sites.yml

@@ -1,7 +1,6 @@
 complex:
   host:            complex.host
   root:            complex
-  su:              su
   anon:            anon
   public_group:    public
   site_group:      complex

data/test/sites/complex/users.yml

@@ -5,16 +5,13 @@ DEFAULTS:
   lang:            fr
 
 complex_anon:
-  first_name:      Anonymous
-  name:            User
   status:          moderated
-  contact:         anonymous
+  node:            anonymous
 
 complex_admin:
   login:           admin
-  first_name:      admin
   crypted_password:        <%= Zena::CryptoProvider::Initial.encrypt('admin') %>
   status:          admin
-  contact:         admin
+  node:            admin
 
 

data/test/sites/ocean/nodes.yml

@@ -8,7 +8,6 @@ DEFAULTS:
 
 ocean:
   class:           Project
-  node_name:       other
   inherit:         no
   rgroup:          public
   wgroup:          masters
@@ -16,19 +15,17 @@ ocean:
   skin:            default
 
 incognito:
-  class:           BaseContact
+  class:           Contact
   parent:          ocean
   skin:            default
 
 whale:
-  class:           BaseContact
-  node_name:       whale
+  class:           Contact
   parent:          ocean
   skin:            default
 
 default:
   class:           Skin
-  node_name:       default
   parent:          ocean
 
 Node:

data/test/sites/ocean/roles.yml

@@ -0,0 +1,8 @@
+DEFAULTS:
+  create_group:    public
+  icon:            ""
+  type:            VirtualClass
+
+Contact:
+  kpath:           NC
+  real_class:      Node

data/test/sites/ocean/sites.yml

@@ -1,7 +1,6 @@
 ocean:
   host:            ocean.host
   root:            ocean
-  su:              ocean_su
   anon:            incognito
   public_group:    public
   site_group:      aqua