zena 1.0.0.beta2 → 1.0.0.beta3

data/lib/zena/use/zafu_templates.rb

@@ -22,7 +22,7 @@ module Zena
           elsif res = find_document_for_template(path, base_path)
             doc, base_path = res
             # text, fullpath (for recursion testing), base_path
-            return doc.text, doc.fullpath, base_path
+            return doc.text, doc.fullpath, base_path, doc
           else
             nil
           end

data/lib/zena/zafu_compiler.rb

@@ -1,15 +1,19 @@
 require 'zafu'
 
 module Zena
+  # FIXME: replace with (and make sure all is ok!)
+  # ZafuCompiler = Zafu.parser_with_rules(Zafu::All + Zena::Use.modules_for('Zafu'))
+
   ZafuCompiler = Zafu.parser_with_rules([
     Zafu::All,
     Zena::Use::Conditional::ZafuMethods,
     Zena::Use::Context::ZafuMethods,
-    Zena::Use::Display::ZafuMethods,
     Zena::Use::Urls::ZafuMethods,
     Zena::Use::ZafuAttributes::ZafuMethods,
     Zena::Use::ZafuEval::ZafuMethods,
     Zena::Use::QueryBuilder::ZafuMethods,
+    # Has to come after QB
+    Zena::Use::Display::ZafuMethods,
     Zena::Use::I18n::ZafuMethods,
     Zena::Use::Action::ZafuMethods,
     Zena::Use::Dates::ZafuMethods,

data/public/javascripts/zena.js

@@ -283,7 +283,7 @@ Zena.update_rwp = function(inherit_val,r_index,w_index,p_index,s_index) {
     $("node_wgroup_id").selectedIndex = 0;
     $("node_rgroup_id").disabled = true;
     $("node_wgroup_id").disabled = true;
-    $("node_skin" ).disabled = false;
+    $("node_skin_id" ).disabled = false;
     if (p_index != '') {
       $("node_dgroup_id").selectedIndex = 0;
       $("node_dgroup_id").disabled = true;
@@ -291,10 +291,10 @@ Zena.update_rwp = function(inherit_val,r_index,w_index,p_index,s_index) {
   } else if (inherit_val == "1") {
     $("node_rgroup_id").selectedIndex = r_index;
     $("node_wgroup_id").selectedIndex = w_index;
-    $("node_skin" ).selectedIndex     = s_index;
+    $("node_skin_id" ).selectedIndex     = s_index;
     $("node_rgroup_id").disabled = true;
     $("node_wgroup_id").disabled = true;
-    $("node_skin" ).disabled = true;
+    $("node_skin_id" ).disabled = true;
     if (p_index != '') {
       $("node_dgroup_id").selectedIndex = p_index;
       $("node_dgroup_id").disabled = true;
@@ -303,7 +303,7 @@ Zena.update_rwp = function(inherit_val,r_index,w_index,p_index,s_index) {
     $("node_rgroup_id").disabled = false;
     $("node_wgroup_id").disabled = false;
     $("node_dgroup_id").disabled = false;
-    $("node_skin" ).disabled = false;
+    $("node_skin_id" ).disabled = false;
     if (p_index != '') {
       $("node_dgroup_id").disabled = false;
     }

data/public/stylesheets/admin.css

@@ -49,6 +49,7 @@ table.admin td:first-child { border-left: 1px solid #999; }
 .admin .ruby .constant { font-weight:bold;}
 .admin .real_class .ruby .constant { color:#333;}
 .admin .spacer {font-family:monospace;color:#ccc;}
+.admin .spacer span {color:#555; font-weight:bold;}
 .destroy { margin:5px;}
 .destroy input, .destroy form { display:inline; }
 .destroy { border:1px solid #300; padding:3px; background:#fdd; float:right;}

data/test/custom_queries/complex.host.yml

@@ -54,7 +54,7 @@
 
 Node:
   # find all courses that an employee must follow
-  emp_form_dates:
+  emp_form_date:
     # find courses assigned_to pages in job assigned_to CURRENT_NODE (employee)
     main_table: courses
     select:
@@ -90,7 +90,7 @@ Node:
     group: courses.id
     order: priority DESC, last_date ASC, courses.node_name ASC
 
-  course_emp_dates:
+  course_emp_date:
     main_table: employees
     select:
       - employees.id
@@ -125,7 +125,7 @@ Node:
     order: employees.node_name ASC, IF(form.last_date,form.last_date,0) ASC
 
 
-  all_course_emp_dates:
+  all_course_emp_date:
     # assigned_employees from project from assigned_pages from courses in site
     # all courses that need to have a formation created
     main_table: courses

data/test/fixtures/files/translations_fr.yml

@@ -1,4 +1,7 @@
 translations:
   I love: "j'aime"
   words: les mots
-  date_format: '[%d.%m]'
+  date_format: '[%d.%m]'
+  # used to translate dynamic key
+  status: statut
+  lang_en: anglais

data/test/functional/application_controller_test.rb

@@ -21,10 +21,10 @@ end
       @skin_names = ['wiki', 'default']
     end
 
-    notes_template, url = @controller.send(:find_document_for_template, :current_dir=>"", :src=>"default/notes")
+    notes_template, url = @controller.send(:find_document_for_template, :base_path=>"", :src=>"default/notes")
     assert_kind_of Template, notes_template
     assert_equal 'default/notes', url
-    default_css, url    = @controller.send(:find_document_for_template, :current_dir=>"default", :src=>"default.css", :type=>:stylesheet)
+    default_css, url    = @controller.send(:find_document_for_template, :base_path=>"default", :src=>"default.css", :type=>:stylesheet)
     assert_kind_of TextDocument, default_css
     assert_equal 'default/default.css', url
   end

data/test/functional/nodes_controller_test.rb

@@ -126,6 +126,20 @@ class NodesControllerTest < Zena::Controller::TestCase
           assert_response :unauthorized
         end
       end # creating a node
+
+      context 'accessing xml without a token' do
+        subject do
+          {:action => 'search', :qb => 'foos'}
+        end
+
+        should 'return an error' do
+          @request.env['HTTP_ACCEPT'] = 'application/xml'
+          get_subject
+          assert_response 401
+          assert_equal "Authentication token needed.", Hash.from_xml(@response.body)['errors'].first['message']
+        end
+      end # accessing xml without a token
+
     end # with xml
   end # An anonymous user
 
@@ -196,6 +210,29 @@ class NodesControllerTest < Zena::Controller::TestCase
     end # creating a node
 
     context 'using xml' do
+      context 'without being in the api_group' do
+        setup do
+          visitor.site.api_group_id = nil
+        end
+
+        context 'asking for show' do
+          subject do
+            {:action => 'show', :controller => 'nodes', :id => nodes_zip(:projects).to_s, :format => 'xml'}
+          end
+
+          should 'fail' do
+            get_subject
+            assert_response :unauthorized
+          end
+
+          should 'return an xml error' do
+            get_subject
+            assert_match %r{<message>Not in API group.</message>}, @response.body
+          end
+        end
+
+      end # without being in the api_group
+
       context 'asking for show' do
         subject do
           {:action => 'show', :controller => 'nodes', :id => nodes_zip(:projects).to_s, :format => 'xml'}
@@ -262,6 +299,20 @@ class NodesControllerTest < Zena::Controller::TestCase
 
       end
 
+      context 'with a bad request' do
+        subject do
+          {:action => 'search', :qb => 'foos'}
+        end
+
+        should 'return an error' do
+          @request.env['HTTP_ACCEPT'] = 'application/xml'
+          @request.env['HTTP_X_AUTHENTICATION_TOKEN'] = 'mytoken'
+          get_subject
+          assert_response 401
+          assert_equal "Error parsing query \"foos\" (Unknown relation 'foos'.)", Hash.from_xml(@response.body)['errors'].first['message']
+        end
+      end # with a bad request
+
     end # using xml
 
     context 'using html' do
@@ -632,14 +683,15 @@ END:VCALENDAR
     get 'search', 'qb' => 'nodes where (set_tag_id = 33 and hot_id = 22) in site'
     assert_response :success
     assert nodes = assigns(:nodes)
-    assert_equal [nodes_id(:cleanWater)], nodes.map {|r| r.id}
+    assert_equal [nodes_id(:cleanWater)], nodes.map(&:id)
   end
 
-  def test_search_qb_errors
+  def test_find_from_node
     login(:anon)
-    assert_raise(ActiveRecord::StatementInvalid) do
-      get 'search', 'qb' => 'nodes foobar error'
-    end
+    get 'find', :id => nodes_zip(:lake_jpg), 'qb' => 'icon_for', '_find' => 'first'
+    assert_response :success
+    assert nodes = assigns(:nodes)
+    assert_equal nodes_id(:cleanWater), nodes.first.id
   end
 end
 

data/test/functional/users_controller_test.rb

@@ -84,14 +84,16 @@ class UsersControllerTest < Zena::Controller::TestCase
       subject do
         {
           :user   => {
-            "name"       => "Dupont",
-            "lang"       => "fr",
-            "time_zone"  => "Europe/Zurich",
-            "status"     => "50",
-            "password"   => "secret",
-            "login"      => "bolomey",
-            "first_name" => "Paul"
-
+            'name'       => 'Dupont',
+            'lang'       => 'fr',
+            'time_zone'  => 'Europe/Zurich',
+             'status'     => '50',
+            'password'   => 'secret',
+            'login'      => 'bolomey',
+            'first_name' => 'Paul',
+            'group_ids'  => [groups_id(:admin), ''],
+            'email'      => 'paul.bolomey@brainfuck.com',
+            '_'          => '' # This is in the original post
           },
           :action => 'create'
         }
@@ -101,7 +103,6 @@ class UsersControllerTest < Zena::Controller::TestCase
         post_subject
         assert_response :success
         user = assigns(:user)
-        err user
         assert !user.new_record?
       end
 

data/test/functional/virtual_classes_controller_test.rb

@@ -73,6 +73,34 @@ class VirtualClassesControllerTest < Zena::Controller::TestCase
 
       end # creating a virtual class
 
+      context 'creating a role' do
+        subject do
+          {:action => :create, :virtual_class => { :type => 'Role', :name => 'Xkcd', :superclass => 'Section', :create_group_id => groups_id(:public) }}
+        end
+
+        should 'create a new Role' do
+          assert_difference('VirtualClass.count', 0) do
+            assert_difference('Role.count', 1) do
+              post_subject
+            end
+          end
+        end
+
+        should 'set name, superclass and kpath' do
+          post_subject
+          vclass = assigns(:virtual_class)
+          assert_equal 'Xkcd',  vclass.name
+          assert_equal Section, vclass.superclass
+          assert_equal 'NPS',  vclass.kpath
+        end
+
+        should 'redirect to show' do
+          post_subject
+          assert_redirected_to virtual_class_path(assigns(:virtual_class))
+        end
+
+      end # creating a role
+
       context 'displaying a virtual class' do
         subject do
           {:action => :show, :id => roles_id(:Letter)}
@@ -115,6 +143,26 @@ class VirtualClassesControllerTest < Zena::Controller::TestCase
         # TODO: What happens to properties for a class if kpath changes ?
       end # updating a virtual class
 
+      context 'updating a role' do
+        subject do
+          {:action => :update, :id => roles_id(:Original), :virtual_class => { :name => 'Life', :superclass => 'Post'}}
+        end
+
+        should 'redirect to show' do
+          put_subject
+          assert_redirected_to virtual_class_path(assigns(:virtual_class))
+        end
+
+        should 'save name and kpath' do
+          put_subject
+          vclass = assigns(:virtual_class)
+          assert_equal 'Life', vclass.name
+          assert_equal 'NNP',  vclass.kpath
+        end
+
+        # TODO: What happens to properties for a class if kpath changes ?
+      end # updating a virtual class
+
       context 'destroying a virtual class' do
         subject do
           {:action => :destroy, :id => roles_id(:Letter)}

data/test/integration/navigation_test.rb

@@ -13,8 +13,9 @@ class NavigationTest < Zena::Integration::TestCase
     get 'http://test.host/'
     assert_redirected_to 'http://test.host/login'
 
-    reset!
     post 'http://test.host/session', :login=>'tiger', :password=>'tiger'
+    assert_redirected_to "http://test.host/"
+    follow_redirect!
     assert_redirected_to "http://test.host/oo"
 
     # 2. navigating out of '/oo' but logged in and format is not data
@@ -26,6 +27,17 @@ class NavigationTest < Zena::Integration::TestCase
     assert_response :success
   end
 
+  def test_should_not_redirect_to_css
+
+    # 1. site forces authentication
+    Site.connection.execute "UPDATE sites SET authentication = 1 WHERE id = #{sites_id(:zena)}"
+    get 'http://test.host/en/textdocument53.css' # style_css
+    assert_redirected_to 'http://test.host/login'
+
+    post 'http://test.host/session', :login=>'tiger', :password=>'tiger'
+    assert_redirected_to "http://test.host/oo"
+  end
+
   # HTTP_AUTH disabled
   # def test_authorize_http_auth
   #   Site.connection.execute "UPDATE sites SET http_auth = 1 WHERE id = #{sites_id(:zena)}"

data/test/integration/query_node/filters.yml

@@ -116,6 +116,11 @@ role_as_relation_filter:
   sql: "%Q{SELECT nodes.* FROM nodes,nodes_roles WHERE #{secure_scope('nodes')} AND nodes_roles.role_id = 493147733 AND nodes_roles.node_id = nodes.id ORDER BY nodes.position ASC, nodes.node_name ASC}"
   res: 'tree'
 
+filter_by_parent:
+  src: "nodes where parent_id = 11 in site"
+#       nodes where parent.zip = ...
+  sql: "%Q{SELECT nodes.* FROM nodes,nodes AS jn1 WHERE #{secure_scope('nodes')} AND jn1.zip = 11 AND jn1.id = nodes.parent_id AND jn1.site_id = nodes.site_id ORDER BY nodes.position ASC, nodes.node_name ASC}"
+  res: 'collections, letter, nature, people, projects, skins'
 #many_role_filter:
 # This is not working (or clause on 'indexed' fields is not supported right now)
 #  src: "nodes where role = Original or role = Task in site"

data/test/integration/query_node_test.rb

@@ -6,7 +6,7 @@ class QueryNodeTest < Zena::Unit::TestCase
   safe_method :date => Time
   safe_method :params => StringDictionary
 
-  def safe_method_type(signature)
+  def safe_method_type(signature, receiver = nil)
     # TODO: we could use the @context[:node] to get real class..
     if type = Node.safe_method_type(signature)
       type.merge(:method => "@node.#{type[:method]}")

data/test/integration/zafu_compiler/ajax.yml

@@ -15,19 +15,6 @@ add:
   'ajax/add/en/children_form.erb': "/class='form' id='<%= ndom_id\(@node\) %>'/"
   'ajax/add/en/children.erb': "<li id='<%= ndom_id(@node) %>'><a href='<%= zen_path(@node) %>'><%= @node.prop['title'] %></a></li>"
 
-zazen_edit:
-  src: "<r:zazen attr='node_name' edit='true'/>"
-  tem: "<div class='zazen' id='list1_name'><% if @node.can_write? -%><span class='zazen_edit'><%= link_to_remote(\"edit\", :url => edit_node_path(@node.zip) + \"?attribute=name&dom_id=list1_name&zazen=true\", :method => :get) %></span><% end -%><%= zazen(@node.name, :node=>@node) %></div>"
-  res: "/div class='zazen' id='list1_name'>.*Ajax\.Request\('/nodes/22/edit\?attribute=name/"
-
-zazen_edit_publish_force:
-  src: "<r:zazen attr='d_some_attr' edit='true' publish='force'/>"
-  tem: "/attribute=d_some_attr&dom_id=.*_some_attr&publish=force&zazen=true/"
-
-zazen_edit_publish_true:
-  src: "<r:zazen attr='d_some_attr' edit='true' publish='true'/>"
-  tem: "/attribute=d_some_attr&dom_id=.*_some_attr&publish=true&zazen=true/"
-
 edit_not_each:
   src: "<li class='blah'>this is a post <r:edit>edit post</r:edit></li>"
   res: "/<li class='blah'>this is a post <a href='/nodes/22/edit'>edit</a></li>/"
@@ -53,7 +40,7 @@ each_add_with_form:
       <li do='add'>add new</li>
       <li do='form'><input name='title'/> this is the form</li>
     </ol>
-  res: "/<li id='list1_30'>bird.*<li id='list1_31'>flower.*<li.*list1_add.*list1_form.*toggle.*<li style.*none.*list1_form.*Ajax.Request.*input type='hidden' name='t_url' value=.ajax/each/add/with/form/list1.*input type='hidden' name='node\[parent_id\]' value=.29./"
+  res: "/<li id='list2_30'>bird.*<li id='list2_31'>flower.*<li.*list1_add.*list1_form.*toggle.*<li style.*none.*list1_form.*Ajax.Request.*input type='hidden' name='t_url' value=.ajax/each/add/with/form/list1.*input type='hidden' name='node\[parent_id\]' value=.29./"
 
 each_add_with_form_in_sub_block:
   context:
@@ -88,7 +75,7 @@ each_edit_with_form:
   context:
     node: 'wiki'
   src: "<r:children><li do='each'><r:show attr='node_name'>blah</r:show> <r:edit>edit</r:edit></li>\n<r:form><li><form>this is the form</form></li></r:form></r:children>"
-  res: "/<li id='list1_30'>bird <a href='/nodes/30/edit' onclick='new Ajax.Request\(\"/nodes/30/edit\?.*t_url=ajax%2Feach%2Fedit%2Fwith%2Fform%2Flist1_form/"
+  res: "/<li id='list2_30'>bird <a href='/nodes/30/edit' onclick='new Ajax.Request\(\"/nodes/30/edit\?.*t_url=ajax%2Feach%2Fedit%2Fwith%2Fform%2Flist2_form/"
 
 make_form:
   src: "<ul do='children'><li do='each' do='node_name'/><li do='add'/></ul>"
@@ -101,7 +88,7 @@ each_edit_cannot_write:
     node: 'cleanWater'
     visitor: 'anon'
   src: "<r:children><li do='each'><r:show attr='node_name'>blah</r:show> <r:edit>edit</r:edit></li>\n</r:children>"
-  res: "/<li id='list1_24'>lake</li>.*/"
+  res: "/<li id='list2_24'>lake</li>.*/"
 
 add_each_publish:
   src: "<ul do='children' id='things'><li do='each'>I <p do='node_name'>blah</p></li><li do='add' publish='true'/></ul>"
@@ -167,6 +154,13 @@ draggable_true:
   src: "<r:link draggable='true'/>"
   tem: "/add_drag_id\(\"list1_\#\{@node.zip\}\", .*drag_handle/"
 
+draggable_in_block:
+  # should use 'hooba' class
+  src: "<r:block><r:link draggable='true'/></r:block>"
+  tem: "/add_drag_id\(\"list1_\#\{@node.zip\}\", .*hooba/"
+  res: "<div class='drag' id='list1_22'><a href='/oo/projects/cleanWater/page22.html'>status title</a></div>"
+  js:  "/Zena.draggable\(item, \"hooba\"\)/"
+
 draggable_with_id_set:
   # should not change original id
   src: "<h1 id='title' do='title' draggable='true'/>"
@@ -223,7 +217,7 @@ drop_param:
 
 drop_param_in_each:
   src: "<r:pages do='each' do='drop' change='params' d='foo'><r:show eval='params[:d]'/></r:pages>"
-  tem: "/<div class='drop' id='<%= %Q\{list1_#\{var2.zip\}\} %>'><% add_drop_id\(\"list1_#\{var2.zip\}\"/"
+  tem: "/<div class='drop' id='<%= %Q\{list2_#\{var2.zip\}\} %>'><% add_drop_id\(\"list2_#\{var2.zip\}\"/"
 
 update_target:
   src: "UT: <div id='foo' do='block'>...</div> <r:link update='foo'/>"
@@ -234,8 +228,8 @@ include_update_target:
   tem: "/IUT: UT: <div id='foo'><%= @node.node_name %></div> <a .*zen_path.*onclick='new Ajax.Request/"
 
 id_in_each_group_should_be_scoped:
-  src: "<ul do='comments from nodes in site' do='group' by='discussion_id'><li do='each_group'><r:node do='block' do='swap' states='1,2' attr='custom_a' do='[custom_a]'/></li></ul>"
-  tem: "/grp_list1.each.*<div id='list1_<%= var1.zip %>/"
+  src: "<ul do='comments from nodes in site' do='group' by='discussion_id'><li do='each'><r:node do='block' do='title'/></li></ul>"
+  tem: "/<div id='<%= %Q\{list1_#\{var4.zip\}\} %>'>/"
 
 link_page_next:
   context:

data/test/integration/zafu_compiler/basic.yml

@@ -334,45 +334,7 @@ comments_shown_if_empty_but_can_comment:
   src: "<r:comments><r:each do='[title]'/><r:add/></r:comments>"
   tem: "/if \(list1 = @node.comments\) \|\| \(@node.can_comment\? && list1=\[\]\) -%>/"
 
-date_tformat:
-  context:
-    node: 'people'
-    lang: 'fr'
-  src: "<r:show date='created_at' tformat='%d %B %Y'/>"
-  tem: "<%= format_date(@node.created_at, :format => \"%d %B %Y\") %>"
-  res: "10 mars 2006"
-
-date_tz:
-  context:
-    visitor: 'ant'
-    node: 'people'
-    lang: 'en'
-  src: "<r:show date='created_at' format='%H:%M'/> / <r:show date='created_at' format='%H:%M' time_zone='Asia/Jakarta'/>"
-  res: "01:00 / 07:00"
 
-date_tz_field:
-  context:
-    node: 'projects'
-  src: "<r:pages do='each' join=', '><r:show attr='node_name'/>: <r:show date='created_at' format='%H:%M' time_zone='[d_tz]' time_zone='Europe/Zurich'/> | <r:show date='created_at' format='%H:%M' time_zone='UTC'/></r:pages>"
-  res: "cleanWater: 07:00 | 00:00, wiki: 01:00 | 00:00"
-
-dictionary_fr:
-  context:
-    lang: 'fr'
-  src: "<r:load dictionary='translations'><r:trans>foo</r:trans>: <r:t>I love</r:t> <r:trans>words</r:trans></r:load>"
-  tem: "foo: j'aime les mots"
-  res: "foo: j'aime les mots"
-
-dictionary_de:
-  context:
-    lang: 'de'
-  src: "<r:load dictionary='translations'><r:trans>foo</r:trans>: <r:trans>I love</r:trans> <r:trans>words</r:trans></r:load>"
-  tem: "foo: Ich liebe Wörter"
-  res: "foo: Ich liebe Wörter"
-
-dictionary_tformat:
-  src: "<r:load dictionary='translations'><r:show date='created_at' tformat='date_format'/></r:load>"
-  res: "[10.03]"
 
 captcha:
   context:
@@ -381,40 +343,6 @@ captcha:
   src: "<r:captcha theme='clean'/>"
   res: "/RecaptchaOptions .* theme : .clean./"
 
-date_fr:
-  context:
-    visitor: ant
-    lang: 'fr'
-  src: "<r:show date='created_at' format='%a'/>"
-  res: "ven"
-
-date_fr_lang:
-  context:
-    lang: 'fr'
-  old_src: "<r:show date='created_at' format='%a' lang='en'/>"
-  src: "<r:show attr='created_at' format='%a' lang='en'/>"
-  tem: "<%= format_date(@node.created_at, :lang => \"en\", :format => \"%a\") %>"
-  res: "Fri"
-
-date_context:
-  old_src: "<r:date select='2008-03-02'><r:show date='current_date' format='%A %d.%m.%Y'/></r:date>"
-  src: "<r:show eval='parse_date(\"2008-03-02\")' format='%A %d.%m.%Y'/>"
-  res: "Sunday 02.03.2008"
-
-date_from_params:
-  context:
-    year: 1975
-  old_src: "<r:date select='[param:year]-01-01'><r:show date='current_date' format='%A %d.%m.%Y'/></r:date>"
-  src: "<r:show eval='parse_date(\"#{params[:year]}-01-01\")' format='%A %d.%m.%Y'/>"
-  tem: "<%= format_date(parse_date(\"#{params[:year]}-01-01\"), :format => \"%A %d.%m.%Y\") %>"
-  res: "Wednesday 01.01.1975"
-
-date_from_params_in_query:
-  context:
-    year: 2006
-  src: "<r:date select='[param:year]-01-01'><r:nodes in='site' log='year' do='each' join=', ' do='node_name'/></r:date>"
-  tem: "/(date_format|strftime).*format_date.*params\[:year\].*%Y/"
-  res: "letter, opening"
 
 paginate:
   context: