zena 1.0.0.rc2 → 1.0.0.rc3

data/test/integration/zafu_compiler/urls.yml

@@ -22,10 +22,22 @@ url_with_param:
   src: "<p do='eval'>url(parent)</p>"
   res: "<p>http://test.host/oo/projects-list/Clean-Water-project</p>"
 
+url_with_hash:
+  src: "<p do='url(this, :mode => \"foo\")'/>"
+  res: "/page22_foo.html/"
+
+r_url_with_hash:
+  src: "<r:url mode='back' f='x'/>"
+  res: "/page22_back.html\?f=x/"
+
 path:
   src: "<a href='#{path}'>blah</a>"
   res: "<a href='/oo/projects-list/Clean-Water-project/page22.html'>blah</a>"
 
+path_with_mode:
+  src: "<a href='#{path(this, :mode =&gt; \"foo\")}'>blah</a>"
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22_foo.html'>blah</a>"
+
 link:
   src: "<r:link/>"
   tem: "<a href='<%= zen_path(@node) %>'><%= @node.prop['title'] %></a>"
@@ -62,6 +74,10 @@ link_set_class:
   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_set_title:
+  src: "<r:link title='#{title}_foo'/>"
+  res: "<a title='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>"
@@ -138,17 +154,21 @@ link_href_string_with_anchor:
   src: "<r:link href='\"yop\"' anchor='zoom'>"
   res: "<a href='yop#zoom'>status title</a>"
 
-link_href_node:
+link_href_find:
   src: "<r:link href='find(30)'/>"
   res: "<a href='/oo/image30.html'>status title</a>"
 
+link_href_node:
+  src: "<r:nodes in='site'><r:link href='@node' eval='@node.title'/></r:nodes>"
+  res: "/.*page22.html'>status title</a>/"
+
 link_date:
   context:
     ref_date: '2008-06-27'
   old_src: "<r:link date='current_date'/>"
-  src: "<r:link date='#{main_date}'/>"
-  tem: '/:date => "#\{main_date\}"'
-  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html?date=2008-06-27T00%3A00%3A00%2B00%3A00'>status title</a>"
+  src: "<r:link date='#{date.strftime(\"%Y-%m-%d\")}'/>"
+  tem: '/main_date/'
+  res: "<a href='/oo/projects-list/Clean-Water-project/page22.html?date=2008-06-27'>status title</a>"
 
 link_url_params:
   src: "<r:link plob='hopla'/>"
@@ -196,4 +216,54 @@ live_link_data_mode:
     node: 'bird_jpg'
   old_src: "<h2 do='title' link='pv.data'>super title</h2>"
   src: "<h2 do='link' live='true' mode='pv' format='data'/>"
-  res: "<h2><a id='_title30' href='/en/image30_pv.jpg?967816914293'>bird</a></h2>"
+  res: "<h2><a id='_title30' href='/en/image30_pv.jpg?967816914293'>bird</a></h2>"
+
+url_with_lang:
+  src: "window.location = \"<r:url lang='fr'/>\";"
+  res: "/\\?lang=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/'
+
+link_trans:
+  src: "<r:link t='img_next_page'/>"
+  res: "/a href.*/images/control_fastforward.png/"
+
+link_date_complex:
+  context:
+    ref_date: '2011-04-22 22:00'
+  src: "<r:link date='#{date.advance(:months =&gt; -1).strftime(\"%Y-%m-%d\", \"Asia/Jakarta\")}' text='PREV'/>"
+  # Date is in Asia/Jakarta timezone. Ref date is utc in tests.
+  res: "/\?date=2011-03-23'>PREV/"
+
+target_blank:
+  src: "<r:link mode='foo' target='_blank'/>"
+  res: "/<a target='_blank' href='/"
+
+action_destroy:
+  src: "<r:link action='destroy'/>"
+  res: "<a data-confirm='Destroy ? \"status title\"' href='/nodes/22' onclick='return Zena.m(this,\"delete\")'>status title</a>"
+
+action_publish:
+  src: "<r:link action='publish'/>"
+  res: "<a href='/nodes/22/versions/0/publish' onclick='return Zena.m(this,\"put\")'>status title</a>"
+
+action_edit:
+  src: "<r:link action='publish'/>"
+  res: "<a href='/nodes/22/versions/0/publish' onclick='return Zena.m(this,\"put\")'>status title</a>"
+
+action_add_doc:
+  src: "<r:link action='add_doc'/>"
+  res: "<a href='/documents/new?parent_id=22'>status title</a>"
+
+action_drive:
+  src: "<r:link action='drive'/>"
+  res: "<a href='/nodes/22/edit'>status title</a>"
+
+action_confirm:
+  src: "<r:link confirm='really go away ?'/>"
+  res: "<a data-confirm='really go away ?' href='/oo/projects-list/Clean-Water-project/page22.html' onclick='return Zena.m(this,\"get\")'>status title</a>"
+
+# update with insert tested in rendering_test.

data/test/integration/zafu_compiler/version.yml

@@ -39,9 +39,9 @@ author:
   res: "en:Tigris Sumatran, fr:Invicta"
 
 created_at:
-  src: "<p do='show' date='v.created_at' format='%d %b %y'/>"
+  src: "<p do='v.created_at' format='%d %b %y'/>"
   res: "<p>10 Mar 06</p>"
 
 updated_at:
-  src: "<p do='show' date='v.updated_at' format='%d %b %y'/>"
+  src: "<p do='show' eval='v.updated_at' format='%d %b %y'/>"
   res: "<p>11 Apr 06</p>"

data/test/integration/zafu_compiler/zafu_attributes.yml

@@ -45,6 +45,10 @@ show_title_with_actions_without_prefix:
   src: "<h1 do='title' live='true' actions='all'/>"
   tem: "/class='s<%= @node.version.status %>/"
 
+show_link_with_actions:
+  src: "<h1 do='link' do='title' live='true' actions='all'/>"
+  tem: "/class='s<%= @node.version.status %>/"
+
 node_actions_status_prefix_false:
   src: "<h1 do='title' actions='all' status='false'/>"
   tem: "!/class='s<%= @node.version.status %>/"
@@ -133,7 +137,7 @@ on_if_on_each:
   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='title'/></r:pages></r:root>"
+  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>"
 
 on_if_empty:

data/test/integration/zafu_compiler/zazen.yml

@@ -35,6 +35,10 @@ at_code:
   tem: "<%= zazen(\"Try this: @ruby|puts 'Hello'@ or this @zafu|<r:link/>@\") %>"
   res: "<p>Try this: <code class='ruby'><span class=\"ident\">puts</span> <span class=\"punct\">'</span><span class=\"string\">Hello</span><span class=\"punct\">'</span></code> or this <code class='zafu'><span class=\"tag\">&lt;r:</span><span class=\"ztag\">link</span><span class=\"tag\">/&gt;</span></code></p>"
 
+code_sqliss:
+  tem: "<%= zazen('foo: @sqliss|contact in project@.') %>"
+  res: "/<span class=\"context\">in</span>/"
+
 spaces_on_first_lines:
   tem: "<%= zazen(\"This is a normal paragraphe. There are many phrases in this paragraphe and a forced line break\nhere. End of first paragraphe.\n\n This second paragraphe\n is space preserving\n la la           la la.\") %>"
   res: "<p>This is a normal paragraphe. There are many phrases in this paragraphe and a forced line break\n<br/>here. End of first paragraphe.</p>\n\n\n<pre>This second paragraphe\nis space preserving\nla la           la la.</pre>"
@@ -44,27 +48,31 @@ line_break_list:
   res: "/<p>first.<\/p>.*<ul>.*<li>one.*<li>two.*<p>second/"
 
 zip_shortcut_link:
-  tem: "<%= zazen('Look \"here\"::lake or \"\"::lake+') %>"
+  tem: "<%= zazen('Look \"here\"::lake+ or \"\"::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/"
 
+data_on_obj:
+  tem: "<%= zazen('Look \"here\":22.data') %>"
+  res: "/page22.html/"
+
 zip_shortcut_link_with_mode_format:
-  tem: "<%= zazen('Look \"here\"::lake_life.rss, \"\"::lake+_life.data.') %>"
+  tem: "<%= zazen('Look \"here\"::lake+_life.rss, \"\"::lake_life.data.') %>"
   res: "/<p>Look <a href.*contact23_life.rss.*projects list/Clean Water project/Lake Tanganyika_life.rss</a>, <a href=.*image24_life.jpg.*projects list/Clean Water project/it&#8217;s a lake_life.jpg</a>./"
 
 zip_shortcut_image:
-  tem: "<%= zazen('Look !:lake! or !:lake+!') %>"
+  tem: "<%= zazen('Look !:lake+! or !:lake!') %>"
   res: "/<p>Look \[projects list/Clean Water project/Lake Tanganyika is not a document\] or <img src=.*image24_std.jpg/"
 
 zip_shortcut_image_with_options:
-  tem: "<%= zazen('Look !<.:lake_med! or !=.:lake+_pv!') %>"
+  tem: "<%= zazen('Look !<.:lake+_med! or !=.:lake_pv!') %>"
   res: "/<p>Look \[projects list/Clean Water project/Lake Tanganyika is not a document\] or .*center.*<img src=.*image24_pv.jpg/"
 
 zip_shortcut_gallery:
-  tem: "<%= zazen('Look ![30,:lake+]!') %>"
+  tem: "<%= zazen('Look ![30,:lake]!') %>"
   res: "/gallery.*image30_pv.*image24_pv.*/"
 
 zip_shortcut_list:
-  tem: "<%= zazen('Look !{30,:lake+}!') %>"
+  tem: "<%= zazen('Look !{30,:lake}!') %>"
   res: "/docs.*image30_mini.*image24_mini.*/"
 
 line_break_between_paragraphs:

data/test/integration/zafu_compiler_test.rb

@@ -6,7 +6,7 @@ class ZafuCompilerTest < Zena::Controller::TestCase
     'action',
     'asset',
     'conditional',
-#    'calendar',
+    'calendar',
     'dates',
     'display',
     'errors',
@@ -21,6 +21,7 @@ class ZafuCompilerTest < Zena::Controller::TestCase
     'search',
     'site',
     'tags',      # bricks/tags/zena/test/zafu
+    'worker',    # bricks/worker/zena/test/zafu
     'urls',
     'user',
     'version',
@@ -31,6 +32,9 @@ class ZafuCompilerTest < Zena::Controller::TestCase
     'ajax',
     'complex_ok',
     'forms',
+    'meta',
+    'context',
+    'comments',
   ]
 
   BUG = [

data/test/sites/complex/columns.yml

@@ -0,0 +1,5 @@
+Priority_priority:
+  ptype:           integer
+
+Priority_last_date:
+  ptype:           datetime

data/test/sites/complex/roles.yml

@@ -3,6 +3,10 @@ DEFAULTS:
   icon:            ""
   type:            VirtualClass
 
+Priority:
+  type:            Role
+  kpath:           N
+  
 Reference:
   kpath:           NR
   real_class:      Node

data/test/sites/zena/nodes.yml

@@ -84,6 +84,8 @@ proposition:
   class:           Post
   parent:          secret
   user:            ant
+  idx_datetime1:   2006-03-15
+  # FIXME: remove log_at and event_at
   event_at:        2006-04-05
   log_at:          2006-04-05
 
@@ -128,6 +130,8 @@ opening:
   class:           Post
   parent:          cleanWater
   ref_lang:        fr
+  idx_datetime1:   2006-03-15
+  # FIXME: remove 'log_at' and 'event_at'
   log_at:          2006-03-15
   event_at:        2006-03-18 15:00
 
@@ -269,10 +273,17 @@ Node_search_zafu:
   class:           Template
   parent:          default
 
+img:
+  class:           Page
+  parent:          default
+  v_lang:          en
+  v_prop:
+    title:         img
+
 style_css:
   zip:             53
   class:           TextDocument
-  parent:          default
+  parent:          img
 
 Node_zafu:
   class:           Template
@@ -312,4 +323,4 @@ Node_login_zafu:
 
 translations:
   class:           TextDocument
-  parent:          default
+  parent:          img

data/test/sites/zena/roles.yml

@@ -20,14 +20,15 @@ Post:
 Reference:
   kpath:           NR
   real_class:      Node
-  idx_scope:       "{'reference' => 'references'}"
+  prop:
+    idx_scope:     "{'reference' => 'references'}"
 
 Contact:
   kpath:           NRC
   real_class:      Node
-  idx_scope:       "{'reference' => 'references', 'contact' => 'project'}"
   prop:
     prop_eval:     "{'title' => \"#{first_name} #{name}\"}"
+    idx_scope:     "{'reference' => 'references', 'contact' => 'project'}"
 
 Tracker:
   kpath:           NPA
@@ -37,7 +38,8 @@ Tracker:
 Tag:
   kpath:           NPT
   real_class:      Page
-  idx_scope:       "{'tag' => %w{project self}}"
+  prop:
+    idx_scope:     "{'tag' => %w{project self}}"
 
 Task:
   kpath:           N
@@ -47,8 +49,14 @@ Original:
   kpath:           N
   type:            Role
 
+Comment:
+  kpath:           N
+  type:            Role
+
 Blog:
   kpath:           NPPB
   real_class:      Project
-  idx_class:       IdxProject
-  idx_scope:       "{'blog' => 'self'}"
+  prop:
+    idx_class:       IdxProject
+    idx_scope:       "{'blog' => 'self'}"
+    idx_reverse_scope: "nodes in project"

data/test/sites/zena/versions.yml

@@ -259,7 +259,7 @@ opening_fr:
   prop:
     comment:       french opening
     title:         ouverture du parc
-    date:          2011-01-16
+    date:          2006-03-15
 
 bananas_en:
   node:            bananas
@@ -350,7 +350,7 @@ opening_en:
   number:          2
   prop:
     title:         parc opening
-    date:          2011-01-16
+    date:          2006-03-15
     text:          |
       We are glad to announce the opening of our new project !
       
@@ -364,7 +364,7 @@ opening_red_fr:
   status:          red
   number:          3
   prop:
-    date:          2011-01-16
+    date:          2006-03-15
     comment:       new redaction for opening
     title:         super ouverture
 
@@ -571,7 +571,7 @@ Node_search_zafu_en:
   node:            Node_search_zafu
   user:            tiger
   prop:
-    text:          "[FILE:app/views/zafu/default/Node-+search.zafu]"
+    text:          "[FILE:db/init/base/skins/default/Node-+search.zafu]"
     format:        html
     tkpath:        N
     mode:          "+search"
@@ -581,7 +581,7 @@ style_css_en:
   node:            style_css
   user:            tiger
   prop:
-    text:          "[FILE:db/init/base/skins/default/style.css]"
+    text:          "[FILE:db/init/base/skins/default/img/style.css]"
     title:         style
     content_type:  text/css
     ext:           css
@@ -591,11 +591,13 @@ Node_zafu_en:
   node:            Node_zafu
   user:            tiger
   prop:
-    text:          "[FILE:app/views/zafu/default/Node.zafu]"
+    text:          "[FILE:db/init/base/skins/default/Node.zafu]"
     title:         Node
     format:        html
     tkpath:        N
     target_klass:  Node
+    content_type:  text/zafu
+    ext:           zafu
 
 Node_admin_layout_zafu_en:
   node:            Node_admin_layout_zafu
@@ -607,6 +609,8 @@ Node_admin_layout_zafu_en:
     tkpath:        N
     mode:          "+adminLayout"
     target_klass:  Node
+    content_type:  text/zafu
+    ext:           zafu
 
 Node_index_zafu_en:
   node:            Node_index_zafu
@@ -618,28 +622,34 @@ Node_index_zafu_en:
     tkpath:        N
     mode:          "+index"
     target_klass:  Node
+    content_type:  text/zafu
+    ext:           zafu
 
 Node_not_found_zafu_en:
   node:            Node_not_found_zafu
   user:            tiger
   prop:
-    text:          "[FILE:app/views/zafu/default/Node-+notFound.zafu]"
+    text:          "[FILE:db/init/base/skins/default/Node-+notFound.zafu]"
     title:         Node-+notFound
     format:        html
     tkpath:        N
     mode:          "+notFound"
     target_klass:  Node
+    content_type:  text/zafu
+    ext:           zafu
 
 Node_popup_layout_zafu_en:
   node:            Node_popup_layout_zafu
   user:            tiger
   prop:
-    text:          "[FILE:app/views/zafu/default/Node-+popupLayout.zafu]"
+    text:          "[FILE:db/init/base/skins/default/Node-+popupLayout.zafu]"
     title:         Node-+popupLayout
     format:        html
     tkpath:        N
     mode:          "+popupLayout"
     target_klass:  Node
+    content_type:  text/zafu
+    ext:           zafu
 
 Node_test_en:
   node:            Node_test_zafu
@@ -651,6 +661,8 @@ Node_test_en:
     tkpath:        N
     mode:          test
     target_klass:  Node
+    content_type:  text/zafu
+    ext:           zafu
 
 notes_zafu_en:
   node:            notes_zafu
@@ -659,6 +671,8 @@ notes_zafu_en:
     text:          "[FILE:db/init/base/skins/default/notes.zafu]"
     title:         notes
     format:        html
+    content_type:  text/zafu
+    ext:           zafu
 
 Project_zafu_en:
   node:            Project_zafu
@@ -669,17 +683,21 @@ Project_zafu_en:
     format:        html
     tkpath:        NPP
     target_klass:  Project
+    content_type:  text/zafu
+    ext:           zafu
 
 Node_login_zafu_en:
   node:            Node_login_zafu
   user:            tiger
   prop:
-    text:          "[FILE:app/views/zafu/default/Node-+login.zafu]"
+    text:          "[FILE:db/init/base/skins/default/Node-+login.zafu]"
     title:         Node-+login
     format:        html
     tkpath:        N
     mode:          "+login"
     target_klass:  Node
+    content_type:  text/zafu
+    ext:           zafu
 
 translations_de:
   node:            translations

data/test/unit/column_test.rb

@@ -66,36 +66,82 @@ class ColumnTest < Zena::Unit::TestCase
         Column.create(:role_id => roles_id(:Task), :ptype => 'string', :name => 'secure_on_destroy')
       end
 
-      should 'fail with an error and return class' do
+      should 'fail with an error' do
         assert_difference('Column.count', 0) do
           assert_equal 'invalid (method defined in Node)', subject.errors[:name]
         end
       end
     end # with the name of a hardwire property
-    
+
     context 'ending with _ids' do
       subject do
         Column.create(:role_id => roles_id(:Task), :ptype => 'string', :name => 'secure_on_destroy_ids')
       end
 
-      should 'fail with an error and return class' do
+      should 'fail with an error' do
         assert_difference('Column.count', 0) do
           assert_equal 'invalid (cannot end with _id or _ids)', subject.errors[:name]
         end
       end
     end # with the name of a hardwire property
-    
+
     context 'ending with _id' do
       subject do
         Column.create(:role_id => roles_id(:Task), :ptype => 'string', :name => 'secure_on_destroy_id')
       end
 
-      should 'fail with an error and return class' do
+      should 'fail with an error' do
         assert_difference('Column.count', 0) do
           assert_equal 'invalid (cannot end with _id or _ids)', subject.errors[:name]
         end
       end
     end # with the name of a hardwire property
+
+    context 'with an invalid ptype' do
+      subject do
+        Column.create(:role_id => roles_id(:Task), :ptype => 'stringlitch', :name => 'dummy')
+      end
+
+      should 'fail with an error' do
+        assert_difference('Column.count', 0) do
+          assert_equal 'invalid', subject.errors[:ptype]
+        end
+      end
+    end # with an invalid ptype
+    
+    context 'with an invalid index' do
+      subject do
+        Column.create(
+          :role_id => roles_id(:Task),
+          :ptype   => 'string',
+          :index   => 'bad',
+          :name    => 'dummy'
+        )
+      end
+
+      should 'fail with an error' do
+        assert_difference('Column.count', 0) do
+          assert_equal 'invalid', subject.errors[:index]
+        end
+      end
+    end # with an invalid index
+
   end # Creating a column
 
+  context 'exporting a column' do
+    setup do
+      login(:lion)
+    end
+
+    subject do
+      columns(:Post_date)
+    end
+
+    should 'export attributes' do
+      assert_equal({
+        'ptype'      => 'datetime',
+        'index'      => '.idx_datetime1',
+      }, subject.export)
+    end
+ end # exporting a role
 end

data/test/unit/iformat_test.rb

@@ -47,10 +47,10 @@ class IformatTest < Zena::Unit::TestCase
 
   def test_list
     login(:lion)
-    assert_equal %w{tiny mini pv square low top med side edit std full}, Iformat.list.map{|h| h[:name]}
+    assert_equal %w{tiny tipop mini pv square low top med side edit std full}, Iformat.list.map{|h| h[:name]}
 
     login(:whale)
-    assert_equal %w{tiny mini pv square low med top side header edit std full}, Iformat.list.map{|h| h[:name]}
+    assert_equal %w{tiny tipop mini pv square low med top side header edit std full}, Iformat.list.map{|h| h[:name]}
   end
 
   def test_mem_cached