zena 1.0.0.beta3 → 1.0.0.rc1

data/test/functional/user_sessions_controller_test.rb

@@ -26,11 +26,11 @@ class UserSessionsControllerTest < Zena::Controller::TestCase
   context "with login Test Case" do
 
     setup do
-      login('su')
+      login('lion')
     end
 
     should "visitor be accessible" do
-      assert_equal 'su', visitor.login
+      assert_equal 'lion', visitor.login
     end
 
     should "site be accessible" do

data/test/functional/users_controller_test.rb

@@ -2,10 +2,10 @@ require 'test_helper'
 
 class UsersControllerTest < Zena::Controller::TestCase
 
-  context "on GET index" do
-    context " if visitor is admin" do
+  context "Accessing index" do
+    context "with an admin user" do
       setup do
-        login(:su)
+        login(:lion)
         get :index
       end
 
@@ -14,7 +14,7 @@ class UsersControllerTest < Zena::Controller::TestCase
       should_respond_with :success
     end
 
-    context " if visitor is not admin" do
+    context "with a regular user" do
       setup do
         login(:ant)
         get :index
@@ -25,24 +25,27 @@ class UsersControllerTest < Zena::Controller::TestCase
       should_respond_with 404
     end
 
-    context " if layout is invalid" do
+    context "with an invalid layout" do
       setup do
         login(:lion)
-        Version.connection.execute "UPDATE #{Version.table_name} SET properties = '{\"data\":{\"text\":\"empty\"},\"json_class\":\"Property::Properties\"}' WHERE id = #{versions_id(:Node_admin_layout_zafu_en)}"
+        # Make a bad admin layout
+        Version.connection.execute "UPDATE #{Version.table_name} SET properties = '{\"data\":{\"title\":\"foo\",\"text\":\"empty\"},\"json_class\":\"Property::Properties\"}' WHERE id = #{versions_id(:Node_admin_layout_zafu_en)}"
         without_files('test.host/zafu') do
+            get 'index'
           get 'index'
         end
       end
 
       should_respond_with :success
+      # Renders with default layout "default/Node-+adminLayout.zafu" => compilation as "_main"
       should_render_with_layout :_main
     end
 
   end
 
-  context "on GET show" do
+  context "Accessing a user" do
     setup do
-      login(:su)
+      login(:lion)
       get(:show, {'id'=>visitor.id})
     end
 
@@ -84,18 +87,21 @@ class UsersControllerTest < Zena::Controller::TestCase
       subject do
         {
           :user   => {
-            'name'       => 'Dupont',
             'lang'       => 'fr',
             'time_zone'  => 'Europe/Zurich',
-             'status'     => '50',
+            'status'     => '50',
             'password'   => 'secret',
             'login'      => 'bolomey',
-            'first_name' => 'Paul',
             'group_ids'  => [groups_id(:admin), ''],
+            'infamous'   => '' # This is to test bad blank values
+          },
+          '_'          => '', # This is in the original post
+          :action => 'create',
+          :node   => {
+            'name'       => 'Dupont',
+            'first_name' => 'Paul',
             'email'      => 'paul.bolomey@brainfuck.com',
-            '_'          => '' # This is in the original post
           },
-          :action => 'create'
         }
       end
 
@@ -121,9 +127,9 @@ class UsersControllerTest < Zena::Controller::TestCase
   end # With an admin user
 
 
-  context 'on GET preferences' do
+  context 'Accessing preferences' do
     setup do
-      login(:su)
+      login(:ant)
       get(:preferences, {'id'=>visitor.id})
     end
 
@@ -131,19 +137,15 @@ class UsersControllerTest < Zena::Controller::TestCase
     should_render_with_layout :_main
   end
 
-  context "on PUT" do
-    context "in order to update parameters" do
-      setup do
-        login(:lion)
-        put 'update', 'id' => users_id(:lion), 'user'=>{'name'=>'Leo Verneyi', 'lang'=>'en', 'time_zone'=>'Africa/Algiers', 'first_name'=>'Panthera', 'login'=>'lion', 'email'=>'lion@zenadmin.info'}
-      end
-      should_assign_to :user
-      should_respond_with :success
-      should "be able to set timezone" do
-        assert_equal 'Africa/Algiers', assigns(:user)[:time_zone]
-      end
+  context "Updating a user" do
+    setup do
+      login(:lion)
+      put 'update', 'id' => users_id(:lion), 'user'=>{'name'=>'Leo Verneyi', 'lang'=>'en', 'time_zone'=>'Africa/Algiers', 'first_name'=>'Panthera', 'login'=>'lion', 'email'=>'lion@zenadmin.info'}
     end
-  end
-
-
+    should_assign_to :user
+    should_respond_with :success
+    should "be able to set timezone" do
+      assert_equal 'Africa/Algiers', assigns(:user)[:time_zone]
+    end
+  end # Updating a user
 end

data/test/functional/versions_controller_test.rb

@@ -27,7 +27,7 @@ class VersionsControllerTest < Zena::Controller::TestCase
     should 'get a page rendered with zafu when getting a version' do
       get 'show', version_hash(:lake_red_en)
       assert_response :success
-      assert_match %r{default/Node/fr/_main.erb$}, @response.rendered[:template].to_s
+      assert_match %r{Default skin/Node/fr/_main.erb$}, @response.rendered[:template].to_s
     end
   end
 
@@ -78,7 +78,7 @@ class VersionsControllerTest < Zena::Controller::TestCase
     start =<<-END_CSS
     body { font-size:10px; }
     #header { background:url('bird.jpg') }
-    #footer { background:url('/projects/wiki/flower.jpg') }
+    #footer { background:url('/projects list/a wiki with Zena/flower.jpg') }
     END_CSS
 
     assert node.update_attributes(:text => start.dup)

data/test/functional/virtual_classes_controller_test.rb

@@ -62,7 +62,7 @@ class VirtualClassesControllerTest < Zena::Controller::TestCase
           post_subject
           vclass = assigns(:virtual_class)
           assert_equal 'Xkcd',  vclass.name
-          assert_equal Section, vclass.superclass
+          assert_equal VirtualClass['Section'], vclass.superclass
           assert_equal 'NPSX',  vclass.kpath
         end
 
@@ -90,7 +90,7 @@ class VirtualClassesControllerTest < Zena::Controller::TestCase
           post_subject
           vclass = assigns(:virtual_class)
           assert_equal 'Xkcd',  vclass.name
-          assert_equal Section, vclass.superclass
+          assert_equal VirtualClass['Section'], vclass.superclass
           assert_equal 'NPS',  vclass.kpath
         end
 

data/test/integration/multiple_hosts_test.rb

@@ -20,9 +20,9 @@ class MultipleHostsTest < ActionController::IntegrationTest
     assert_equal 'ocean.host', visitor.site.host
     Node.connection.execute "UPDATE nodes set zip = 11114 where id = #{nodes(:ocean, :whale)[:id]}" # whale
     Node.connection.execute "UPDATE nodes set zip = 11114 where id = #{nodes(:zena, :tiger)[:id]}" # tiger
-    anon.get "http://ocean.host/en/basecontact11114.html" # zip 11114 ==> whale
+    anon.get "http://ocean.host/en/contact11114.html" # zip 11114 ==> whale
     assert_equal nodes(:ocean, :whale)[:id], anon.assigns(:node)[:id]
-    anon.get "http://test.host/en/basecontact11114.html"  # zip 11114 ==> tiger
+    anon.get "http://test.host/en/contact11114.html"  # zip 11114 ==> tiger
     assert_equal nodes(:zena, :tiger)[:id], anon.assigns(:node)[:id]
   end
 
@@ -35,21 +35,25 @@ class MultipleHostsTest < ActionController::IntegrationTest
   end
 
   def test_cache
-    status_zip = nodes(:zena, :status).zip
+    # We need the visitor to load VirtualClass cache.
+    Thread.current[:visitor] = users(:anon)
+    node_zip = nodes(:zena, :people).zip
+    Thread.current[:visitor] = nil
+    
     without_files('/test.host/public') do
       with_caching do
-        path = "/en/projects/cleanWater/page#{status_zip}.html"
+        path = "/en/section#{node_zip}.html"
         filepath = "#{RAILS_ROOT}/sites/test.host/public#{path}"
         assert !File.exist?(filepath)
         anon.get "http://test.host#{path}"
         assert_equal 200, anon.status
         assert File.exist?(filepath), "Cache file created"
-        node = nodes(:zena, :status)
-        assert_equal 1, CachedPage.count(:conditions => "path like '%page#{status_zip}%'")
+        node = nodes(:zena, :people)
+        assert_equal 1, CachedPage.count(:conditions => "path like '%section#{node_zip}%'")
         assert_not_equal 0, Zena::Db.fetch_attribute("SELECT COUNT(*) as count_all FROM cached_pages_nodes WHERE node_id = #{node[:id]}").to_i
         node.visitor = Thread.current[:visitor]
         node.sweep_cache
-        assert_equal 0, CachedPage.count(:conditions => "path like '%page#{status_zip}%'")
+        assert_equal 0, CachedPage.count(:conditions => "path like '%section#{node_zip}%'")
         assert_equal 0, Zena::Db.fetch_attribute("SELECT COUNT(*) as count_all FROM cached_pages_nodes WHERE node_id = #{node[:id]}").to_i
         assert !File.exist?(filepath)
       end
@@ -78,7 +82,14 @@ class MultipleHostsTest < ActionController::IntegrationTest
       if @node[:id] == @site.root_id
         name = []
       else
-        name = "#{@node.class.to_s.downcase}#{@node[:zip]}.html"
+        name = case node_sym
+        when :wiki
+          'blog29.html'
+        when :status
+          'page22.html'
+        else
+          raise 'Please set page in get_node.'
+        end
       end
       prefix = (!request || session[:user] == @site.anon_id) ? 'en' : AUTHENTICATED_PREFIX
       url = "http://#{host}/#{prefix}/#{name}"

data/test/integration/navigation_test.rb

@@ -38,6 +38,72 @@ class NavigationTest < Zena::Integration::TestCase
     assert_redirected_to "http://test.host/oo"
   end
 
+  context 'Asset rendering' do
+    setup do
+      post 'http://test.host/session', :login=>'tiger', :password=>'tiger'
+      @visitor = users(:tiger)
+      Thread.current[:visitor] = nil
+    end
+
+    context 'with valid http auth' do
+      setup do
+        @headers = {
+          'HTTP_AUTHORIZATION' => 'Basic ' + Base64::encode64("#{@visitor.id}:#{@visitor.persistence_token}")
+        }
+      end
+
+      subject do
+        [
+          "http://localhost:1234/oo/project19.html",
+          {},
+          @headers
+        ]
+      end
+
+      should 'set host and login wth given user' do
+        reset!
+        get *subject
+        assert_response :success
+        assert users_id(:tiger), visitor.id
+        assert_match %r{Secret}, response.body
+      end
+
+      context 'but invalid host' do
+        subject do
+          [
+            "http://test.host:1234/oo/project19.html",
+            {},
+            @headers
+          ]
+
+        end
+
+        should 'redirect to login' do
+          reset!
+          get *subject
+          assert_response :redirect
+          assert_redirected_to 'http://test.host/login'
+          assert_equal users_id(:anon), visitor.id
+        end
+      end # but invalid host
+    end # with a valid http auth
+  end # With render_token in url
+
+  context 'Rescue template rendering' do
+    setup do
+      post 'http://test.host/session', :login=>'lion', :password=>'lion'
+      get  'http://test.host/rescue'
+      @visitor = users(:tiger)
+      Thread.current[:visitor] = nil
+    end
+    
+    should 'render home page' do
+      get 'http://test.host/oo'
+      assert_response :success
+    end
+  end # Rescue template rendering
+
+
   # HTTP_AUTH disabled
   # def test_authorize_http_auth
   #   Site.connection.execute "UPDATE sites SET http_auth = 1 WHERE id = #{sites_id(:zena)}"
@@ -71,8 +137,8 @@ class NavigationTest < Zena::Integration::TestCase
     assert_redirected_to "http://test.host/oo"
     # 2. navigating out of '/oo' but logged in and format is not data, custom_base url (format not in path)
     assert_equal 'en', session[:lang]
-    get 'http://test.host/fr/projects/cleanWater'
-    assert_redirected_to 'http://test.host/oo/projects/cleanWater'
+    get 'http://test.host/fr/page18.html'
+    assert_redirected_to 'http://test.host/oo/page18.html'
     assert_equal 'fr', session[:lang]
     follow_redirect!
     assert_response :success
@@ -189,6 +255,11 @@ class NavigationTest < Zena::Integration::TestCase
     assert_equal 'fr', session[:lang]
   end
 
+  def test_url_with_custom_base
+    get 'http://test.host/en/projects-list/Clean-Water-project'
+    assert_response :success
+  end
+
   def test_nodes_redirect
     get 'http://test.host/nodes/30'
     assert_redirected_to 'http://test.host/en/image30.html'
@@ -197,22 +268,22 @@ class NavigationTest < Zena::Integration::TestCase
   end
 
   def test_url_without_lang_redirect
-    get 'http://test.host/project29.html'
-    assert_redirected_to 'http://test.host/en/project29.html'
+    get 'http://test.host/blog29.html'
+    assert_redirected_to 'http://test.host/en/blog29.html'
     follow_redirect!
     assert_response :success
   end
 
   def test_url_without_lang_redirect_keeps_url_params
-    get 'http://test.host/project29.html?page=2'
-    assert_redirected_to 'http://test.host/en/project29.html?page=2'
+    get 'http://test.host/blog29.html?page=2'
+    assert_redirected_to 'http://test.host/en/blog29.html?page=2'
     follow_redirect!
     assert_response :success
   end
 
   def test_url_bad_class_redirect_keeps_url_params
     get 'http://test.host/en/page29.html?page=2'
-    assert_redirected_to 'http://test.host/en/project29.html?page=2'
+    assert_redirected_to 'http://test.host/en/blog29.html?page=2'
     follow_redirect!
     assert_response :success
   end
@@ -221,16 +292,16 @@ class NavigationTest < Zena::Integration::TestCase
     get 'http://test.host/29'
     assert_redirected_to 'http://test.host/en/29'
     follow_redirect!
-    assert_redirected_to 'http://test.host/en/project29.html'
+    assert_redirected_to 'http://test.host/en/blog29.html'
     follow_redirect!
     assert_response :success
   end
 
   def test_url_by_path_without_lang_redirect
-    get 'http://test.host/projects/wiki'
-    assert_redirected_to 'http://test.host/en/projects/wiki'
+    get 'http://test.host/people'
+    assert_redirected_to 'http://test.host/en/people'
     follow_redirect!
-    assert_redirected_to 'http://test.host/en/project29.html'
+    assert_redirected_to 'http://test.host/en/section12.html'
     follow_redirect!
     assert_response :success
   end
@@ -240,6 +311,14 @@ class NavigationTest < Zena::Integration::TestCase
     assert_response :missing
   end
 
+  def test_bad_url_without_notFound_template
+    $_test_site = 'zena'
+    Node.connection.execute "UPDATE nodes SET kpath='N' where id = #{nodes_id(:Node_not_found_zafu)}"
+    post 'http://test.host/session', :login=>'tiger', :password=>'tiger'
+    get 'http://test.host/oo/node1.html'
+    assert_response :missing
+  end
+
   def test_bad_zip
     get 'http://test.host/1'
     assert_redirected_to 'http://test.host/en/1'
@@ -272,7 +351,7 @@ class NavigationTest < Zena::Integration::TestCase
   def test_show_with_mode
     get "http://test.host/en/section12_changes.html"
     assert_response :missing # people is not rendered with 'wiki' mode where 'changes' is defined.
-    get "http://test.host/en/project29_changes.html"
+    get "http://test.host/en/blog29_changes.html"
     assert_response :success
     get 'http://test.host/en/section12_index.html'
     assert_response :missing

data/test/integration/query_node/basic.yml

@@ -4,39 +4,39 @@ default:
     node: 'cleanWater'
     visitor: 'ant'
   src: ""
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
-  res: "crocodiles, lake, lakeAddress, opening, status, track, water"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
+  res: "Etat des travaux, The lake we love, it's a lake, water, crocodiles, super ouverture, Keeping things clean !"
 
 nodes:
   src: "nodes"
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
 
 pages:
   src: "pages"
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NP%' AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
-  res: "crocodiles, status, track"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NP%' AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
+  res: "Etat des travaux, crocodiles, Keeping things clean !"
 
 letters:
   src: "letters"
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NNL%' AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NNL%' AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
 
 nodes_in_site:
-  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} ORDER BY nodes.position ASC, nodes.node_name ASC}"
+  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} ORDER BY nodes.zip ASC}"
 
 pages_in_project:
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NP%' AND nodes.project_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.get_project_id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NP%' AND nodes.project_id = ? ORDER BY nodes.zip ASC}, @node.get_project_id]"
 
 nodes_in_section:
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.section_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.get_section_id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.section_id = ? ORDER BY nodes.zip ASC}, @node.get_section_id]"
 
 nodes_in_self:
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
 
 nodes_in_parent:
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.parent_id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.parent_id]"
 
 children:
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.zip ASC}, @node.id]"
 
 # --- fixed up to here
 
@@ -44,80 +44,83 @@ pages_or_letters:
   context:
     node: zena
   src: pages or letters
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND ((nodes.kpath LIKE 'NP%' AND nodes.parent_id = ?) OR (nodes.kpath LIKE 'NNL%' AND nodes.parent_id = ?)) GROUP BY id ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id, @node.id]"
-  res: "collections, letter, nature, people, projects, skins"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND ((nodes.kpath LIKE 'NP%' AND nodes.parent_id = ?) OR (nodes.kpath LIKE 'NNL%' AND nodes.parent_id = ?)) GROUP BY id ORDER BY nodes.zip ASC}, @node.id, @node.id]"
+  res: "people, projects list, Collections, Nature, zena enhancements, Skins (layout themes)"
 
 project:
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.get_project_id]"
-  res: 'cleanWater'
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.id = ? ORDER BY nodes.zip ASC}, @node.get_project_id]"
+  res: 'Clean Water project'
 
 many_alternatives:
   src: tagged in site or images in site or tags in site
-  sql: "%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND ((nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags)) OR (nodes.kpath LIKE 'NDI%' AND links.id = 0) OR (nodes.kpath LIKE 'NPT%' AND links.id = 0)) GROUP BY nodes.id ORDER BY nodes.position ASC, nodes.node_name ASC}"
-#  res: 'art, bird, cleanWater, flower, lake, menu, news, opening, tree'
+  sql: "%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND ((nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags)) OR (nodes.kpath LIKE 'NDI%' AND links.id = 0) OR (nodes.kpath LIKE 'NPT%' AND links.id = 0)) GROUP BY nodes.id ORDER BY nodes.zip ASC}"
+#  res: "art, bird, Clean Water project, flower, it's a lake, menu, news, opening, tree"
 
 alternatives_same_join:
   src: tagged in site or icons
-  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND ((nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags)) OR (nodes.id = links.target_id AND links.relation_id = _ID(node_has_an_icon) AND links.source_id = ?)) GROUP BY nodes.id ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
-  res: "cleanWater, lake, opening"
+  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND ((nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags)) OR (nodes.id = links.target_id AND links.relation_id = _ID(node_has_an_icon) AND links.source_id = ?)) GROUP BY nodes.id ORDER BY nodes.zip ASC}, @node.id]"
+  res: "Clean Water project, it's a lake, super ouverture"
 
 same_name_as_class:
   context:
     node: 'opening'
   src: "set_tags"
-  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND nodes.id = links.target_id AND links.relation_id = _ID(node_has_tags) AND links.source_id = ? ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id]"
-  res: "art, news"
+  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND nodes.id = links.target_id AND links.relation_id = _ID(node_has_tags) AND links.source_id = ? ORDER BY nodes.zip ASC}, @node.id]"
+  res: "Art, News list"
 
 
 notes_in_project:
-  res: "opening"
+  res: "super ouverture"
 
 vclass_in_project:
   src: "posts in project"
-  res: "opening"
+  res: "super ouverture"
 
 vlcass_or_pages:
   src: "(posts in project) or pages"
-  res: "crocodiles, opening, status, track"
+  res: "Etat des travaux, crocodiles, super ouverture, Keeping things clean !"
 
 find_relation:
   context:
     node: 'ant'
-    class: BaseContact
+    class: Contact
   src: "favorites"
-  res: "nature"
+  res: "Nature"
 
 root:
-  res: "zena"
+  res: "Zena the wild CMS"
+
+self:
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.id = ? ORDER BY nodes.zip ASC}, @node.id]"
 
 children_with_order_clause:
-  src: "children order by node_name ASC"
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.node_name ASC}, @node.id]"
+  src: "children order by position ASC"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.parent_id = ? ORDER BY nodes.position ASC}, @node.id]"
 
 notes_or_news:
   context:
     class: Project
-  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND ((nodes.kpath LIKE 'NN%' AND nodes.parent_id = ? AND links.id = 0) OR (nodes.id = links.source_id AND links.relation_id = _ID(note_has_calendars) AND links.target_id = ?)) GROUP BY nodes.id ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id, @node.id]"
+  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND ((nodes.kpath LIKE 'NN%' AND nodes.parent_id = ? AND links.id = 0) OR (nodes.id = links.source_id AND links.relation_id = _ID(note_has_calendars) AND links.target_id = ?)) GROUP BY nodes.id ORDER BY nodes.zip ASC}, @node.id, @node.id]"
 
 news_or_notes:
   context:
     class: Project
-  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND ((nodes.id = links.source_id AND links.relation_id = _ID(note_has_calendars) AND links.target_id = ?) OR (nodes.kpath LIKE 'NN%' AND nodes.parent_id = ? AND links.id = 0)) GROUP BY nodes.id ORDER BY nodes.position ASC, nodes.node_name ASC}, @node.id, @node.id]"
+  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND ((nodes.id = links.source_id AND links.relation_id = _ID(note_has_calendars) AND links.target_id = ?) OR (nodes.kpath LIKE 'NN%' AND nodes.parent_id = ? AND links.id = 0)) GROUP BY nodes.id ORDER BY nodes.zip ASC}, @node.id, @node.id]"
 
 order_l_status:
   context:
     node:  art
     class: Tag
-  src: "tagged order by l_status ASC, node_name ASC"
-  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags) AND links.target_id = ? ORDER BY links.status ASC, nodes.node_name ASC}, @node.id]"
-  res: "opening, cleanWater"
+  src: "tagged order by l_status ASC, zip ASC"
+  sql: "[%Q{SELECT nodes.*,links.id AS link_id,links.status AS l_status,links.comment AS l_comment,links.date AS l_date FROM links,nodes WHERE #{secure_scope('nodes')} AND nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags) AND links.target_id = ? ORDER BY links.status ASC, nodes.zip ASC}, @node.id]"
+  res: "super ouverture, Clean Water project"
 
 paginate_one:
   src: "nodes in site order by zip limit 2 paginate p"
   # we sort by zip to avoid collation problems when some DB sort Capital letters first
   # and others are case-insensitive.
   sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} ORDER BY nodes.zip LIMIT 2 OFFSET ?}, ((params[:p].to_i > 0 ? params[:p].to_i : 1)-1)*2]"
-  res: "zena, people"
+  res: "Zena the wild CMS, people"
 
 paginate_two:
   context:
@@ -125,4 +128,4 @@ paginate_two:
       p: 2
   src: "nodes in site order by zip limit 2 paginate p"
   sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} ORDER BY nodes.zip LIMIT 2 OFFSET ?}, ((params[:p].to_i > 0 ? params[:p].to_i : 1)-1)*2]"
-  res: "ant, tiger"
+  res: "Solenopsis Invicta, Panthera Tigris Sumatran"