zena 1.0.0 → 1.1.0

data/History.txt

@@ -1,3 +1,31 @@
+== 1.1.0 2011-07-11
+
+* Major changes
+ * Fixed 'cached_pages' indexing.
+ * Added support for haproxy and init.d scripts in cap deploy rules.
+ * Added support for upvalues (variables defined in siblings above).
+ * Added mode and format filters to Acl rules.
+ * Added Selenium testing
+   ** > rake zena:test_server (cleans zafu, setup fixtures, start server)
+   ** > rake test:acceptance
+ * Using up instead of first element in list_context as 'this' (use "first" to obtain old behavior)
+ * Enabled specializable static skins (with proper class loading) to ease code reuse and enable filesystem based development.
+ * Created "Single" brick to ease deployment on shared hosting.
+
+* Minor changes
+ * Fixed 'prefix' option on [url].
+ * Console methods now accept SQLiss.
+ * Admin interface top link moves to page.
+ * Fixed a bug in date parsing: links should use contextual timezone.
+ * Added 'versions' safe method to return list of versions for a node.
+ * Fixed bricks requirements when database.yml is not present.
+ * Fixed [input type='id'] when used on new records.
+ * Fixed bugs in [edit] forms and Ajax [add].
+ * Fixed bugs in [edit] when used with a table.
+ * Fixed initial migration bug when using MySQL.
+ * Fixed loading on shared hosts without rmagick (or with an old version).
+ * Fixed Role icon (sometimes there is a legacy 'icon' column).
+
 == 1.0.0 2011-06-15
 
 * Major changes

data/README.rdoc

@@ -8,9 +8,9 @@ licence: MIT
 = Getting started
 
  # sudo gem install zena
- # zena myapp
+ # zena new myapp
  # cd myapp
- # rake zena:init RAILS_ENV=production
+ # zena init
 
 You can now visit http://localhost:3000 (user = admin, password = admin)
 
@@ -21,11 +21,11 @@ These commands do the following:
  3. ...
  4. Create the database, migrate, create the 'localhost' website in 'production' environment and start server.
 
-The 'zena:init' rake task does the following:
+The 'zena init' task does the following:
 
  # rake db:create RAILS_ENV=production
- # rake zena:migrate
- # rake zena:mksite LANG=en RAILS_ENV=production PASSWORD=admin HOST=localhost
+ # zena migrate
+ # zena mksite LANG=en RAILS_ENV=production PASSWORD=admin HOST=localhost
  # script/server -e production
 
 Read more: http://zenadmin.org/documentation
@@ -41,7 +41,7 @@ http://github.com/zena/zena/blob/master/config/zena.rb
 You should use capistrano to ease deployment. See 'config/delploy.rb'.
 
 === Create a new site
-# rake zena:mksite HOST=example.com PASSWORD=secret RAILS_ENV=production
+# zena mksite HOST=example.com PASSWORD=secret RAILS_ENV=production
 
 === Start
 # ruby lib/upload_progress_server.rb start

data/Rakefile

@@ -27,6 +27,9 @@ begin
     gemspec.rubyforge_project = 'zena'
 
     gemspec.files.exclude 'config/routes.rb'
+    gemspec.files.exclude 'vendor/plugins/selenium-on-rails'
+    gemspec.files.exclude 'vendor/TextMate'
+
 
     # Gem dependecies
     Zena.gem_configuration.each do |gem_name, gem_config|

data/app/controllers/users_controller.rb

@@ -63,8 +63,6 @@ class UsersController < ApplicationController
 
     get_groups_list
 
-    params[:user][:node_attributes] = params[:node]
-
     @user = secure(User) { User.create(params[:user]) }
   end
 
@@ -145,7 +143,11 @@ class UsersController < ApplicationController
     def restrict_access
       if visitor.is_admin?
         @admin = true
+        if params[:user] && params[:node]
+          params[:user][:node_attributes] = params[:node]
+        end
       elsif @user[:id] == visitor[:id]
+        # Cannot change linked node
         if params[:user]
           # visitor changing his/her own info : restrict fields
           params[:user].keys.each do |k|

data/app/models/acl.rb

@@ -5,6 +5,7 @@ class Acl < ActiveRecord::Base
   ACTIONS = %w{read update create delete}
   ACTION_FROM_METHOD = Hash[:get,'read',:put,'update',:post,'create',:delete,'delete']
 
+  before_validation :set_defaults
   before_save   :set_visitor_id, :set_site_id
   belongs_to    :exec_group, :class_name => 'Group', :foreign_key => 'exec_group_id'
   belongs_to    :group
@@ -43,6 +44,11 @@ class Acl < ActiveRecord::Base
   end
 
   protected
+    def set_defaults
+      self.format = 'html' if format.blank?
+      self.mode = '' if mode.nil?
+    end
+
     def set_visitor_id
       self.user_id = visitor.id
     end

data/app/models/cached_page.rb

@@ -126,7 +126,8 @@ class CachedPage < ActiveRecord::Base
 
     # When destroying a cache record, remove the related cached file.
     def cached_page_on_destroy
-      filepath = "#{SITES_ROOT}#{path.gsub('..','')}" # just in case...
+      # allow ../public for single site mode
+      filepath = "#{SITES_ROOT}#{path.gsub(%r{\.\./(?!public)},'NO/')}" # just in case...
       CachedPage.logger.info "remove #{filepath}"
       # if symlink points to a dead file, exist? returns false...
       FileUtils.rm(filepath) if File.exist?(filepath) || File.symlink?(filepath)

data/app/models/document.rb

@@ -72,7 +72,7 @@ class Document < Node
       elsif attrs['title'] =~ /^.*\.(\w+)$/ && types = Zena::EXT_TO_TYPE[$1.downcase]
         content_type = types[0]
       end
-      
+
       real_class = document_class_from_content_type(content_type)
 
       unless vclass && vclass.kpath =~ /\A#{real_class.kpath}/
@@ -91,7 +91,7 @@ class Document < Node
 
     # Compatibility with VirtualClass
     alias new_instance new
-    
+
     # Class list to which this class can change to
     def change_to_classes_for_form
       classes_for_form(:class => 'Document', :without => 'Image')
@@ -148,9 +148,8 @@ class Document < Node
   end
 
   # Get the document's public filename using the name and the file extension.
-  # FIXME: shouldn't we use title here ?
   def filename
-    version.attachment.filename
+    "#{title}.#{ext}"
   end
 
   # Get the file path defined in attachment.

data/app/models/node.rb

@@ -238,12 +238,14 @@ class Node < ActiveRecord::Base
                      :visitor => 'User', [:is_ancestor?, Node] => Boolean,
                      :comments_count => Number,
                      :v => {:class => 'Version', :method => 'version'},
+                     :versions => {:class => ['Version'], :method => 'zafu_versions'},
                      :version => 'Version', :v_status => Number, :v_lang => String,
                      :v_publish_from => Time, :v_backup => Boolean,
                      :zip => Number, :parent_id => {:class => Number, :nil => true, :method => 'parent_zip'},
                      :user => 'User',
                      :author => author_proc,
-                     :vclass => {:class => 'VirtualClass', :method => 'virtual_class'}
+                     :vclass => {:class => 'VirtualClass', :method => 'virtual_class'},
+                     :new_record? => Boolean
 
   # This is needed so that we can use secure_scope and secure in search.
   extend  Zena::Acts::Secure
@@ -888,10 +890,8 @@ class Node < ActiveRecord::Base
           res["#{$1}_zip"] = value
         elsif key =~ /^(\w+)_ids$/
           res["#{$1}_zips"] = value.kind_of?(Array) ? value : value.split(',')
-        elsif key == 'file'
-          unless value.blank?
-            res[key] = value
-          end
+        elsif key == 'v_status' || key == 'file'
+          res[key] = value unless value.blank?
         elsif value.kind_of?(Hash)
           res[key] = transform_attributes(value, base_node, change_timezone, %w{link rel rel_attributes}.include?(key) || is_link)
         else
@@ -933,6 +933,9 @@ class Node < ActiveRecord::Base
     end
   end
 
+  def zafu_versions
+    versions.all(:order => 'number desc')
+  end
   # Remove loaded version and properties on reload.
   def reload
     @version    = nil

data/app/models/site.rb

@@ -421,7 +421,7 @@ class Site < ActiveRecord::Base
   # The visitor used during index rebuild should be an admin user (to index
   # unpublished templates).
   def rebuild_index(nodes = nil, page = nil, page_count = nil)
-    if !nodes
+    if !page
       Site.logger.error("\n----------------- REBUILD INDEX FOR SITE #{host} -----------------\n")
       Zena::SiteWorker.perform(self, :rebuild_index)
     else

data/app/models/template.rb

@@ -14,7 +14,7 @@ Other templates have a title built from the given name, just like any other node
 
 =end
 class Template < TextDocument
-
+  MODE_FORMAT_FROM_TITLE = /^([A-Z][a-zA-Z]+?)(-(([a-zA-Z_\+]*)(-([a-zA-Z_]+)|))|)(\.|\Z)/
   property do |p|
     p.string  'target_klass'
     p.string  'format'
@@ -82,7 +82,7 @@ class Template < TextDocument
       self.content_type = 'text/zafu'
 
       if prop.title_changed?
-        if title =~ /^([A-Z][a-zA-Z]+?)(-(([a-zA-Z_\+]*)(-([a-zA-Z_]+)|))|)(\.|\Z)/
+        if title =~ MODE_FORMAT_FROM_TITLE
           # title changed force  update
           self.target_klass  = $1            unless prop.target_klass_changed?
           self.mode   = ($4 || '')           unless prop.mode_changed?

data/app/models/user.rb

@@ -186,10 +186,12 @@ class User < ActiveRecord::Base
   end
 
   def node_attributes=(node_attrs)
-    if self[:node_id]
+    node_attrs.stringify_keys!
+    if !node_attrs['id'].blank?
+      @node = secure!(Node) { Node.find_node_by_pseudo(node_attrs.delete('id')) }
+      self[:node_id] = @node.id
+    elsif self[:node_id]
       @node = secure!(Node) { node_without_secure }
-    elsif !node_attrs[:id].blank?
-      @node = secure!(Node) { Node.find_node_by_pseudo(node_attrs.delete(:id)) }
     else
       @node = secure(Node) { Node.new_node(prototype_attributes) }
     end

data/app/views/acls/_add.rhtml

@@ -1,5 +1,6 @@
 <tr id='add_acl' class='btn_add'>
-  <td class='add'><%= link_to_function _('btn_acl_add'), "['add_acl', 'add_acl_form'].each(Element.toggle); " %></td><td colspan='6' class='add_user'></td>
+  <td class='add'><%= link_to_function _('btn_acl_add'), "['add_acl', 'add_acl_form'].each(Element.toggle); " %></td>
+  <td colspan='8' class='add_user'></td>
 </tr>
 <tr id='add_acl_form' style='display:none;'>
   <%= render :partial=>'acls/form' %>

data/app/views/acls/_form.rhtml

@@ -5,7 +5,7 @@
     link_to_function _('btn_x'), "['add_acl', 'add_acl_form'].each(Element.toggle);"
   end %>
 </td>
-<td class='add' colspan='6'>
+<td class='add' colspan='8'>
   <div class='errors'><%= error_messages_for(:acl, :object => @acl) %></div>
   <% if @acl[:id] %>
   <%= form_remote_tag(:url=> acl_path(@acl)) %>
@@ -16,35 +16,43 @@
   <% end %>
     <table cellspacing='0'>
       <tr>
-        <td class='label'><%= _('group')%> <%= help('acl_group_help') %></td>
+        <td class='label'><%= _('group')%> <%= help(_('acl_group_help')) %></td>
         <td><%= select('acl', 'group_id',  visitor.all_groups.map{|g| [g.name, g.id]}) %></td>
       </tr>
       <tr>
-        <td class='label'><%= _('action')%> <%= help('acl_action_help') %></td>
+        <td class='label'><%= _('action')%> <%= help(_('acl_action_help')) %></td>
         <td><%= select('acl', 'action',  Acl::ACTIONS ) %></td>
       </tr>
       <tr class='priority'>
-        <td class='label'><%= _('priority')%> <%= help('acl_priority_help') %></td>
+        <td class='label'><%= _('priority')%> <%= help(_('acl_priority_help')) %></td>
         <td><%= text_field('acl', 'priority', :size => 4 ) %></td>
       </tr>
       <tr>
         <td class='label'><%= _('name')%></td>
         <td><%= text_field('acl', 'name',        :size=>15 ) %></td>
       </tr>
+      <tr>
+        <td class='label'><%= _('mode')%> <%= help(_('acl_mode_help')) %></td>
+        <td><%= text_field('acl', 'mode',        :size=>15 ) %></td>
+      </tr>
+      <tr>
+        <td class='label'><%= _('format')%> <%= help(_('acl_format_help')) %></td>
+        <td><%= text_field('acl', 'format',        :size=>15 ) %></td>
+      </tr>
       <tr>
         <td class='label'><%= _('description')%></td>
         <td><%= text_area('acl', 'description', :rows => 2, :cols => 40) %></td>
       </tr>
       <tr>
-        <td class='label'><%= _('query')%> <%= help('acl_query_help') %></td>
+        <td class='label'><%= _('query')%> <%= help(_('acl_query_help')) %></td>
         <td><%= text_area('acl', 'query', :rows => 4, :cols => 40) %></td>
       </tr>
       <tr class='exec'>
-        <td class='label'><%= _('exec group')%> <%= help('acl_exec_group_help') %></td>
+        <td class='label'><%= _('exec group')%> <%= help(_('acl_exec_group_help')) %></td>
         <td><%= select('acl', 'exec_group_id',  visitor.all_groups.map{|g| [g.name, g.id]}, :include_blank => true) %></td>
       </tr>
       <tr class='exec'>
-        <td class='label'><%= _('exec skin')%> <%= help('acl_exec_skin_help') %></td>
+        <td class='label'><%= _('exec skin')%> <%= help(_('acl_exec_skin_help')) %></td>
         <td><%= select('acl', 'exec_skin_id',  form_skins, {:include_blank => true, :selected => @acl.exec_skin_zip}) %></td>
       </tr>
       <tr>

data/app/views/acls/_li.rhtml

@@ -3,6 +3,8 @@
   <td class='group'><%= li.group.name %></td>
   <td class='act'><%= li.action %></td>
   <td class='name'><%= li.name %></td>
+  <td class='mode'><%= li.mode %></td>
+  <td class='format'><%= li.format %></td>
   <td class='query'><%= li.query %></td>
   <td class='exec group'><%= li.exec_group_id ? li.exec_group.name : '' %></td>
   <td class='exec skin'><%= li.exec_skin ? li.exec_skin.title : '' %></td>

data/app/views/acls/index.rhtml

@@ -1,11 +1,13 @@
 <h2 class='title'><%= _('access controls') %></h2>
 <table class="admin" cellspacing="0">
-  <tr><th class='nav' colspan='7'><%= will_paginate @acls %></th></tr>
+  <tr><th class='nav' colspan='9'><%= will_paginate @acls %></th></tr>
   <tr>
     <th>&nbsp;</th>
     <th><%= _('group') %></th>
     <th><%= _('action') %></th>
     <th><%= _('name') %></th>
+    <th><%= _('mode') %></th>
+    <th><%= _('format') %></th>
     <th><%= _('query') %></th>
     <th><%= _('exec group') %></th>
     <th><%= _('exec skin') %></th>

data/app/views/acls/show.html.erb

@@ -1,5 +1,5 @@
 <h3><%= _('access controls') %></h3>
 <table class="admin" cellspacing="0">
-  <tr><th class='nav' colspan='7'>&nbsp;</th></tr>
+  <tr><th class='nav' colspan='9'>&nbsp;</th></tr>
   <%= render :partial=>'acls/li',  :collection=>[@acl] %>
 </table>

data/app/views/links/destroy.rjs

@@ -4,8 +4,22 @@ else
   if @errors || !@node.errors.empty?
     page.replace_html 'link_errors', :inline=> @errors ? render_errors : error_messages_for(:node, :object => @node)
   else
+    dom_id = "link#{@link[:id]}"
     page.replace_html 'link_errors', :inline=>''
-    page.visual_effect :highlight, "link#{@link[:id]}", :duration => 0.3
-    page.visual_effect :fade, "link#{@link[:id]}", :duration => 0.5
+    page << %Q{
+      new Effect.Highlight(
+          '#{dom_id}', {
+              duration: 0.3,
+              afterFinish: function() {
+                  new Effect.Fade('#{dom_id}', {
+                    duration: 0.5,
+                    afterFinish: function() {
+                      $('#{dom_id}').remove();
+                    }
+                  });
+
+              }
+      });
+    }
   end
 end

data/app/views/versions/destroy.rjs

@@ -1,6 +1,6 @@
 # only called when the last version is destroyed in 'drive' popup
 page.replace 'flash_messages', :inline => flash_messages(:page => page)
-page.replace 'versions', :partial => 'list'
+page.remove 'versions'
 page.delay(0.3) do
   page << " if (parent != window) {
    parent.Zena.version_preview('#{zen_path(@node.parent)}');

data/app/views/zafu/default/Node-admin.zafu

@@ -15,7 +15,7 @@
   <r:uses_datebox/>
 </head>
 <body>
-  <h1 id='logo' do='link' href='root' mode='admin' do='t'>admin_interface</h1>
+  <h1 id='logo' do='link'>admin_interface</h1>
   <div id='container'>
     <div id='navigation'>
       <ul id='menu' do='admin_links'>

data/bin/zena

@@ -7,8 +7,10 @@ if %w(--version -v).include? ARGV.first
   exit(0)
 end
 
-if ARGV.first == 'init'
-  exec "rake zena:init RAILS_ENV=#{ARGV[1] || 'production'}"
+ENV['RAILS_ENV'] ||= 'production'
+
+unless ARGV.first == 'new'
+  exec "rake zena:#{ARGV.join(' ')}"
 end
 
 require 'rails/version'
@@ -16,7 +18,7 @@ require 'rails_generator'
 require 'rails_generator/scripts/generate'
 template_path = File.join(Zena::ROOT, 'lib', 'zena', 'deploy', 'template.rb')
 args = ["-m", template_path]
-args << ARGV.first
+args << ARGV[1]
 
 puts "Generating zena application from template #{template_path}"
 Rails::Generator::Base.use_application_sources!

data/bricks/acls/lib/bricks/acls.rb

@@ -8,8 +8,10 @@ module Bricks
       # directory to avoid letting the user render with any zafu template.
       def template_path_from_template_url_with_acls(template_url=params[:t_url])
         if visitor.exec_acl && skin = visitor.exec_acl.exec_skin
+          # Make sure t_url is using templates in the allowed Skin
           skin_name = skin.title.to_filename
           unless template_url[0..skin_name.size] == skin_name + '/'
+            # Wrong Skin !
             Node.logger.warn "Bad t_url used in ACL context (#{template_url}). Visitor = #{visitor.id} // #{visitor.login}"
             # We do not raise AccessViolation to not give hints.
             raise ActiveRecord::RecordNotFound
@@ -32,7 +34,7 @@ module Bricks
       def acl_authorized?(action, params, base_node = nil)
         node = nil
         group_ids_bak = group_ids.dup
-        acls(action).each do |acl|
+        acls(action, params[:mode], params[:format]).each do |acl|
           # Load exec_group to execute query
           if acl.exec_group_id
             @group_ids = group_ids_bak + [acl.exec_group_id]
@@ -55,9 +57,14 @@ module Bricks
       # Find all acls for the visitor for a given action. The action should
       # be one of the following: 'create', 'read', 'update', 'delete'. See
       # Acl::ACTIONS.
-      def acls(action)
+      def acls(action, mode, format)
+        mode = '' if mode.blank?
+        # Can the format be blank ?
+        format = 'html' if format.blank?
         secure(Acl) { Acl.find(:all,
-          :conditions => ['group_id IN (?) and action = ?', group_ids, action],
+          :conditions => [
+            'group_id IN (?) AND action = ? AND (mode = ? OR mode = ?) AND (format = ? OR format = ?)',
+             group_ids, action, '*', mode, '*', format],
           :order => 'priority DESC'
         )} || []
       end
@@ -79,7 +86,7 @@ module Bricks
         else
           acl_params[:id] = zip
         end
-        
+
         visitor.acl_authorized?(::Acl::ACTION_FROM_METHOD[method], acl_params)
       end
     end # UserMethods