zena 1.0.0 → 1.1.0

data/test/integration/zafu_compiler/context.yml

@@ -6,7 +6,7 @@ default:
 
 each_group:
   src: "<r:nodes do='group' by='kpath'><p do='each_group'><r:kpath/>: <r:each join=', ' do='title'/></p></r:nodes>"
-  res: "<p>NP: crocodiles, status title</p><p>NDI: it's a lake</p><p>NPA: Keeping things clean !</p><p>NRC: The lake we love</p><p>NNP: parc opening</p><p>ND: water</p>"
+  res: "<p>NP: crocodiles, status title</p><p>NDI: it's a lake</p><p>NRC: The lake we love</p><p>NNP: parc opening</p><p>ND: water</p>"
 
 set_var:
   context:

data/test/integration/zafu_compiler/dates.yml

@@ -122,12 +122,20 @@ date_context:
   src: "<r:show eval='parse_date(\"2008-03-02\")' format='%A %d.%m.%Y'/>"
   res: "Sunday 02.03.2008"
 
+parse_date:
+  src: "<r:void do='parse_date(\"2011-06-16\")'/>"
+  tem: "/parse_date\(\"2011-06-16\", \"%Y-%m-%d %H:%M\", visitor.tz\) %>"
+
+parse_date_in_tz:
+  src: "<r:default tz='Asia/Jakarta' do='parse_date(\"2011-06-16\")'/>"
+  tem: "/parse_date\(\"2011-06-16\", \"%Y-%m-%d %H:%M\", _ztz\) %>"
+
 date_from_params:
   context:
     year: 1975
   old_src: "<r:date select='[param:year]-01-01'><r:show attr='current_date' format='%A %d.%m.%Y'/></r:date>"
   src: "<r:show eval='parse_date(\"#{params[:year]}-01-01\")' format='%A %d.%m.%Y'/>"
-  tem: "<%= format_date(parse_date(\"#{params[:year]}-01-01\"), :format => \"%A %d.%m.%Y\") %>"
+  tem: "<%= format_date(parse_date(\"#{params[:year]}-01-01\", \"%Y-%m-%d %H:%M\", visitor.tz), :format => \"%A %d.%m.%Y\") %>"
   res: "Wednesday 01.01.1975"
 
 date_from_params_in_query:

data/test/integration/zafu_compiler/display.yml

@@ -297,6 +297,12 @@ render_h_label:
   src: "<r:default label='t'><li do='show' attr='title'/></r:default>"
   res: "<li><label>titre</label> <span>Etat des travaux</span></li>"
 
+render_label_false:
+  context:
+    lang: fr
+  src: "<r:default label='t'><li do='show' label='false' attr='title'/></r:default>"
+  res: "<li>Etat des travaux</li>"
+
 render_h_disabled:
   src: "<r:default h='false'><r:show attr='title'/></r:default>"
   tem: "<%= @node.prop['title'] %>"
@@ -326,7 +332,7 @@ each_whitespace:
   src: |
     <r:pages in='site' order='id asc' limit='3'><r:each><r:id/><r:node></r:node></r:each>
     </r:pages>.
-  res: "53\n12\n34\n.\n"
+  res: "53\n37\n12\n.\n"
 
 set_class_before_query:
   # Should use previous node (not list context)

data/test/integration/zafu_compiler/eval.yml

@@ -3,53 +3,19 @@ default:
     lang: 'en'
     visitor: 'ant'
     node: 'status'
-  src: "simple text"
-  tem: "simple text"
-  res: "simple text"
-
-sprintf:
-  src: "<b do='eval'>sprintf('%.2f', id)</b>"
-  res: "<b>22.00</b>"
-
-set_var:
-  src: "<r:set var='foo'>I am <r:show attr='title'/></r:set> <p do='show' var='foo'/>"
-  tem: "<% set_foo = capture do %>I am <%= @node.name %><% end %> <p><%= set_foo %></p>"
-  res: " <p>I am status</p>"
-
-eval_mult:
-  src: "<r:set var='foo'>134</r:set><r:show eval='foo * 0.1'/>"
-  tem: "<% set_foo = capture do %>134<% end %><%= (set_foo.to_f * 0.1) %>"
-  res: "13.4"
-
-eval_with_attr:
-  src: "<r:show eval='[id] * 10'/>"
-  tem: "<%= (@node.zip.to_f * 10) %>"
-  res: "220.0"
-
-eval_data:
-  context:
-    lang: 'en'
-    visitor: 'ant'
-    node: 'cleanWater'
-  src: "<r:data><r:set var='count' do='stat' find='count'/><r:set var='sum' do='stat' find='sum'/><b do='show' eval='sum / count' format='%.3f'/></r:data>"
-  res: "<b>32.250</b>"
-
-eval_or:
-  src: "<r:set var='price'><r:show attr='d_boz'/> 20.3</r:set><r:show eval='price * 10'/>"
-  res: "203.0"
-
-eval_or_value_exists:
-  src: "<r:set var='price'><r:show attr='id'/> 20.3</r:set><r:show eval='price * 10'/>"
-  res: "220.0"
-
-show_var:
-  src: "<r:set var='foo'>12345</r:set><b do='[foo]'/>"
-  res: "<b>12345</b>"
 
 show_var_overwrites_attribute:
-  src: "<r:set var='name'>12345</r:set><b do='title'/>"
+  src: "<r:set title='12345'><b do='title'/></r:set>"
   res: "<b>12345</b>"
 
-test_var:
-  src: "<r:set var='hours'>3</r:set><r:if test='hours gt 0'>you have: <r:show attr='hours'/></r:if>"
-  res: "you have: 3"
+test_set_in_scope:
+  src: "<r:set hours='3'><r:if test='hours &gt; 0'>you have: <r:show eval='hours' format='%.2f'/></r:if></r:set>"
+  res: "you have: 3.00"
+
+test_set_for_siblings:
+  src: "<r:set hours='3'/><r:if test='hours &gt; 0'>you have: <r:show eval='hours' format='%.2f'/></r:if>"
+  res: "you have: 3.00"
+
+test_set_for_siblings_overwrite:
+  src: "<r:set hours='3'/><r:set hours='%{hello}'/><r:if test='!hours.blank?'>you have: <r:eval>hours.gsub(/o/,'')</r:eval></r:if>"
+  res: "you have: hell"

data/test/integration/zafu_compiler/forms.yml

@@ -36,7 +36,7 @@ new:
   # Should accept allowed params (from class and roles) and transform ids to zip (back and forth)
   src: "<r:new klass='Letter' title='%q{Joe}' parent_id='project.id' paper='%q{white}' origin='%q{Mars}' bad='%q{value}'><r:form><r:input name='title'/> <r:input name='parent_id'/></r:form></r:new>"
   tem: "/:title => \"Joe\", :parent_id => .*@node.project.zip.*, :paper => \"white\", :origin => \"Mars\"/"
-  res: "/<input type='text' name='node\[title\]' value='Joe'/> <input type='text' name='node\[parent_id\]' value='21'/><div class='hidden'><input type='hidden' name='node\[klass\]' value='Letter'/><input type='hidden' name='node\[paper\]' value='white'/><input type='hidden' name='node\[origin\]' value='Mars'/></div>/"
+  res: "/<input type='text' name='node\[title\]' value='Joe'/> <input type='text' name='node\[parent_id\]' value='21'/><div class='hidden'><input type='hidden' name='node\[klass\]' value='Letter'/><input type='submit'/><input type='hidden' name='node\[paper\]' value='white'/><input type='hidden' name='node\[origin\]' value='Mars'/></div>/"
 
 translate_id_to_zip:
   src: "<b do='hot_id'/><i do='parent_id'/>"

data/test/integration/zafu_compiler/query.yml

@@ -165,7 +165,7 @@ query_with_default:
     visitor: lion
     node: cleanWater
   src: "<r:query default='nodes in project' do='each' join=', ' do='title'/>"
-  res: "crocodiles, it's a lake, Keeping things clean !, The lake we love, Nice Bananas, parc opening, status title, water"
+  res: "crocodiles, it's a lake, The lake we love, Nice Bananas, parc opening, status title, water"
 
 query_with_param:
   # Live compile and query from params
@@ -184,7 +184,7 @@ query_eval:
     node: cleanWater
     scope: 'self'
   src: "<r:query select='pages in #{params[:scope] || \"project\"}' default='pages in project' do='each' join=', ' do='title'/>"
-  res: 'crocodiles, Keeping things clean !, Nice Bananas, status title'
+  res: 'crocodiles, Nice Bananas, status title'
 
 query_with_parse:
   context:

data/test/integration/zafu_compiler/relations.yml

@@ -37,9 +37,9 @@ icon:
 
 pages:
   context:
-    node: 'cleanWater'
+    node: 'zena'
   src: "<r:pages><r:each join=', '><r:show attr='title'/></r:each></r:pages>"
-  res: "Keeping things clean !, status title"
+  res: "Collections, Kill the bugs, people, projects list, Skins (layout themes)"
 
 root:
   src: "<r:root do='title'/>"
@@ -79,9 +79,9 @@ pages_do_syntax:
 
 pages_limit:
   context:
-    node: 'cleanWater'
+    node: 'zena'
   src: "<r:pages limit='2' order='title DESC'><r:each join=', '><r:show attr='title'/></r:each></r:pages>"
-  res: "status title, Keeping things clean !"
+  res: "Skins (layout themes), projects list"
 
 pages_random:
   context:
@@ -91,11 +91,11 @@ pages_random:
 
 nodes_in_project:
   src: "<r:nodes in='project' limit='2'><r:each join=', '><r:show attr='title'/></r:each></r:nodes>"
-  res: "it's a lake, Keeping things clean !"
+  res: "it's a lake, Lake Tanganyika"
 
 nodes_in_project_stored:
   src: "<r:void set_foo='this'><r:node where='id = 29 in site'>from <r:show attr='title'/>, look at <r:foo do='title'/>: <r:foo do='pages in project' do='each' join=', ' do='title'/></r:node></r:void>"
-  res: "from a wiki with Zena, look at status title: Keeping things clean !, status title"
+  res: "from a wiki with Zena, look at status title: status title"
 
 nodes_in_site:
   src: "<r:nodes in='site' limit='3'><r:each join=', ' do='show' attr='title'/></r:nodes>"
@@ -289,7 +289,7 @@ projects:
 
 nodes:
   src: "<r:nodes in='project'><r:each join=', ' do='show' attr='title'/></r:nodes>"
-  res: "it's a lake, Keeping things clean !, Lake Tanganyika, parc opening, status title, water"
+  res: "it's a lake, Lake Tanganyika, parc opening, status title, water"
 
 menu_with_favorites:
   context:
@@ -363,7 +363,7 @@ where_not:
   context:
     node: 'cleanWater'
   src: "<r:nodes where='title ne \"status title\"' do='each' join=',' do='title'/>"
-  res: "it's a lake,Keeping things clean !,Lake Tanganyika,parc opening,water"
+  res: "it's a lake,Lake Tanganyika,parc opening,water"
 
 where_two_attributes:
   src: "<r:nodes where='log_at ne event_at' in='site' do='each' join=', ' do='title'/>"
@@ -424,7 +424,7 @@ find_count:
   context:
     node: 'cleanWater'
   src: "<div do='count(\"nodes\")'/>"
-  res: '<div>6</div>'
+  res: '<div>5</div>'
 
 same_name_as_class:
   # we create a relation with 'page' role from Letter.
@@ -464,6 +464,16 @@ array_count:
   src: "<r:pages in='site' do='count'/>"
   res: "16"
 
+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'\] %>/"
+  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\) %>/"
+  res: '<div><span>a wiki with Zena</span></div>'
+
 query_in_array:
   src: "<div do='posts' do='find(\"posts in site\")'/>"
   tem: "/Node\.do_find.*Node\.do_find"

data/test/integration/zafu_compiler/roles.yml

@@ -62,6 +62,18 @@ vclass_name:
   tem: "<% var1 = @node.virtual_class %><%= var1.name %>"
   res: "Letter"
 
+vclass_icon:
+  src: " <r:Letter do='icon'/>"
+  tem: "<% if var1 = VirtualClass[\"Letter\"] %> <%= var1.prop['icon'] %><% end %>"
+  res: " /images/page.png"
+
+vclass_img:
+  context:
+    node: letter
+  src: "<r:vclass do='img'/>"
+  tem: "<% var1 = @node.virtual_class %><img src='<%= var1.prop['icon'] %>'/>"
+  res: "<img src='/images/page.png'/>"
+
 vclass_roles:
   context:
     node: letter

data/test/integration/zafu_compiler/safe_definitions.yml

@@ -96,7 +96,7 @@ map_join:
     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"
+  res: "crocodiles,it's a lake,The lake we love,parc opening,status title,water"
 
 map_on_can_be_nil:
   context:

data/test/integration/zafu_compiler/urls.yml

@@ -129,7 +129,7 @@ link_anchor:
 
 link_anchor_title:
   old_src: "<r:link anchor='[name]'/>"
-  src: "<r:link anchor='#{title.urlencode}'/>"
+  src: "<r:link anchor='#{title.url_name}'/>"
   res: "<a href='#status-title'>status title</a>"
 
 link_anchor_in:
@@ -138,7 +138,7 @@ link_anchor_in:
 
 link_anchor_name_in:
   old_src: "<r:link anchor='[name]' in='parent'/>"
-  src: "<r:link anchor='#{title.urlencode}' href='parent'/>"
+  src: "<r:link anchor='#{title.url_name}' href='parent'/>"
   res: "<a href='/oo/projects-list/Clean-Water-project#status-title'>status title</a>"
 
 link_stored:
@@ -222,13 +222,21 @@ live_link_data_mode:
   res: "<h2><a id='_title30' href='/en/image30_pv.jpg?967816914293'>bird</a></h2>"
 
 url_with_lang:
+  context:
+    visitor: lion
   src: "window.location = \"<r:url lang='fr'/>\";"
-  res: "/\\?lang=fr/"
+  res: "/\?lang=fr/"
+
+url_with_prefix:
+  context:
+    visitor: lion
+  src: "window.location = \"<r:url prefix='fr'/>\";"
+  res: "/test.host/fr"
 
 link_in_list_context:
   src: "<div do='nodes in site'><r:link/></div>"
-  tem: "/zen_path\(var1.first\).*var1.first.prop\['title'\]/"
-  res: '/a href.*a wiki with Zena/'
+  tem: "/zen_path\(@node\).*@node.prop\['title'\]/"
+  res: '/a href.*page22.html.*status title/'
 
 link_trans:
   src: "<r:link t='img_next_page'/>"

data/test/integration/zafu_compiler/version.yml

@@ -45,3 +45,9 @@ created_at:
 updated_at:
   src: "<p do='show' eval='v.updated_at' format='%d %b %y'/>"
   res: "<p>11 Apr 06</p>"
+
+versions:
+  context:
+    node: 'opening'
+  src: "<r:versions do='each' join=', '>[<r:updated_at format='%Y-%m-%d'/>/<r:author do='title'/>/<r:lang/>] <r:title/></r:versions>"
+  res: "[2006-04-16/Panthera Tigris Sumatran/fr] super ouverture, [2006-04-15/Panthera Tigris Sumatran/en] parc opening, [2006-04-11/Solenopsis Invicta/fr] ouverture du parc"

data/test/integration/zafu_compiler/zafu_attributes.yml

@@ -134,11 +134,11 @@ on_if_on_each:
   # We use 'this' to make sure we are not in a list context.
   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>"
+  res: "<p class=''>crocodiles</p><p class=' on'>status title</p>"
 
 on_if_ancestor:
   src: "<r:root><r:pages><li do='each' on_if='is_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>"
+  res: "<li class='hello'>Collections</li>, <li class='hello'>Kill the bugs</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>"
@@ -151,7 +151,7 @@ test_negative_value:
 
 anchor_attribute:
   # Use to_s so that the method executed replaces the dummy text.
-  src: "<p do='id.to_s' anchor='#{title.urlencode}'>hello</p>"
+  src: "<p do='id.to_s' anchor='#{title.url_name}'>hello</p>"
   res: "<a class='anchor' name='status-title'></a><p>22</p>"
 
 anchor_true:
@@ -167,7 +167,7 @@ anchor_in_link:
   res: "<a class='xx' href='#node22'>status title</a>"
 
 anchor_tag:
-  src: "<r:anchor/> <r:anchor anchor='#{title.urlencode}'/>"
+  src: "<r:anchor/> <r:anchor anchor='#{title.url_name}'/>"
   res: "<a class='anchor' name='node22'></a> <a class='anchor' name='status-title'></a>"
 
 live_with_show:

data/test/integration/zafu_compiler_test.rb

@@ -35,6 +35,7 @@ class ZafuCompilerTest < Zena::Controller::TestCase
     'meta',
     'context',
     'comments',
+    'eval',
   ]
 
   BUG = [
@@ -42,7 +43,6 @@ class ZafuCompilerTest < Zena::Controller::TestCase
     'basic',
     'complex',
     'data',
-    'eval',
     'complex',
   ]
 

data/test/selenium.readme

@@ -0,0 +1,8 @@
+In order to run these tests, you must install the selenium on rails plugin, start the server and visit the selenium test page or run the rake task:
+
+1. script/plugin http://svn.openqa.org/svn/selenium-on-rails/stable/selenium-on-rails
+2. zena test_server
+3. launch tests with
+  $ rake test:acceptance
+  or by visiting
+  http://test.host:3000/selenium

data/test/selenium/Add/0setup.rsel

@@ -0,0 +1,12 @@
+# See also the RDoc for SeleniumOnRails::TestBuilder.
+# View result in browser: http://test.host:3000/selenium
+
+setup :fixtures => :all
+
+# Setup code
+open '/login'
+type 'user_login', 'lion'
+type 'password', 'lion'
+click_and_wait 'commit'
+click_and_wait 'link=Kill the bugs'
+verify_text '_title37', 'Kill the bugs'

data/test/selenium/Add/add1.rsel

@@ -0,0 +1,22 @@
+# Add first element
+open '/oo/testnode37.html?test=add1'
+assert_not_visible 'add11_title'
+click 'css=img[alt=add]'
+assert_visible 'add11_title'
+type 'add11_title', 'add1'
+click 'css=input[type=submit]'
+wait_for_not_visible 'add11_title'
+verify_text 'css=.add1 a', 'add1'
+# should have correct parent
+verify_text 'css=.add1 span', 'Kill the bugs'
+
+# Add a second element
+assert_not_visible 'add11_title'
+click 'css=img[alt=add]'
+assert_visible 'add11_title'
+type 'add11_title', 'add1_2'
+click 'css=input[type=submit]'
+wait_for_not_visible 'add11_title'
+verify_text 'css=.add1_2 a', 'add1_2'
+# should have correct parent
+verify_text 'css=.add1_2 span', 'Kill the bugs'

data/test/selenium/Add/add2.rsel

@@ -0,0 +1,22 @@
+# Add first element
+open '/oo/testnode37.html?test=add2'
+assert_not_visible 'add21_title'
+click 'css=img[alt=add]'
+assert_visible 'add21_title'
+type 'add21_title', 'add2'
+click 'css=input[type=submit]'
+wait_for_not_visible 'add21_title'
+verify_text 'css=.add2 a', 'add2'
+# should have set parent
+verify_text 'css=.add2 span', 'Zena the wild CMS'
+
+# Add a second element
+assert_not_visible 'add21_title'
+click 'css=img[alt=add]'
+assert_visible 'add21_title'
+type 'add21_title', 'add2_2'
+click 'css=input[type=submit]'
+wait_for_not_visible 'add21_title'
+verify_text 'css=.add2_2 a', 'add2_2'
+# should have set parent
+verify_text 'css=.add2_2 span', 'Zena the wild CMS'

data/test/selenium/Add/add3.rsel

@@ -0,0 +1,22 @@
+# Add first element
+open '/oo/testnode37.html?test=add3'
+assert_not_visible 'add31_title'
+click 'css=img[alt=add]'
+assert_visible 'add31_title'
+type 'add31_title', 'add3'
+click 'css=input[type=submit]'
+wait_for_not_visible 'add31_title'
+verify_text 'css=.add3 a', 'add3'
+# should have correct parent
+verify_text 'css=.add3 span', 'Kill the bugs'
+
+# Add a second element
+assert_not_visible 'add31_title'
+click 'css=img[alt=add]'
+assert_visible 'add31_title'
+type 'add31_title', 'add3_2'
+click 'css=input[type=submit]'
+wait_for_not_visible 'add31_title'
+verify_text 'css=.add3_2 a', 'add3_2'
+# should have correct parent
+verify_text 'css=.add3_2 span', 'Kill the bugs'