zena 1.0.0.beta3 → 1.0.0.rc1

data/test/unit/zena/use/urls_test.rb

@@ -3,6 +3,8 @@ require 'test_helper'
 class UrlsTest < Zena::View::TestCase
   include Zena::Use::Urls::ViewMethods
 
+  attr_reader :params
+
   def test_zen_path
     login(:ant)
     node = secure!(Node) { nodes(:zena) }
@@ -18,11 +20,19 @@ class UrlsTest < Zena::View::TestCase
     assert_equal '/en/section12_test.html', zen_path(node, :mode=>'test')
     assert_match %r{/tt/section12_test.jpg}, zen_path(node, :mode=>'test', :prefix=>'tt', :format=>'jpg')
     node = secure!(Node) { nodes(:cleanWater) }
-    assert_equal '/en/projects/cleanWater', zen_path(node)
-    assert_equal '/en/projects/cleanWater_test', zen_path(node, :mode=>'test')
+    assert_equal '/en/projects-list/Clean-Water-project', zen_path(node)
+    assert_equal '/en/projects-list/Clean-Water-project_test', zen_path(node, :mode=>'test')
+    node = secure!(Node) { nodes(:status) }
+    assert_equal '/en/projects-list/Clean-Water-project/page22.html', zen_path(node)
+    assert_equal '/en/projects-list/Clean-Water-project/page22_test.html', zen_path(node, :mode=>'test')
+  end
+
+  def test_zen_path_query_params
+    login(:anon)
     node = secure!(Node) { nodes(:status) }
-    assert_equal '/en/projects/cleanWater/page22.html', zen_path(node)
-    assert_equal '/en/projects/cleanWater/page22_test.html', zen_path(node, :mode=>'test')
+    assert_equal '/en/projects-list/Clean-Water-project/page22.html?p=5', zen_path(node, :p => 5)
+    @params = {'p' => 'Pepe', 'a' => {'b' => 'Bee'}}
+    assert_equal '/en/projects-list/Clean-Water-project/page22.html?a%5Bb%5D=Bee&p=Pepe', zen_path(node, :encode_params => 'p,a')
   end
 
   def test_zen_path_cache_stamp
@@ -36,7 +46,7 @@ class UrlsTest < Zena::View::TestCase
 
     login(:anon)
     node = secure!(Node) { nodes(:cleanWater) }
-    assert_equal '/en/projects/cleanWater.jpg', zen_path(node, :format => 'jpg')
+    assert_equal '/en/projects-list/Clean-Water-project.jpg', zen_path(node, :format => 'jpg')
   end
 
   def test_make_cachestamp
@@ -84,9 +94,9 @@ class UrlsTest < Zena::View::TestCase
     assert_equal "/en/section12.kls.html", zen_path(node, :asset=>'kls')
     assert_equal "/tt/section12.foo.jpg?1144713600", zen_path(node, :mode=>'test', :prefix=>'tt', :format=>'jpg', :asset => 'foo')
     node = secure!(Node) { nodes(:cleanWater) }
-    assert_equal "/en/projects/cleanWater.kls", zen_path(node, :asset => 'kls')
+    assert_equal "/en/projects-list/Clean-Water-project.kls", zen_path(node, :asset => 'kls')
     node = secure!(Node) { nodes(:status) }
-    assert_equal "/en/projects/cleanWater/page22.abcd.png?1144713600", zen_path(node, :asset => 'abcd', :format => 'png')
+    assert_equal "/en/projects-list/Clean-Water-project/page22.abcd.png?1144713600", zen_path(node, :asset => 'abcd', :format => 'png')
   end
 
   def test_zen_url
@@ -99,15 +109,15 @@ class UrlsTest < Zena::View::TestCase
   def test_data_path_for_public_documents
     login(:ant)
     node = secure!(Node) { nodes(:water_pdf) }
-    assert_equal "/en/projects/cleanWater/document25.pdf", data_path(node)
+    assert_equal "/en/projects-list/Clean-Water-project/document25.pdf", data_path(node)
     node = secure!(Node) { nodes(:status) }
-    assert_equal "/oo/projects/cleanWater/page22.html", data_path(node)
+    assert_equal "/oo/projects-list/Clean-Water-project/page22.html", data_path(node)
 
     login(:anon)
     node = secure!(Node) { nodes(:water_pdf) }
-    assert_equal "/en/projects/cleanWater/document25.pdf", data_path(node)
+    assert_equal "/en/projects-list/Clean-Water-project/document25.pdf", data_path(node)
     node = secure!(Node) { nodes(:status) }
-    assert_equal "/en/projects/cleanWater/page22.html", data_path(node)
+    assert_equal "/en/projects-list/Clean-Water-project/page22.html", data_path(node)
   end
 
   def test_data_path_for_non_public_documents
@@ -115,9 +125,9 @@ class UrlsTest < Zena::View::TestCase
     node = secure!(Node) { nodes(:water_pdf) }
     assert node.update_attributes( :rgroup_id => groups_id(:workers), :inherit => 0 )
     assert !node.public?
-    assert_equal "/oo/projects/cleanWater/document25.pdf", data_path(node)
+    assert_equal "/oo/projects-list/Clean-Water-project/document25.pdf", data_path(node)
     node = secure!(Node) { nodes(:status) }
-    assert_equal "/oo/projects/cleanWater/page22.html", data_path(node)
+    assert_equal "/oo/projects-list/Clean-Water-project/page22.html", data_path(node)
 
     login(:anon)
     assert_raise(ActiveRecord::RecordNotFound) { secure!(Node) { nodes(:water_pdf) } }

data/test/unit/zena/use/version_hash_test.rb

@@ -41,7 +41,7 @@ class VersionHashTest < Zena::Unit::TestCase
     setup do
       login(:tiger)
       visitor.lang = 'de'
-      @attributes = {'title' => 'Tigris Tigris'}
+      @attributes = {'name' => 'Tigris'}
     end
 
     subject do
@@ -66,7 +66,7 @@ class VersionHashTest < Zena::Unit::TestCase
 
     context 'with auto publish' do
       setup do
-        @attributes = {'title' => 'Tigris Tigris', :v_status => Zena::Status[:pub]}
+        @attributes = {'name' => 'Tigris Tigris', :v_status => Zena::Status[:pub]}
       end
 
       should 'set a readers and writers entry for the current lang' do

data/test/unit/zena/use/zafu_template_test.rb

@@ -10,7 +10,8 @@ class ZafuTemplateTest < Zena::View::TestCase
 
     should 'receive page_numbers' do
       s = ""
-      page_numbers(2, 3, ',') {|p,j| s << "#{j}#{p}"}
+      # page, join, display
+      page_numbers(2, 3, ',') {|p,j,d| s << "#{j}#{p}"}
       assert_equal "1,2,3", s
       s = ""
       page_numbers(2, 30, ',') {|p,j| s << "#{j}#{p}"}
@@ -19,8 +20,8 @@ class ZafuTemplateTest < Zena::View::TestCase
       page_numbers(14, 30, ',') {|p,j| s << "#{j}#{p}"}
       assert_equal "10,11,12,13,14,15,16,17,18,19", s
       s = ""
-      page_numbers(28, 30, ' | ') {|p,j| s << "#{j}#{p}"}
-      assert_equal "21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30", s
+      page_numbers(24, 30, ' | ', 6) {|p,j,d| s << "#{j}#{d}"}
+      assert_equal "… | 23 | 24 | 25 | 26 | …", s
     end
   end # Without a logged in user
 
@@ -31,7 +32,7 @@ class ZafuTemplateTest < Zena::View::TestCase
     end
 
     should 'find best template based on class' do
-      assert_match %r{default/Node}, @controller.send(:template_url)
+      assert_match %r{Default skin/Node}, @controller.send(:template_url)
     end
 
     context 'with an admin visitor' do
@@ -41,7 +42,7 @@ class ZafuTemplateTest < Zena::View::TestCase
 
       should 'use visitor chosen dev skin' do
         visitor.dev_skin_id = nodes_zip(:wikiSkin)
-        assert_match %r{/wikiSkin/Node}, @controller.send(:template_url)
+        assert_match %r{/wiki skin/Node}, @controller.send(:template_url)
       end
 
       should 'use rescue skin' do
@@ -51,9 +52,9 @@ class ZafuTemplateTest < Zena::View::TestCase
 
       should 'use any skin' do
         visitor.dev_skin_id = User::ANY_SKIN_ID
-        assert_match %r{/default/Node}, @controller.send(:template_url)
+        assert_match %r{/Default skin/Node}, @controller.send(:template_url)
         visiting(:wiki)
-        assert_match %r{/wikiSkin/Node}, @controller.send(:template_url)
+        assert_match %r{/wiki skin/Node}, @controller.send(:template_url)
       end
 
       should 'not insert dev_box for non html content' do
@@ -74,9 +75,21 @@ class ZafuTemplateTest < Zena::View::TestCase
 
       should 'not use visitor skin mode' do
         visitor.dev_skin_id = nodes_zip(:wikiSkin)
-        assert_match %r{/default/Node}, @controller.send(:template_url)
+        assert_match %r{/Default skin/Node}, @controller.send(:template_url)
       end
     end # without an admin visitor
+
+    context 'on get_template_text' do
+      should 'find template' do
+        assert_match %r{include template='Node'}, get_template_text('Project', nodes_id(:default)).first
+      end
+    end # on get_template_text
+
+    context 'on get_template_text with fullpath' do
+      should 'find template' do
+        assert_match %r{include template='Node'}, get_template_text('/Default skin/Project').first
+      end
+    end # on get_template_text
     #def test_template_url_virtual_class
     #  without_files('zafu') do
     #    node = @controller.send(:secure,Node) { nodes(:opening) }

data/test/unit/zena/use/zazen_test.rb

@@ -17,9 +17,9 @@ class ZazenTest < Zena::View::TestCase
   end
 
   def test_image_title
-    assert_match %r{<div class='img_with_title'><img[^>]*><div class='img_title'><p>blah <a href=.*projects/cleanWater.*Clean Water.*/a></p></div></div>},
+    assert_match %r{<div class='img_with_title'><img[^>]*><div class='img_title'><p>blah <a href=.*projects-list/Clean-Water-project.*Clean Water.*/a></p></div></div>},
     zazen("!30/blah \"\":21!")
-    assert_match %r{<div class='img_with_title'><img.*class.*pv.*><div class='img_title'><p>blah <a href=.*projects/cleanWater.*Clean Water.*/a></p></div></div>},
+    assert_match %r{<div class='img_with_title'><img.*class.*pv.*><div class='img_title'><p>blah <a href=.*projects-list/Clean-Water-project.*Clean Water.*/a></p></div></div>},
     zazen("!30_pv/blah \"\":21!")
     assert_match %r{<div class='img_with_title'><img.*class.*std.*><div class='img_title'><p>Photo taken from.*</p></div></div>}, zazen("!30/!")
 
@@ -27,36 +27,36 @@ class ZazenTest < Zena::View::TestCase
 
   def test_make_link
     # * ["":34] creates a link to node 34 with node's title.
-    assert_equal '<p><a href="/en/projects/cleanWater">Clean Water project</a></p>', zazen('"":21')
+    assert_equal '<p><a href="/en/projects-list/Clean-Water-project">Clean Water project</a></p>', zazen('"":21')
     # * ["title":34] creates a link to node 34 with the given title.
-    assert_equal '<p><a href="/en/projects/cleanWater">hello</a></p>', zazen('"hello":21')
+    assert_equal '<p><a href="/en/projects-list/Clean-Water-project">hello</a></p>', zazen('"hello":21')
     # * ["":034] if the node id starts with '0', creates a popup link.
-    assert_match %r{/en/projects/cleanWater.*window.open.*hello}, zazen('"hello":021')
+    assert_match %r{/en/projects-list/Clean-Water-project.*window.open.*hello}, zazen('"hello":021')
   end
 
   def test_make_link_sharp
     assert_equal '<p><a href="#node34">hello</a></p>', zazen('"hello":34#')
     assert_equal '<p><a href="#node34">hello</a></p>', zazen('"hello":34#[id]')
     assert_equal '<p><a href="#node34">hello</a></p>', zazen('"hello":34#[zip]')
-    assert_equal '<p><a href="#news">hello</a></p>', zazen('"hello":34#[node_name]')
+    assert_equal '<p><a href="#News-list">hello</a></p>', zazen('"hello":34#[title]')
     # * ["":34#[parent/]] if the node id starts with '0', creates a popup link.
     assert_equal '<p><a href="/en/page32.html#node34">hello</a></p>', zazen('"hello":34#[parent/]')
     assert_equal '<p><a href="/en/page32.html#node34">hello</a></p>', zazen('"hello":34#[parent/id]')
     assert_equal '<p><a href="/en/page32.html#node34">hello</a></p>', zazen('"hello":34#[parent/zip]')
-    assert_equal '<p><a href="/en/page32.html#news">hello</a></p>', zazen('"hello":34#[parent/node_name]')
+    assert_equal '<p><a href="/en/page32.html#News-list">hello</a></p>', zazen('"hello":34#[parent/title]')
   end
 
   def test_make_image
     # * [!24!] inline image 24. (default format is 'pv' defined in #ImageBuilder). Options are :
-    assert_equal "<p><img src='/en/projects/cleanWater/image24_std.jpg?929831698949' width='545' height='400' alt='it&apos;s a lake' class='std'/></p>", zazen('!24!')
+    assert_equal "<p><img src='/en/projects-list/Clean-Water-project/image24_std.jpg?929831698949' width='545' height='400' alt='it&apos;s a lake' class='std'/></p>", zazen('!24!')
     # ** [!024!] inline image, default format, link to full image.
-    assert_equal "<p><a class='popup' href='/en/projects/cleanWater/image24.jpg?1144713600' target='_blank'><img src='/en/projects/cleanWater/image24_std.jpg?929831698949' width='545' height='400' alt='it&apos;s a lake' class='std'/></a></p>", zazen('!024!')
+    assert_equal "<p><a class='popup' href='/en/projects-list/Clean-Water-project/image24.jpg?1144713600' target='_blank'><img src='/en/projects-list/Clean-Water-project/image24_std.jpg?929831698949' width='545' height='400' alt='it&apos;s a lake' class='std'/></a></p>", zazen('!024!')
   end
 
   def test_make_image_with_document
-    assert_match %r{<p><a.*href=.*en/projects/cleanWater/document25\.pdf.*img src='/images/ext/pdf.png' width='32' height='32' alt='pdf document' class='doc'/></a></p>}, zazen('!25!')
-    assert_match %r{<p><a.*href=.*en/projects/cleanWater/document25\.pdf.*img src='/images/ext/pdf.png' width='32' height='32' alt='pdf document' class='doc'/></a></p>}, zazen('!025!') # same as '!25!'
-    assert_match %r{<p><a.*href=.*en/projects/cleanWater/document25\.pdf.*img src='/images/ext/pdf_pv.png' width='70' height='70' alt='pdf document' class='doc'/></a></p>}, zazen('!25_pv!')
+    assert_match %r{<p><a.*href=.*en/projects-list/Clean-Water-project/document25\.pdf.*img src='/images/ext/pdf.png' width='32' height='32' alt='pdf document' class='doc'/></a></p>}, zazen('!25!')
+    assert_match %r{<p><a.*href=.*en/projects-list/Clean-Water-project/document25\.pdf.*img src='/images/ext/pdf.png' width='32' height='32' alt='pdf document' class='doc'/></a></p>}, zazen('!025!') # same as '!25!'
+    assert_match %r{<p><a.*href=.*en/projects-list/Clean-Water-project/document25\.pdf.*img src='/images/ext/pdf_pv.png' width='70' height='70' alt='pdf document' class='doc'/></a></p>}, zazen('!25_pv!')
   end
 
   def test_make_bad_image
@@ -65,26 +65,26 @@ class ZazenTest < Zena::View::TestCase
 
   def test_make_image_align
     # ** [!<.24!] or [!<24!] inline image surrounded with <p class='float_left'></p>
-    assert_match %r{class='img_left'.*img.*/en/projects/cleanWater/image24_std.jpg.*class='std'}, zazen('!<.24!')
-    assert_match %r{class='img_left'.*img.*/en/projects/cleanWater/image24_std.jpg.*class='std'}, zazen('!<24!')
+    assert_match %r{class='img_left'.*img.*/en/projects-list/Clean-Water-project/image24_std.jpg.*class='std'}, zazen('!<.24!')
+    assert_match %r{class='img_left'.*img.*/en/projects-list/Clean-Water-project/image24_std.jpg.*class='std'}, zazen('!<24!')
     # ** [!>.24!] inline image surrounded with <p class='float_right'></p>
-    assert_match %r{class='img_right'.*img.*/en/projects/cleanWater/image24_std.jpg.*class='std'}, zazen('!>.24!')
-    assert_match %r{class='img_right'.*img.*/en/projects/cleanWater/image24_std.jpg.*class='std'}, zazen('!>24!')
+    assert_match %r{class='img_right'.*img.*/en/projects-list/Clean-Water-project/image24_std.jpg.*class='std'}, zazen('!>.24!')
+    assert_match %r{class='img_right'.*img.*/en/projects-list/Clean-Water-project/image24_std.jpg.*class='std'}, zazen('!>24!')
     # ** [!=.24!] inline image with <p class='center'></p>
-    assert_match %r{class='img_center'.*img.*/en/projects/cleanWater/image24_std.jpg.*class='std'}, zazen('!=.24!')
-    assert_match %r{class='img_center'.*img.*/en/projects/cleanWater/image24_std.jpg.*class='std'}, zazen('!=24!')
+    assert_match %r{class='img_center'.*img.*/en/projects-list/Clean-Water-project/image24_std.jpg.*class='std'}, zazen('!=.24!')
+    assert_match %r{class='img_center'.*img.*/en/projects-list/Clean-Water-project/image24_std.jpg.*class='std'}, zazen('!=24!')
   end
 
   def test_make_iformat
     # ** [!24_pv!] inline image transformed to format 'pv'. Formats are defined in #ImageBuilder.
-    assert_match %r{.*img.*/en/projects/cleanWater/image24.jpg.*600.*440.*class='full'}, zazen('!24_full!')
-    assert_match %r{.*img.*/en/projects/cleanWater/image24_tiny.jpg.*16.*16.*class='tiny'}, zazen('!24_tiny!')
+    assert_match %r{.*img.*/en/projects-list/Clean-Water-project/image24.jpg.*600.*440.*class='full'}, zazen('!24_full!')
+    assert_match %r{.*img.*/en/projects-list/Clean-Water-project/image24_tiny.jpg.*16.*16.*class='tiny'}, zazen('!24_tiny!')
   end
 
   def test_all_options
     # ** all the options above can be used together as in [!>.26.std!] : inline image on the right, size 'med'.
-    assert_match %r{class='img_right'.*img.*/en/projects/cleanWater/image24_mini.jpg.*32.*32.*class='mini'}, zazen('!>24_mini!')
-    assert_match %r{class='img_right'.*img.*/en/projects/cleanWater/image24_mini.jpg.*32.*32.*class='mini'}, zazen('!>.24_mini!')
+    assert_match %r{class='img_right'.*img.*/en/projects-list/Clean-Water-project/image24_mini.jpg.*32.*32.*class='mini'}, zazen('!>24_mini!')
+    assert_match %r{class='img_right'.*img.*/en/projects-list/Clean-Water-project/image24_mini.jpg.*32.*32.*class='mini'}, zazen('!>.24_mini!')
   end
 
   def test_make_gallery
@@ -117,13 +117,13 @@ class ZazenTest < Zena::View::TestCase
 
   def test_image_as_link
     # * [!26!:37] you can use an image as the source for a link
-    assert_zazen_match "p a[@href='/en/projects/cleanWater'] img.std[@src='/en/image30_std.jpg?929831698949'][@width='440'][@height='400']", '!30!:21'
+    assert_zazen_match "p a[@href='/en/projects-list/Clean-Water-project'] img.std[@src='/en/image30_std.jpg?929831698949'][@width='440'][@height='400']", '!30!:21'
     # * [!26!:www.example.com] use an image for an outgoing link
     assert_zazen_match "p a[@href='http://www.example.com'] img.std[@src='/en/image30_std.jpg?929831698949']", '!30!:http://www.example.com'
   end
 
   def test_full
-    assert_zazen_match "div.img_left a[@href='/en/projects/cleanWater'][@onclick*=window.open] img.std[@src='/en/projects/cleanWater/image24_std.jpg?929831698949'][@width='545'][@height='400'][@alt*=lake]", '!<.24_3!:021'
+    assert_zazen_match "div.img_left a[@href='/en/projects-list/Clean-Water-project'][@onclick*=window.open] img.std[@src='/en/projects-list/Clean-Water-project/image24_std.jpg?929831698949'][@width='545'][@height='400'][@alt*=lake]", '!<.24_3!:021'
   end
 
   def test_empty_image_ref
@@ -137,8 +137,8 @@ class ZazenTest < Zena::View::TestCase
   end
 
   def test_pseudo_id
-    assert_zazen_match "a[@href='/en/basecontact15.html'][text()='people/lion']", 'This is a "link"::lio.'
-    assert_zazen_match "a[@href='/en/image30_pv.jpg?967816914293'][text()='projects/wiki/bird_pv.jpg']", 'This is a "link"::bir_pv.data.'
+    assert_zazen_match "a[@href='/en/contact15.html'][text()='people/Panthera Leo Verneyi']", 'This is a "link"::lio.'
+    assert_zazen_match "a[@href='/en/image30_pv.jpg?967816914293'][text()='projects list/a wiki with Zena/bird_pv.jpg']", 'This is a "link"::bir_pv.data.'
   end
 
   context 'An absolute pseudo path' do
@@ -147,21 +147,21 @@ class ZazenTest < Zena::View::TestCase
     end
 
     subject do
-      '(/projects/wiki/bird)'
+      '(/projects list/a wiki with Zena/bird)'
     end
 
     should 'resolve as link without using the current node' do
-      assert_equal '<p>Read <a href="/en/image30.html">projects/wiki/bird</a></p>', zazen(%Q{Read "":#{subject}})
+      assert_equal '<p>Read <a href="/en/image30.html">projects list/a wiki with Zena/bird</a></p>', zazen(%Q{Read "":#{subject}})
     end
 
     should 'resolve as image without using the current node' do
-      assert_match %Q{img[@src='/en/image30_std.jpg?929831698949]}, zazen(%Q{See !#{subject}!})
+      assert_match %Q{img[@src='/en/image30_std.jpg?929831698949']}, zazen(%Q{See !#{subject}!})
     end
 
 
     context 'with mode' do
       subject do
-        '(/projects/wiki/bird)_side'
+        '(/projects list/a wiki with Zena/bird)_side'
       end
 
       should 'resolve with mode in image tag' do
@@ -177,7 +177,7 @@ class ZazenTest < Zena::View::TestCase
       end
 
       should 'resolve with mode as link and image tag' do
-        assert_equal "<p>See <a href=\"/en/image30_side.html\"><img src='/en/image30_side.jpg?100321116926' width='220' height='500' alt='bird' class='side'/></a></p>", zazen(%Q{See !:#{subject}!:#{subject}})
+        assert_equal "<p>See <a href=\"/en/image30_side.html\"><img src='/en/image30_side.jpg?100321116926' width='220' height='500' alt='bird' class='side'/></a></p>", zazen(%Q{See !#{subject}!:#{subject}})
       end
     end
   end # An absolute pseudo path
@@ -188,32 +188,32 @@ class ZazenTest < Zena::View::TestCase
     end
 
     subject do
-      '(status)'
+      '(status title)'
     end
 
     context 'with different current nodes' do
       setup do
-        lion = secure!(Node) { nodes(:lion) }
-        lion.update_attributes(:title => 'status', :v_status => Zena::Status[:pub])
-        @people = secure!(Node) { nodes(:people) }
-        @cleanWater = secure!(Node) { nodes(:cleanWater) }
+        art = secure!(Node) { nodes(:art) }
+        art.update_attributes(:title => 'status title', :v_status => Zena::Status[:pub])
+        @collections = secure!(Node) { nodes(:collections) }
+        @cleanWater  = secure!(Node) { nodes(:cleanWater) }
       end
 
       should 'resolve with current node' do
         @node = @cleanWater
-        assert_equal '<p>Read <a href="/oo/projects/cleanWater/page22.html">projects/cleanWater/status</a></p>', zazen(%Q{Read "":#{subject}})
-        @node = @people
-        assert_equal '<p>Read <a href="/oo/basecontact15.html">people/status</a></p>', zazen(%Q{Read "":#{subject}})
+        assert_equal '<p>Read <a href="/oo/projects-list/Clean-Water-project/page22.html">projects list/Clean Water project/status title</a></p>', zazen(%Q{Read "":#{subject}})
+        @node = @collections
+        assert_equal '<p>Read <a href="/oo/tag33.html">Collections/status title</a></p>', zazen(%Q{Read "":#{subject}})
       end
     end
   end # A relative pseudo path
 
   def test_pseudo_id_numbers_only
     login(:lion)
-    lion = secure!(Node) { nodes(:lion) }
-    assert lion.update_attributes(:title => '1234', :v_status => Zena::Status[:pub])
+    art = secure!(Node) { nodes(:art) }
+    assert art.update_attributes(:title => '1234', :v_status => Zena::Status[:pub])
     login(:anon)
-    assert_equal '<p>This is a <a href="/en/basecontact15.html">people/1234</a>.</p>', zazen('This is a "link"::123.')
+    assert_equal '<p>This is a <a href="/en/tag33.html">Collections/1234</a>.</p>', zazen('This is a "link"::123.')
   end
 
   def test_bad_pseudo_path
@@ -229,16 +229,16 @@ class ZazenTest < Zena::View::TestCase
     projects = secure!(Node) { nodes(:projects) }
     zena     = secure!(Node) { nodes(:zena) }
     assert_equal "This \"is\":33 \"a\":#{nodes_zip(:wiki)} !#{nodes_zip(:bird_jpg)}! \"link\":#{nodes_zip(:lion)}.",
-           zazen('This "is":33 "a":(projects/wiki) !(projects/wiki/bird)! "link"::lio.', :translate_ids => :zip, :node => zena)
+           zazen('This "is":33 "a":(projects list/a wiki with Zena) !(projects list/a wiki with Zena/bird)! "link"::lio.', :translate_ids => :zip, :node => zena)
 
-    assert_equal 'This "is":(../collections/art) "a":(wiki) !(wiki/bird)! !{(wiki/bird)}! ![(wiki/bird)]! "link":(../people/lion).',
-           zazen('This "is":33 "a":(/projects/wiki) !30! !{30}! ![30]! "link"::lio.', :translate_ids => :relative_path, :node => projects)
+    assert_equal 'This "is":(../Collections/Art) "a":(a wiki with Zena) !(a wiki with Zena/bird)! !{(a wiki with Zena/bird)}! ![(a wiki with Zena/bird)]! "link":(../people/Panthera Leo Verneyi).',
+           zazen('This "is":33 "a":(/projects list/a wiki with Zena) !30! !{30}! ![30]! "link"::lio.', :translate_ids => :relative_path, :node => projects)
 
     assert_equal "This \"is\":33 \"a\":#{nodes_zip(:wiki)} !#{nodes_zip(:bird_jpg)}! \"link\":#{nodes_zip(:lion)}.",
-           zazen('This "is":(../collections/art) "a":(wiki) !(wiki/bird)! "link":(../people/lion).', :translate_ids => :zip, :node => projects)
+           zazen('This "is":(../Collections/Art) "a":(a wiki with Zena) !(a wiki with Zena/bird)! "link":(../people/Panthera Leo Verneyi).', :translate_ids => :zip, :node => projects)
 
     assert_equal "This \"is\":33 \"a\":#{nodes_zip(:wiki)} !#{nodes_zip(:bird_jpg)}! \"link\":#{nodes_zip(:lion)}.",
-           zazen('This "is":(collections/art) "a":(/projects/wiki) !(/projects/wiki/bird)! "link":(people/lion).', :translate_ids => :zip, :node => zena)
+           zazen('This "is":(Collections/Art) "a":(/projects list/a wiki with Zena) !(/projects list/a wiki with Zena/bird)! "link":(people/Panthera Leo Verneyi).', :translate_ids => :zip, :node => zena)
   end
 
   def test_table_asset

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "1.0.0.beta3"
+  s.version = "1.0.0.rc1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-09-17}
+  s.date = %q{2011-02-11}
   s.default_executable = %q{zena}
   s.description = %q{zena is a Ruby on Rails  CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).}
   s.email = %q{gaspard@teti.ch}
@@ -50,24 +50,24 @@ Gem::Specification.new do |s|
      "app/helpers/application_helper.rb",
      "app/helpers/documents_helper.rb",
      "app/helpers/nodes_helper.rb",
+     "app/helpers/users_helper.rb",
      "app/helpers/versions_helper.rb",
      "app/models/attachment.rb",
-     "app/models/base_contact.rb",
-     "app/models/book.rb",
      "app/models/cache.rb",
      "app/models/cached_page.rb",
      "app/models/column.rb",
      "app/models/comment.rb",
-     "app/models/contact_content.rb",
-     "app/models/contact_version.rb",
      "app/models/data_entry.rb",
      "app/models/discussion.rb",
      "app/models/document.rb",
      "app/models/document_content.rb",
      "app/models/dyn_attribute.rb",
      "app/models/group.rb",
+     "app/models/idx_nodes_datetime.rb",
+     "app/models/idx_nodes_float.rb",
      "app/models/idx_nodes_ml_string.rb",
      "app/models/idx_nodes_string.rb",
+     "app/models/idx_project.rb",
      "app/models/idx_template.rb",
      "app/models/iformat.rb",
      "app/models/image.rb",
@@ -77,7 +77,6 @@ Gem::Specification.new do |s|
      "app/models/note.rb",
      "app/models/page.rb",
      "app/models/project.rb",
-     "app/models/reference.rb",
      "app/models/relation.rb",
      "app/models/relation_proxy.rb",
      "app/models/role.rb",
@@ -217,7 +216,6 @@ Gem::Specification.new do |s|
      "app/views/templates/drive_tabs/_drive.rhtml",
      "app/views/templates/drive_tabs/_help.rhtml",
      "app/views/templates/drive_tabs/_links.rhtml",
-     "app/views/templates/edit_tabs/_basecontact.rhtml",
      "app/views/templates/edit_tabs/_custom.rhtml",
      "app/views/templates/edit_tabs/_document.rhtml",
      "app/views/templates/edit_tabs/_help.rhtml",
@@ -241,6 +239,7 @@ Gem::Specification.new do |s|
      "app/views/versions/_tr.rhtml",
      "app/views/versions/backup.rjs",
      "app/views/versions/css_preview.rjs",
+     "app/views/versions/custom_tab.rhtml",
      "app/views/versions/destroy.rjs",
      "app/views/versions/diff.rjs",
      "app/views/versions/edit.rhtml",
@@ -269,35 +268,36 @@ Gem::Specification.new do |s|
      "bricks/captcha/README",
      "bricks/captcha/lib/bricks/captcha.rb",
      "bricks/captcha/zena/init.rb",
-     "bricks/data2pdf/.document",
-     "bricks/data2pdf/README",
-     "bricks/data2pdf/Rakefile",
-     "bricks/data2pdf/VERSION",
-     "bricks/data2pdf/lib/data2pdf.rb",
-     "bricks/data2pdf/lib/engines/prince.rb",
-     "bricks/data2pdf/lib/engines/xhtml2pdf.rb",
-     "bricks/data2pdf/lib/install.rb",
-     "bricks/data2pdf/test/engines/test_prince.rb",
-     "bricks/data2pdf/test/engines/test_xhtml2pdf.rb",
-     "bricks/data2pdf/test/fixtures/application.css",
-     "bricks/data2pdf/test/fixtures/contact.html",
-     "bricks/data2pdf/test/fixtures/pisa-default.css",
-     "bricks/data2pdf/test/fixtures/sheet1.css",
-     "bricks/data2pdf/test/fixtures/sheet2.css",
-     "bricks/data2pdf/test/fixtures/simple-html.html",
-     "bricks/data2pdf/test/fixtures/simple-text.txt",
-     "bricks/data2pdf/test/helper.rb",
-     "bricks/data2pdf/test/shoulda_macros/shoulda_data2pdf.rb",
-     "bricks/data2pdf/test/unit/test_rendering.rb",
      "bricks/math/lib/bricks/math.rb",
      "bricks/math/zena/init.rb",
      "bricks/mongrel/README",
      "bricks/mongrel/zena/deploy.rb",
      "bricks/passenger/README",
      "bricks/passenger/zena/deploy.rb",
+     "bricks/pdf/.document",
+     "bricks/pdf/README",
+     "bricks/pdf/Rakefile",
+     "bricks/pdf/VERSION",
+     "bricks/pdf/lib/bricks/pdf.rb",
+     "bricks/pdf/lib/bricks/pdf/engine/prince.rb",
+     "bricks/pdf/lib/bricks/pdf/engine/xhtml2pdf.rb",
+     "bricks/pdf/lib/bricks/pdf/install.rb",
+     "bricks/pdf/test/engines/test_prince.rb",
+     "bricks/pdf/test/engines/test_xhtml2pdf.rb",
+     "bricks/pdf/test/fixtures/application.css",
+     "bricks/pdf/test/fixtures/contact.html",
+     "bricks/pdf/test/fixtures/pisa-default.css",
+     "bricks/pdf/test/fixtures/sheet1.css",
+     "bricks/pdf/test/fixtures/sheet2.css",
+     "bricks/pdf/test/fixtures/simple-html.html",
+     "bricks/pdf/test/fixtures/simple-text.txt",
+     "bricks/pdf/test/helper.rb",
+     "bricks/pdf/test/shoulda_macros/shoulda_pdf.rb",
+     "bricks/pdf/zena/init.rb",
+     "bricks/pdf/zena/tasks.rb",
      "bricks/sphinx/MIT-LICENSE",
      "bricks/sphinx/README",
-     "bricks/sphinx/lib/use_sphinx.rb",
+     "bricks/sphinx/lib/bricks/sphinx.rb",
      "bricks/sphinx/zena/deploy.rb",
      "bricks/sphinx/zena/init.rb",
      "bricks/sphinx/zena/migrate/20091102171258_add_delta_for_sphinx.rb",
@@ -316,6 +316,7 @@ Gem::Specification.new do |s|
      "bricks/worker/zena/migrate/20091104191643_create_delayed_jobs_table.rb",
      "bricks/worker/zena/tasks.rb",
      "bricks/worker/zena/worker",
+     "bricks/zena/zena/migrate/01_base.rb",
      "config/boot.rb",
      "config/bricks.yml",
      "config/database_example.yml",
@@ -328,9 +329,110 @@ Gem::Specification.new do |s|
      "config/initializers/mime_types.rb",
      "config/initializers/zena.rb",
      "config/mongrel_upload_progress.conf",
-     "config/routes.rb",
      "config/sphinx.yml",
      "db/20100628074512_zena0x_to1x.rb",
+     "db/fix/024_correct_vclass_kpath.rb",
+     "db/fix/025_move_tag_into_vclass.rb",
+     "db/fix/026_rename_templates.rb",
+     "db/fix/045_avoid_star_in_templates.rb",
+     "db/fix/046_fix_zazen_image_tag.rb",
+     "db/fix/047_change_default_link_id_to_zero.rb",
+     "db/fix/049_fix_publish_from_is_null.rb",
+     "db/fix/20090924141459_zafu_fix_sept09.rb",
+     "db/fix/20091013100351_rename_publish_group_to_drive_group.rb",
+     "db/fix/20091124161608_rebuild_fullpath.rb",
+     "db/fix/20100115134729_rebuild_fullpath_after_fix.rb",
+     "db/fix/20100526090140_renamed_contact_model_to_base_contact.rb",
+     "db/fix/old_migrations/001_create_base.rb",
+     "db/fix/old_migrations/002_add_time_zone_to_users.rb",
+     "db/fix/old_migrations/003_add_custom_base_flag.rb",
+     "db/fix/old_migrations/004_rename_template_skin.rb",
+     "db/fix/old_migrations/005_create_cached_pages.rb",
+     "db/fix/old_migrations/006_create_sites.rb",
+     "db/fix/old_migrations/007_replace_id_by_zip.rb",
+     "db/fix/old_migrations/008_user_status.rb",
+     "db/fix/old_migrations/009_fulltext.rb",
+     "db/fix/old_migrations/010_create_template_content.rb",
+     "db/fix/old_migrations/011_project_to_section.rb",
+     "db/fix/old_migrations/012_add_project_id.rb",
+     "db/fix/old_migrations/013_remove_defaults.rb",
+     "db/fix/old_migrations/014_add_sort_field.rb",
+     "db/fix/old_migrations/015_add_dyn_attributes.rb",
+     "db/fix/old_migrations/016_remove_translations.rb",
+     "db/fix/old_migrations/017_rename_authorize.rb",
+     "db/fix/old_migrations/018_add_auth_option.rb",
+     "db/fix/old_migrations/019_remove_user_status.rb",
+     "db/fix/old_migrations/020_create_participation.rb",
+     "db/fix/old_migrations/021_create_relations.rb",
+     "db/fix/old_migrations/022_create_virtual_classes.rb",
+     "db/fix/old_migrations/023_ip_on_anonymous_comment.rb",
+     "db/fix/old_migrations/027_add_country_to_contacts.rb",
+     "db/fix/old_migrations/028_change_size_of_conten_type_field.rb",
+     "db/fix/old_migrations/029_create_data_entries.rb",
+     "db/fix/old_migrations/030_redit_auto_publish_site_settings.rb",
+     "db/fix/old_migrations/031_create_iformats.rb",
+     "db/fix/old_migrations/032_caches_context_as_hash.rb",
+     "db/fix/old_migrations/033_documents_kpath_change.rb",
+     "db/fix/old_migrations/034_change_file_storage.rb",
+     "db/fix/old_migrations/035_add_status_to_link.rb",
+     "db/fix/old_migrations/036_add_flag_fields_on_nodes.rb",
+     "db/fix/old_migrations/037_add_auto_create_discussion_to_v_class.rb",
+     "db/fix/old_migrations/038_create_site_attributes.rb",
+     "db/fix/old_migrations/039_default_position.rb",
+     "db/fix/old_migrations/040_second_value_for_data_entry.rb",
+     "db/fix/old_migrations/041_add_attributes_to_v_class.rb",
+     "db/fix/old_migrations/042_fix_position_should_be_float.rb",
+     "db/fix/old_migrations/043_move_user_lang_into_participation.rb",
+     "db/fix/old_migrations/044_remove_monolingual_site_option.rb",
+     "db/fix/old_migrations/048_link_source_target_can_be_null.rb",
+     "db/fix/old_migrations/050_date_in_links.rb",
+     "db/fix/old_migrations/051_add_exif_tags_to_images.rb",
+     "db/fix/old_migrations/20090825201159_insert_zero_link.rb",
+     "db/fix/old_migrations/20090825201200_merge_bricks_migrations_with_std_migrations.rb",
+     "db/fix/old_migrations/20090927125912_allow_null_in_text_fields.rb",
+     "db/fix/old_migrations/20090928133440_no_more_private_nodes.rb",
+     "db/fix/old_migrations/20090928143754_version_status_change.rb",
+     "db/fix/old_migrations/20091001084025_change_status_values_for_comments.rb",
+     "db/fix/old_migrations/20091009084057_add_vhash_in_node.rb",
+     "db/fix/old_migrations/20091014130833_fix_template_title.rb",
+     "db/fix/old_migrations/20091014183726_merge_participation_into_users.rb",
+     "db/fix/old_migrations/20091018200734_add_popup_info_to_image_format.rb",
+     "db/fix/old_migrations/20091026161708_add_persistence_token.rb",
+     "db/fix/old_migrations/20091101184952_add_session_table.rb",
+     "db/fix/old_migrations/20091123175137_add_single_access_token.rb",
+     "db/fix/old_migrations/20100125062254_add_dynamo_to_version.rb",
+     "db/fix/old_migrations/20100201133242_remove_default_status_on_version.rb",
+     "db/fix/old_migrations/20100208194210_create_attachments.rb",
+     "db/fix/old_migrations/20100210112319_change_dynamo_to_property.rb",
+     "db/fix/old_migrations/20100320145726_transform_template_contents_into_index.rb",
+     "db/fix/old_migrations/20100328125634_change_skin_name_to_id.rb",
+     "db/fix/old_migrations/20100417061257_add_properties_to_sites.rb",
+     "db/fix/old_migrations/20100419163149_rename_name_to_node_name.rb",
+     "db/fix/old_migrations/20100422091606_change_v_class_table_into_roles.rb",
+     "db/fix/old_migrations/20100422094048_node_habtm_roles.rb",
+     "db/fix/old_migrations/20100422115935_create_columns.rb",
+     "db/fix/old_migrations/20100513181529_add_site_id_to_columns.rb",
+     "db/fix/old_migrations/20100519091711_add_index_definition_to_columns.rb",
+     "db/fix/old_migrations/20100519091940_create_idx_nodes_string.rb",
+     "db/fix/old_migrations/20100519232432_create_idx_nodes_ml_string.rb",
+     "db/fix/old_migrations/20100525113858_add_porperties_to_users.rb",
+     "db/fix/old_migrations/20100527130937_change_column_index_to_string.rb",
+     "db/fix/old_migrations/20100531135128_add_fulltext_builder_fields.rb",
+     "db/fix/old_migrations/20100915062903_add_api_group_id_to_site.rb",
+     "db/fix/old_migrations/20100923154807_remove_base_contact.rb",
+     "db/fix/old_migrations/20100926192223_remove_su_user.rb",
+     "db/fix/old_migrations/20100927141658_add_eval_attributes_to_v_class.rb",
+     "db/fix/old_migrations/20100928185257_add_obvious_idx.rb",
+     "db/fix/old_migrations/20100929143111_remove_node_name.rb",
+     "db/fix/old_migrations/20101006090454_store_properties_in_long_text.rb",
+     "db/fix/old_migrations/20101014185753_remove_user_prototype_id.rb",
+     "db/fix/old_migrations/20101101084318_create_scope_index.rb",
+     "db/fix/old_migrations/20101109074232_create_idx_nodes_tables.rb",
+     "db/fix/old_migrations/20101110184235_add_role_update_to_site.rb",
+     "db/fix/old_migrations/20101116103920_change_scope_index.rb",
+     "db/fix/old_migrations/20101123125822_add_integer_idx.rb",
+     "db/fix/old_migrations/20101130134522_add_index_field.rb",
+     "db/fix/old_migrations/20101213133816_add_group_to_relation.rb",
      "db/init/base/help.en.zml",
      "db/init/base/help.fr.zml",
      "db/init/base/skins.zml",
@@ -347,94 +449,6 @@ Gem::Specification.new do |s|
      "db/init/base/skins/default/favicon.png",
      "db/init/base/skins/default/notes.zafu",
      "db/init/base/skins/default/style.css",
-     "db/migrate/001_create_base.rb",
-     "db/migrate/002_add_time_zone_to_users.rb",
-     "db/migrate/003_add_custom_base_flag.rb",
-     "db/migrate/004_rename_template_skin.rb",
-     "db/migrate/005_create_cached_pages.rb",
-     "db/migrate/006_create_sites.rb",
-     "db/migrate/007_replace_id_by_zip.rb",
-     "db/migrate/008_user_status.rb",
-     "db/migrate/009_fulltext.rb",
-     "db/migrate/010_create_template_content.rb",
-     "db/migrate/011_project_to_section.rb",
-     "db/migrate/012_add_project_id.rb",
-     "db/migrate/013_remove_defaults.rb",
-     "db/migrate/014_add_sort_field.rb",
-     "db/migrate/015_add_dyn_attributes.rb",
-     "db/migrate/016_remove_translations.rb",
-     "db/migrate/017_rename_authorize.rb",
-     "db/migrate/018_add_auth_option.rb",
-     "db/migrate/019_remove_user_status.rb",
-     "db/migrate/020_create_participation.rb",
-     "db/migrate/021_create_relations.rb",
-     "db/migrate/022_create_virtual_classes.rb",
-     "db/migrate/023_ip_on_anonymous_comment.rb",
-     "db/migrate/024_correct_vclass_kpath.rb",
-     "db/migrate/025_move_tag_into_vclass.rb",
-     "db/migrate/026_rename_templates.rb",
-     "db/migrate/027_add_country_to_contacts.rb",
-     "db/migrate/028_change_size_of_conten_type_field.rb",
-     "db/migrate/029_create_data_entries.rb",
-     "db/migrate/030_redit_auto_publish_site_settings.rb",
-     "db/migrate/031_create_iformats.rb",
-     "db/migrate/032_caches_context_as_hash.rb",
-     "db/migrate/033_documents_kpath_change.rb",
-     "db/migrate/034_change_file_storage.rb",
-     "db/migrate/035_add_status_to_link.rb",
-     "db/migrate/036_add_flag_fields_on_nodes.rb",
-     "db/migrate/037_add_auto_create_discussion_to_v_class.rb",
-     "db/migrate/038_create_site_attributes.rb",
-     "db/migrate/039_default_position.rb",
-     "db/migrate/040_second_value_for_data_entry.rb",
-     "db/migrate/041_add_attributes_to_v_class.rb",
-     "db/migrate/042_fix_position_should_be_float.rb",
-     "db/migrate/043_move_user_lang_into_participation.rb",
-     "db/migrate/044_remove_monolingual_site_option.rb",
-     "db/migrate/045_avoid_star_in_templates.rb",
-     "db/migrate/046_fix_zazen_image_tag.rb",
-     "db/migrate/047_change_default_link_id_to_zero.rb",
-     "db/migrate/048_link_source_target_can_be_null.rb",
-     "db/migrate/049_fix_publish_from_is_null.rb",
-     "db/migrate/050_date_in_links.rb",
-     "db/migrate/051_add_exif_tags_to_images.rb",
-     "db/migrate/20090825201159_insert_zero_link.rb",
-     "db/migrate/20090825201200_merge_bricks_migrations_with_std_migrations.rb",
-     "db/migrate/20090924141459_zafu_fix_sept09.rb",
-     "db/migrate/20090927125912_allow_null_in_text_fields.rb",
-     "db/migrate/20090928133440_no_more_private_nodes.rb",
-     "db/migrate/20090928143754_version_status_change.rb",
-     "db/migrate/20091001084025_change_status_values_for_comments.rb",
-     "db/migrate/20091009084057_add_vhash_in_node.rb",
-     "db/migrate/20091013100351_rename_publish_group_to_drive_group.rb",
-     "db/migrate/20091014130833_fix_template_title.rb",
-     "db/migrate/20091014183726_merge_participation_into_users.rb",
-     "db/migrate/20091018200734_add_popup_info_to_image_format.rb",
-     "db/migrate/20091026161708_add_persistence_token.rb",
-     "db/migrate/20091101184952_add_session_table.rb",
-     "db/migrate/20091123175137_add_single_access_token.rb",
-     "db/migrate/20091124161608_rebuild_fullpath.rb",
-     "db/migrate/20100115134729_rebuild_fullpath_after_fix.rb",
-     "db/migrate/20100125062254_add_dynamo_to_version.rb",
-     "db/migrate/20100201133242_remove_default_status_on_version.rb",
-     "db/migrate/20100208194210_create_attachments.rb",
-     "db/migrate/20100210112319_change_dynamo_to_property.rb",
-     "db/migrate/20100320145726_transform_template_contents_into_index.rb",
-     "db/migrate/20100328125634_change_skin_name_to_id.rb",
-     "db/migrate/20100417061257_add_properties_to_sites.rb",
-     "db/migrate/20100419163149_rename_name_to_node_name.rb",
-     "db/migrate/20100422091606_change_v_class_table_into_roles.rb",
-     "db/migrate/20100422094048_node_habtm_roles.rb",
-     "db/migrate/20100422115935_create_columns.rb",
-     "db/migrate/20100513181529_add_site_id_to_columns.rb",
-     "db/migrate/20100519091711_add_index_definition_to_columns.rb",
-     "db/migrate/20100519091940_create_idx_nodes_string.rb",
-     "db/migrate/20100519232432_create_idx_nodes_ml_string.rb",
-     "db/migrate/20100525113858_add_porperties_to_users.rb",
-     "db/migrate/20100526090140_renamed_contact_model_to_base_contact.rb",
-     "db/migrate/20100527130937_change_column_index_to_string.rb",
-     "db/migrate/20100531135128_add_fulltext_builder_fields.rb",
-     "db/migrate/20100915062903_add_api_group_id_to_site.rb",
      "doc/README_FOR_APP",
      "doc/fixtures.graffle",
      "doc/fixtures.pdf",
@@ -471,7 +485,6 @@ Gem::Specification.new do |s|
      "lib/tasks/zena.rake",
      "lib/tasks/zena.rb",
      "lib/upload_progress_server.rb",
-     "lib/version_off.rb",
      "lib/zazen_parser.rb",
      "lib/zena.rb",
      "lib/zena/acts/enrollable.rb",
@@ -489,6 +502,10 @@ Gem::Specification.new do |s|
      "lib/zena/core_ext/string.rb",
      "lib/zena/crypto_provider/initial.rb",
      "lib/zena/db.rb",
+     "lib/zena/db_helper/abstract_db.rb",
+     "lib/zena/db_helper/mysql.rb",
+     "lib/zena/db_helper/postgresql.rb",
+     "lib/zena/db_helper/sqlite3.rb",
      "lib/zena/deploy.rb",
      "lib/zena/deploy/awstats.conf.rhtml",
      "lib/zena/deploy/database.rhtml",
@@ -526,6 +543,7 @@ Gem::Specification.new do |s|
      "lib/zena/use.rb",
      "lib/zena/use/action.rb",
      "lib/zena/use/ajax.rb",
+     "lib/zena/use/ancestry.rb",
      "lib/zena/use/authlogic.rb",
      "lib/zena/use/calendar.rb",
      "lib/zena/use/conditional.rb",
@@ -534,6 +552,7 @@ Gem::Specification.new do |s|
      "lib/zena/use/display.rb",
      "lib/zena/use/dyn_attributes.rb",
      "lib/zena/use/error_rendering.rb",
+     "lib/zena/use/field_index.rb",
      "lib/zena/use/fixtures.rb",
      "lib/zena/use/forms.rb",
      "lib/zena/use/fulltext.rb",
@@ -541,9 +560,11 @@ Gem::Specification.new do |s|
      "lib/zena/use/html_tags.rb",
      "lib/zena/use/i18n.rb",
      "lib/zena/use/image_builder.rb",
+     "lib/zena/use/kpath.rb",
      "lib/zena/use/ml_index.rb",
      "lib/zena/use/nested_attributes_alias.rb",
-     "lib/zena/use/node_name.rb",
+     "lib/zena/use/node_context.rb",
+     "lib/zena/use/prop_eval.rb",
      "lib/zena/use/query_builder.rb",
      "lib/zena/use/query_comment.rb",
      "lib/zena/use/query_node.rb",
@@ -551,6 +572,7 @@ Gem::Specification.new do |s|
      "lib/zena/use/refactor.rb",
      "lib/zena/use/relations.rb",
      "lib/zena/use/rendering.rb",
+     "lib/zena/use/scope_index.rb",
      "lib/zena/use/search.rb",
      "lib/zena/use/test_helper.rb",
      "lib/zena/use/upload.rb",
@@ -575,6 +597,8 @@ Gem::Specification.new do |s|
      "locale/fr/zena.mo",
      "locale/fr/zena.po",
      "locale/zena.pot",
+     "misc/zena",
+     "misc/zena_init",
      "old_zafu/action.rb",
      "old_zafu/ajax.rb",
      "old_zafu/attributes.rb",
@@ -1014,7 +1038,7 @@ Gem::Specification.new do |s|
      "public/images/error_delete.png",
      "public/images/error_go.png",
      "public/images/exclamation.png",
-     "public/images/ext/basecontact.png",
+     "public/images/ext/contact.png",
      "public/images/ext/doc.png",
      "public/images/ext/doc_tiny.png",
      "public/images/ext/jpg.png",
@@ -1790,7 +1814,9 @@ Gem::Specification.new do |s|
      "test/integration/query_node/dates.yml",
      "test/integration/query_node/errors.yml",
      "test/integration/query_node/filters.yml",
-     "test/integration/query_node/properties.yml",
+     "test/integration/query_node/idx_fields.yml",
+     "test/integration/query_node/idx_key_value.yml",
+     "test/integration/query_node/idx_scope.yml",
      "test/integration/query_node/relations.yml",
      "test/integration/query_node_test.rb",
      "test/integration/xml_api_test.rb",
@@ -1810,8 +1836,10 @@ Gem::Specification.new do |s|
      "test/integration/zafu_compiler/eval.yml",
      "test/integration/zafu_compiler/forms.yml",
      "test/integration/zafu_compiler/i18n.yml",
+     "test/integration/zafu_compiler/idx_scope.yml",
      "test/integration/zafu_compiler/later.yml",
      "test/integration/zafu_compiler/off/off.yml",
+     "test/integration/zafu_compiler/query.yml",
      "test/integration/zafu_compiler/recursion.yml",
      "test/integration/zafu_compiler/relations.yml",
      "test/integration/zafu_compiler/roles.yml",
@@ -1840,6 +1868,7 @@ Gem::Specification.new do |s|
      "test/sites/ocean/groups.yml",
      "test/sites/ocean/iformats.yml",
      "test/sites/ocean/nodes.yml",
+     "test/sites/ocean/roles.yml",
      "test/sites/ocean/sites.yml",
      "test/sites/ocean/users.yml",
      "test/sites/ocean/versions.yml",
@@ -1848,6 +1877,7 @@ Gem::Specification.new do |s|
      "test/sites/zena/data_entries.yml",
      "test/sites/zena/discussions.yml",
      "test/sites/zena/groups.yml",
+     "test/sites/zena/idx_projects.yml",
      "test/sites/zena/iformats.yml",
      "test/sites/zena/links.yml",
      "test/sites/zena/nodes.yml",
@@ -1860,7 +1890,6 @@ Gem::Specification.new do |s|
      "test/test_zena.rb",
      "test/unit/after_commit_test.rb",
      "test/unit/attachment_test.rb",
-     "test/unit/base_contact_test.rb",
      "test/unit/cache_test.rb",
      "test/unit/cached_page_test.rb",
      "test/unit/column_test.rb",
@@ -1879,7 +1908,6 @@ Gem::Specification.new do |s|
      "test/unit/link_test.rb",
      "test/unit/multi_version_test.rb",
      "test/unit/multiversion_test.rb",
-     "test/unit/node_name_test.rb",
      "test/unit/node_test.rb",
      "test/unit/note_test.rb",
      "test/unit/page_test.rb",
@@ -1913,6 +1941,7 @@ Gem::Specification.new do |s|
      "test/unit/zena/parser_test.rb",
      "test/unit/zena/unit/test_case_test.rb",
      "test/unit/zena/use/action_test.rb",
+     "test/unit/zena/use/ancestry_test.rb",
      "test/unit/zena/use/calendar_test.rb",
      "test/unit/zena/use/dates_model_methods_test.rb",
      "test/unit/zena/use/dates_string_methods_test.rb",
@@ -1921,12 +1950,15 @@ Gem::Specification.new do |s|
      "test/unit/zena/use/fulltext_test.rb",
      "test/unit/zena/use/html_tags_test.rb",
      "test/unit/zena/use/i18n_test.rb",
+     "test/unit/zena/use/kpath_test.rb",
      "test/unit/zena/use/ml_index_test.rb",
      "test/unit/zena/use/nested_attributes_alias_model_test.rb",
      "test/unit/zena/use/nested_attributes_alias_view_test.rb",
+     "test/unit/zena/use/prop_eval_test.rb",
      "test/unit/zena/use/query_node_test.rb",
      "test/unit/zena/use/refactor_test.rb",
      "test/unit/zena/use/rendering_test.rb",
+     "test/unit/zena/use/scope_index_test.rb",
      "test/unit/zena/use/upload_test.rb",
      "test/unit/zena/use/urls_test.rb",
      "test/unit/zena/use/version_hash_test.rb",
@@ -2066,7 +2098,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{zena}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{CMS with super natural powers, based on Ruby on Rails}
   s.test_files = [
     "spec/controllers/versions_controller_spec.rb",
@@ -2102,7 +2134,6 @@ Gem::Specification.new do |s|
      "test/test_zena.rb",
      "test/unit/after_commit_test.rb",
      "test/unit/attachment_test.rb",
-     "test/unit/base_contact_test.rb",
      "test/unit/cache_test.rb",
      "test/unit/cached_page_test.rb",
      "test/unit/column_test.rb",
@@ -2121,7 +2152,6 @@ Gem::Specification.new do |s|
      "test/unit/link_test.rb",
      "test/unit/multi_version_test.rb",
      "test/unit/multiversion_test.rb",
-     "test/unit/node_name_test.rb",
      "test/unit/node_test.rb",
      "test/unit/note_test.rb",
      "test/unit/page_test.rb",
@@ -2150,6 +2180,7 @@ Gem::Specification.new do |s|
      "test/unit/zena/parser_test.rb",
      "test/unit/zena/unit/test_case_test.rb",
      "test/unit/zena/use/action_test.rb",
+     "test/unit/zena/use/ancestry_test.rb",
      "test/unit/zena/use/calendar_test.rb",
      "test/unit/zena/use/dates_model_methods_test.rb",
      "test/unit/zena/use/dates_string_methods_test.rb",
@@ -2158,12 +2189,15 @@ Gem::Specification.new do |s|
      "test/unit/zena/use/fulltext_test.rb",
      "test/unit/zena/use/html_tags_test.rb",
      "test/unit/zena/use/i18n_test.rb",
+     "test/unit/zena/use/kpath_test.rb",
      "test/unit/zena/use/ml_index_test.rb",
      "test/unit/zena/use/nested_attributes_alias_model_test.rb",
      "test/unit/zena/use/nested_attributes_alias_view_test.rb",
+     "test/unit/zena/use/prop_eval_test.rb",
      "test/unit/zena/use/query_node_test.rb",
      "test/unit/zena/use/refactor_test.rb",
      "test/unit/zena/use/rendering_test.rb",
+     "test/unit/zena/use/scope_index_test.rb",
      "test/unit/zena/use/upload_test.rb",
      "test/unit/zena/use/urls_test.rb",
      "test/unit/zena/use/version_hash_test.rb",
@@ -2176,16 +2210,16 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.0"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0.3.12"])
       s.add_runtime_dependency(%q<rails>, ["= 2.3.8"])
-      s.add_runtime_dependency(%q<rubyless>, [">= 0.7.0"])
-      s.add_runtime_dependency(%q<property>, [">= 1.1.0"])
+      s.add_runtime_dependency(%q<rubyless>, [">= 0.8.2"])
+      s.add_runtime_dependency(%q<property>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_runtime_dependency(%q<zafu>, [">= 0.7.1"])
-      s.add_runtime_dependency(%q<shoulda>, [">= 2.10.2"])
+      s.add_runtime_dependency(%q<zafu>, [">= 0.7.6"])
+      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
       s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
       s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_runtime_dependency(%q<yamltest>, [">= 0.7.0"])
@@ -2197,17 +2231,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
       s.add_runtime_dependency(%q<differ>, [">= 0.1.1"])
       s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_runtime_dependency(%q<querybuilder>, [">= 0.9.0"])
+      s.add_runtime_dependency(%q<querybuilder>, [">= 0.9.5"])
     else
       s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.0"])
       s.add_dependency(%q<tzinfo>, [">= 0.3.12"])
       s.add_dependency(%q<rails>, ["= 2.3.8"])
-      s.add_dependency(%q<rubyless>, [">= 0.7.0"])
-      s.add_dependency(%q<property>, [">= 1.1.0"])
+      s.add_dependency(%q<rubyless>, [">= 0.8.2"])
+      s.add_dependency(%q<property>, [">= 2.1.2"])
       s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_dependency(%q<zafu>, [">= 0.7.1"])
-      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
+      s.add_dependency(%q<zafu>, [">= 0.7.6"])
+      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
       s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
       s.add_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_dependency(%q<yamltest>, [">= 0.7.0"])
@@ -2219,18 +2253,18 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<differ>, [">= 0.1.1"])
       s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_dependency(%q<querybuilder>, [">= 0.9.0"])
+      s.add_dependency(%q<querybuilder>, [">= 0.9.5"])
     end
   else
     s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.0"])
     s.add_dependency(%q<tzinfo>, [">= 0.3.12"])
     s.add_dependency(%q<rails>, ["= 2.3.8"])
-    s.add_dependency(%q<rubyless>, [">= 0.7.0"])
-    s.add_dependency(%q<property>, [">= 1.1.0"])
+    s.add_dependency(%q<rubyless>, [">= 0.8.2"])
+    s.add_dependency(%q<property>, [">= 2.1.2"])
     s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
     s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-    s.add_dependency(%q<zafu>, [">= 0.7.1"])
-    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
+    s.add_dependency(%q<zafu>, [">= 0.7.6"])
+    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
     s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
     s.add_dependency(%q<syntax>, ["= 1.0.0"])
     s.add_dependency(%q<yamltest>, [">= 0.7.0"])
@@ -2242,7 +2276,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<differ>, [">= 0.1.1"])
     s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-    s.add_dependency(%q<querybuilder>, [">= 0.9.0"])
+    s.add_dependency(%q<querybuilder>, [">= 0.9.5"])
   end
 end