zena 0.16.4 → 0.16.5

data/History.txt

@@ -1,11 +1,22 @@
+== 0.16.5 2010-04-15
+
+* 2 major enhancements
+  * added a way to easily check duplicate names when adding documents
+  * ruby 1.9 compatibility fixes
+
+* 3 minor enhancements
+  * better default +login mode
+  * fixed image cache stamp not always used
+  * some minor bug fixes
+
 == 0.16.4 2010-02-22
 
-* 3 major enhancement
+* 3 major enhancements
   * fixed installation and runtime bugs on Windows
   * moved ruby files in 'lib' into their Zena namespace
   * german translations [Lars Kanis]
 
-* 2 minor enhancments
+* 2 minor enhancements
   * fixed edgy bug with name duplicates
   * fixed bug that would show a 'site not found' error instead of a 404
 
@@ -28,13 +39,13 @@
 
 == 0.16.0 2010-01-15
 
-* 3 major enhancements:
+* 3 major enhancements
   * Sphinx search support
   * Authlogic authentification
   * attachments can now be provided with an url
   * added [node:attribute_name] to use in querybuilder
 
-* 5 minor enhancement
+* 5 minor enhancements
   * logrotate setup support with capistrano
   * fixed contact content zip bug
   * fixed fullpath set to NULL instead of kept in sync
@@ -48,11 +59,11 @@
 
 == 0.15.1 2009-10-27
 
-* 2 major enhancements:
+* 2 major enhancements
   * Passenger support (deploy, upload progress)
   * JS popup & gallery support (setting in image formats)
 
-* 6 minor enhancements:
+* 6 minor enhancements
   * fixed some deployment tasks (capistrano)
   * fixed zena:setup task to copy files instead of symlink
   * better versions list and diff select
@@ -62,19 +73,19 @@
 
 == 0.15.0 2009-10-16
 
-* 5 major enhancements:
+* 5 major enhancements
   * running rails 2.3.4
   * installable as gem without RMagick
   * usable as gem with config.gem
   * supports sqlite3
   * 'zena' command to create app
 
-* 3 minor enhancemnts:
+* 3 minor enhancemnts
   * huge speed improvement in version loading
   * massive code cleanup
   * better team workflow (reworked access rights)
 
 == 0.11.1 2009-04-03
 
-* minor enhancements:
+* minor enhancements
   * Better testing of custom queries using latest querybuilder (0.5.2)

data/README.rdoc

@@ -1,63 +1,61 @@
-== DESCRIPTION:
+= DESCRIPTION:
 
 CMS with super natural powers, based on Ruby on Rails
 
 website: http://zenadmin.org
 licence: MIT
 
-== Getting started
+= Getting started
 
- # sudo gem sources -a http://gems.github.com
  # sudo gem install zena
  # zena myapp
+ # cd myapp
+ # rake zena:init RAILS_ENV=production
 
-== Details
+You can now visit http://localhost:3000 (user = admin, password = admin)
 
-Have a look at the generator used by 'zena' command:
+These commands do the following:
 
-http://github.com/zena/zena/blob/master/config/zena.rb
+ 1. Install the zena gem and dependencies
+ 2. Create an empty application
+ 3. ...
+ 4. Create the database, migrate, create the 'localhost' website in 'production' environment and start server.
 
-== Production
+The 'zena:init' rake task does the following:
 
-THE INSTRUCTIONS BELOW NO LONGER APPLY (they need an update since the way to go is
-to use zena as a gem).
-
-You should use capistrano to ease deployment. See 'config/delploy.rb'.
+ # rake db:create RAILS_ENV=production
+ # rake zena:migrate
+ # rake zena:mksite LANG=en RAILS_ENV=production PASSWORD=admin HOST=localhost
+ # script/server -e production
 
-Manual deployment is done with the following commands:
-1. Create the database with (using a mysql client)
-   create database zena DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+Read more: http://zenadmin.org/documentation
 
-2. Create log directory
-   mkdir log
+== Details
 
-3. Rename 'config/database_example.yml' to 'config/database.yml' and update it's content
-   (change user, password if needed)
+Have a look at the generator used by 'zena' command:
 
-4. Migrate the database
-   rake zena:migrate RAILS_ENV=production
+http://github.com/zena/zena/blob/master/config/zena.rb
 
-4. Create a site
-   rake zena:mksite HOST=example.com PASSWORD=secret LANG=en RAILS_ENV=production
+=== Production
 
-5. Login user is 'admin', password is the one set on the line above.
+You should use capistrano to ease deployment. See 'config/delploy.rb'.
 
-== Create a new site
+=== Create a new site
 # rake zena:mksite HOST=example.com PASSWORD=secret RAILS_ENV=production
 
-== Start
+=== Start
 # ruby lib/upload_progress_server.rb start
 # script/server -S config/mongrel_upload_progress.conf
 
-== Stop
+=== Stop
 # ^C  (interrupt)
 # ruby lib/upload_progress_server.rb stop
 
 
-== Login
+=== Login
 You can now login with 'admin' and the password you used to make the site.
 
-== Dependencies
+=== Dependencies
 
 === 1. Original in debian etch (might need to replace jpeg by libjpeg62)
   # aptitude install build-essential apache2 mysql-server libmagick9-dev gs-gpl libssl-dev gettext libgettext-ruby libreadline5 libreadline5-dev zlib1g-dev libncurses5 libncurses5-dev unzip liburi-perl libjpeg-dev subversion ssh sudo awstats
@@ -110,7 +108,7 @@ Versions:
 monit (debian package to monitor your mongrel processes)
 
 
-== Very experimental webDAV
+=== Very experimental webDAV
 Should not be used for production.
 
 add this to nodes_controller macros:

data/Rakefile

@@ -29,6 +29,7 @@ begin
     # Gem dependecies
     Zena.gem_configuration.each do |gem_name, gem_config|
       if gem_config
+        next if gem_config['optional']
         if gem_config['development_only']
           gemspec.add_development_dependency(gem_name, gem_config['version'])
         else

data/app/controllers/nodes_controller.rb

@@ -291,29 +291,50 @@ class NodesController < ApplicationController
   # AJAX HELPER
   # TODO: test
   def attribute
-    method = params[:attr].to_sym
-    if [:v_text, :v_summary, :name, :path, :short_path].include?(method)
+    method = params[:attr]
+    if (params[:pseudo_id] || params[:name]).blank? || !%w{v_title v_text v_summary name path short_path}.include?(method)
+      # Error
+      render :text => ''
+      return
+    end
+
+    if id_query = params[:pseudo_id]
       # '+' are not escaped as they should in ajax query
-      params[:node].sub!(/ +$/) {|spaces| '+' * spaces.length} if params[:node]
-      node_id = secure!(Node) { Node.translate_pseudo_id(params[:node], :id, @node)}
+      id_query.sub!(/ +$/) {|spaces| '+' * spaces.length }
+      node_id = secure!(Node) { Node.translate_pseudo_id(id_query, :id, @node)}
       @node = secure!(Node) { Node.find(node_id) }
+    elsif name_query = params[:name]
+      if name_query =~ /^(.*)\.[a-z]{2,3}$/
+        name_query = $1
+      end
 
-      if method == :path || method == :short_path
-        path = @node.send(method)
-        render :inline=> path.join('/ ')
-      else
-        @text = @node.send(method)
-        if [:v_text, :v_summary].include?(method)
-          render :inline=>"<%= zazen(@text) %>"
-        else
-          render :inline=>@text
-        end
+      conditions = [[]]
+
+      if kpath = params[:kpath]
+        conditions[0] << "kpath LIKE ?"
+        conditions << "#{kpath}%"
       end
+
+      conditions[0] << "name LIKE ?"
+      conditions << "#{name_query}%"
+
+      conditions[0] = conditions[0].join(' AND ')
+      @node = secure!(Node) { Node.find(:first, :conditions => conditions, :order => "zip DESC")}
+    end
+
+    if %w{path short_path}.include?(method)
+      path = @node.send(method)
+      render :text => path.join('/ ')
     else
-      render :inline=>method
+      @text = @node.send(method)
+      if %w{v_text v_summary}.include?(method)
+        render :text => "<%= zazen(@text) %>"
+      else
+        render :text => @text
+      end
     end
   rescue ActiveRecord::RecordNotFound
-    render :inline=>_('node not found')
+    render :text => (params[:pseudo_id] ? _('node not found') : _('new'))
   end
 
   # TODO: test

data/app/models/node.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 =begin rdoc
 A Node is the root class of all elements in the zena application. Class inheritance diagram:
 
@@ -250,7 +251,8 @@ class Node < ActiveRecord::Base
 
     # Return class or virtual class from name.
     def get_class(rel, opts={})
-      class_name = rel.singularize.camelize # mushroom_types ==> MushroomType
+      # mushroom_types ==> MushroomType
+      class_name = rel =~ /\A[a-z]/ ? rel.singularize.camelize : rel
       begin
         klass = Module.const_get(class_name)
         raise NameError unless klass.ancestors.include?(Node)
@@ -1716,4 +1718,4 @@ class Node < ActiveRecord::Base
 
 end
 
-Bricks.apply_patches
+Bricks.apply_patches

data/app/models/virtual_class.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class VirtualClass < ActiveRecord::Base
   attr_accessor :import_result
   belongs_to    :create_group, :class_name => 'Group', :foreign_key => 'create_group_id'

data/app/views/templates/defaults/+login.zafu

@@ -1,32 +1,39 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" do='void' lang="en" set_lang='[v_lang]' xml:lang='en'>
-  <head>
-  <title do='title_for_layout' do='trans'>login</title>
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-  <meta http-equiv="Content-Language" do='void' content='fr-fr' tset_content='[v_lang]_content'/>
 
-  <r:stylesheets name='stylesheets' list='reset,zena,default'/>
+<html xmlns="http://www.w3.org/1999/xhtml" do='void' lang="en" set_lang='[v_lang]' xml:lang='en'>
+<head>
+  <title do='[v_title]' name='title'>Zena site</title>
+  <r:stylesheets list='reset'/>
+<style>
+body { color:#666; background: #ddd url('') no-repeat; font:13px Verdana, Helvetica, sans-serif; }
+a { color:#922; text-decoration:none;}
+.welcome { text-align:center; border-bottom:1px solid grey; padding:10px; background:#aaa; color:#333;}
+table { margin:20px;}
+td { padding:5px; }
+#login_form { border:1px solid grey; background:#eee; width:400px; margin:200px auto; padding:0;}
+</style>
 </head>
-<body>
-  <!-- There was a problem with the rendering of the original zafu code. Using default '+login' template. -->
-  <div id='login_form'><div>
-    <form action="/session" method="post">    <table>
-        <tr>
-          <td><label for='user_login' do='trans'>User name:</label></td>
-          <td><input name="login" size="20" type="text" /></td>
-        </tr>
-        <tr>
-          <td><label for='user_password' do='trans'>Password:</label></td>
 
-          <td><input name="password" size="20" type="password" /></td>
-        </tr>
-        <tr><td></td><td><input name="commit" type="submit" value=" login " /></td></tr>
-      </table>
-    </form></div>
-  </div>
+<body do='void' name='body'>
+    <div id='login_form'>
+      <p class='welcome'><r:t>Login for</r:t> <b do='[v_title]'/></p>
+      <form action="/session" method="post">    <table>
+          <tr>
+            <td><label for='user_login' do='trans'>User name:</label></td>
+            <td><input id='user_login' name="login" size="20" type="text" /></td>
+          </tr>
+          <tr>
+            <td><label for='user_password' do='trans'>Password:</label></td>
+
+            <td><input name="password" size="20" type="password" /></td>
+          </tr>
+          <tr><td></td><td><input name="commit" type="submit" value=" login " /></td></tr>
+        </table>
+      </form>
+    </div>
 <script type="text/javascript">
 window.onload = document.getElementById('user_login').focus();
 </script>
 </body>
-</html>
+</html>

data/app/views/templates/document_create_tabs/_file.rhtml

@@ -5,7 +5,7 @@
 <%= upload_field %>
 
 <label for='node_name'><%= _('title') %></label>
-<input id='node_v_title' type='text' name='node[v_title]'/><br/>
+<input id='node_v_title' type='text' name='node[v_title]' onchange="Zena.get_filename(this,'existing_doc');"/> <%= check_exists(:node => @parent, :watch => 'node_v_title', :kpath => 'ND', :show => 'short_path') %><br/>
 
 <label for='node_v_summary'><%= _('summary') %></label>
 <textarea id='node_v_summary' rows='3' name='node[v_summary]'></textarea><br/>

data/bricks/sphinx/misc/tasks.rb

@@ -97,6 +97,8 @@ namespace :sphinx do
       sphinx_conf.controller.start
 
       if ThinkingSphinx.sphinx_running?
+        # We need to read the pid file from within Zena application (run under www-data user).
+        `chown www-data:www-data #{sphinx_conf.pid_file}`
         puts "Sphinx searchd: started successfully (pid #{ThinkingSphinx.sphinx_pid})."
       else
         tail = `tail -n 10 #{sphinx_conf.searchd_log_file.inspect}`
@@ -134,5 +136,4 @@ namespace :sphinx do
       puts "Sphinx searchd: indexing failed\n#{res}"
     end
   end
-
 end

data/bricks/worker/misc/tasks.rb

@@ -65,4 +65,20 @@ namespace :worker do
     sleep(1)
     worker.start
   end
+
+  desc "Run worker jobs index requests (never returns)"
+  task :run => :environment do
+    require 'delayed/worker'
+    begin
+      require 'thinking_sphinx/deltas/delayed_delta'
+    rescue LoadError
+      # Ignore
+    end
+
+    Delayed::Worker.new(
+      :min_priority => ENV['MIN_PRIORITY'],
+      :max_priority => ENV['MAX_PRIORITY']
+    ).start
+  end
+
 end

data/bricks/worker/misc/worker

@@ -12,7 +12,7 @@ ARGV.each do |arg|
 end
 
 unless %w{index start stop restart}.include?(cmd)
-  puts "Usage: script/sphinx RAILS_ENV=production [index|start|stop|restart]"
+  puts "Usage: script/worker RAILS_ENV=production [start|stop|restart]"
   exit -1
 end
 
@@ -22,7 +22,9 @@ daemon_options = {
   :multiple   => false,
   :dir_mode   => :normal,
   :dir        => File.join(dir, 'log'),
-  :backtrace  => true
+  :backtrace  => true,
+  # Create a worker.output to redirect STDOUT and STDERR
+  :log_output => true,
 }
 
 ARGV.clear
@@ -34,7 +36,15 @@ Daemons.run_proc('worker', daemon_options) do
   Dir.chdir dir
   ENV['RAILS_ENV'] = RAILS_ENV = env
   require File.join('config', 'environment')
-  require 'delayed_job'
+
+  require 'delayed/worker'
+  begin
+    require 'thinking_sphinx/deltas/delayed_delta'
+  rescue LoadError
+    # Ignore
+  end
+
+  puts "Starting worker..."
 
   Delayed::Worker.new.start
 end

data/config/bricks.yml

@@ -8,14 +8,14 @@ development:
   tags:     ON
   captcha:  ON
   sphinx:
-    switch: OFF
+    switch: ON
     activate_if:
       gem: 'thinking_sphinx'
       adapter: 'mysql,postgresql'
     run_if:
       file: 'log/searchd.development.pid'
   worker:
-    switch:  OFF
+    switch:  ON
     activate_if:
       gem: 'delayed_job'
 
@@ -23,7 +23,7 @@ production:
   tags:     ON
   captcha:  ON
   sphinx:
-    switch: OFF
+    switch: ON
     activate_if:
       gem: 'thinking_sphinx'
       adapter: 'mysql,postgresql'

data/config/gems.yml

@@ -1,5 +1,5 @@
 hpricot:
-gettext:        '= 1.93.0'
+gettext:        '>= 1.93.0'
 querybuilder:   '= 0.5.8'
 rubyless:       '>= 0.3.5'
 ruby-recaptcha: '= 1.0.0'

data/db/init/base/skins/default/Node-+login.zafu

@@ -1,9 +1,23 @@
-<r:include template='Node'>
-  <r:with part='menu'/>
-  <r:with part='visitor'/>
-  <r:with part='search'/>
-  <r:with part='container'>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" do='void' lang="en" set_lang='[v_lang]' xml:lang='en'>
+<head>
+  <title do='[v_title]' name='title'>Zena site</title>
+  <r:stylesheets list='reset'/>
+<style>
+body { color:#666; background: #ddd url('') no-repeat; font:13px Verdana, Helvetica, sans-serif; }
+a { color:#922; text-decoration:none;}
+.welcome { text-align:center; border-bottom:1px solid grey; padding:10px; background:#aaa; color:#333;}
+table { margin:20px;}
+td { padding:5px; }
+#login_form { border:1px solid grey; background:#eee; width:400px; margin:200px auto; padding:0;}
+</style>
+</head>
+
+<body do='void' name='body'>
     <div id='login_form'>
+      <p class='welcome'><r:t>Login for</r:t> <b do='[v_title]'/></p>
       <form action="/session" method="post">    <table>
           <tr>
             <td><label for='user_login' do='trans'>User name:</label></td>
@@ -21,5 +35,5 @@
 <script type="text/javascript">
 window.onload = document.getElementById('user_login').focus();
 </script>
-  </r:with>
-</r:include>
+</body>
+</html>

data/db/schema.rb

@@ -80,6 +80,19 @@ ActiveRecord::Schema.define(:version => 20100115134729) do
     t.decimal  "value_b",    :precision => 24, :scale => 8
   end
 
+  create_table "delayed_jobs", :force => true do |t|
+    t.integer  "priority",   :default => 0
+    t.integer  "attempts",   :default => 0
+    t.text     "handler"
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "discussions", :force => true do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -176,6 +189,7 @@ ActiveRecord::Schema.define(:version => 20100115134729) do
     t.integer  "custom_a"
     t.integer  "custom_b"
     t.text     "vhash"
+    t.boolean  "delta",                       :default => true,  :null => false
   end
 
   create_table "relations", :force => true do |t|

data/lib/bricks/requirements_validation.rb

@@ -8,15 +8,14 @@ module Bricks
       errors = []
       requirements.each do |k,v|
         case k
-        # bad idea, this is run before gem version configuration
-        # when 'gem'
-        #   v.split(',').each do |name|
-        #     begin
-        #       require name.strip
-        #     rescue LoadError => err
-        #       errors << "'#{name}' missing"
-        #     end
-        #   end
+        when 'gem'
+          v.split(',').each do |name|
+            begin
+              require name.strip
+            rescue LoadError => err
+              errors << "'#{name}' missing"
+            end
+          end
         when 'file'
           v.split(',').each do |name|
             unless File.exist?("#{RAILS_ROOT}/#{name}")
@@ -52,7 +51,7 @@ module Bricks
               if defined?(ActiveRecord::Base) && logger = ActiveRecord::Base.logger
                 ActiveRecord::Base.logger.warn "'#{brick}' not activated: #{errors.join(', ')}"
               end
-              puts "'#{brick}' not activated: #{errors.join(', ')}" if RAILS_ENV == 'development'
+              # puts "'#{brick}' not activated: #{errors.join(', ')}" if RAILS_ENV == 'development'
             end
           end
           config[brick] = opts unless errors

data/lib/zena/core_ext/string.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 # FIXME: do we really need to monkey patch String ?
 
 # Avoid incompatibility with rails 'chars' version in Ruby 1.8.7
@@ -71,4 +72,4 @@ class String
     (root + path).join('/')
   end
 
-end
+end

data/lib/zena/info.rb

@@ -9,7 +9,7 @@ ZENA_CALENDAR_LANGS = ["en", "fr", "de"] # FIXME: build this dynamically from ex
 ENABLE_XSENDFILE = false
 
 module Zena
-  VERSION = '0.16.4'
+  VERSION = '0.16.5'
   REVISION = 1336
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/lib/zena/use/grid.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'json'
 
 module Zena
@@ -145,4 +146,4 @@ module Zena
       end
     end # Grid
   end # Use
-end # Zena
+end # Zena

data/lib/zena/use/html_tags.rb

@@ -307,11 +307,42 @@ module Zena
           end
           input_id = opt[:input_id] ? " id='#{params[:input_id]}'" : ''
           # we use both 'onChange' and 'onKeyup' for old javascript compatibility
-          update = "new Ajax.Updater('#{name_ref}', '/nodes/#{(node || @node).zip}/attribute?node=' + this.value + '&attr=#{attribute}', {method:'get', asynchronous:true, evalScripts:true});"
+          update = "new Ajax.Updater('#{name_ref}', '/nodes/#{(node || @node).zip}/attribute?pseudo_id=' + this.value + '&attr=#{attribute}', {method:'get', asynchronous:true, evalScripts:true});"
           "<div class='select_id'><input type='text' size='8'#{input_id} name='#{obj}[#{sym}]' value='#{zip}' onChange=\"#{update}\" onKeyup=\"#{update}\"/>"+
           "<span class='select_id_name' id='#{name_ref}'>#{current}</span></div>"
         end
 
+        # TODO: select_id should use 'check_exists'
+        def check_exists(opts)
+          watch  = opts[:watch] || 'node_v_title'
+          name_ref = unique_id
+          params = []
+
+          # Filtering key
+          key = 'name'
+          params << "#{key}=' + this.value + '"
+
+          # Attribute to display
+          attribute = opts[:show] || 'short_path'
+          params << "attr=#{attribute}"
+
+          # Scoping
+          if kpath  = opts[:kpath]
+            params << "kpath=#{kpath}"
+          end
+
+          function_name = "check#{unique_id}"
+          js_data << "#{function_name} = function(event) {
+            new Ajax.Updater('#{name_ref}', '/nodes/#{(opts[:node] || @node).zip}/attribute?#{params.join('&')}', {method:'get', asynchronous:true, evalScripts:true});
+          };"
+
+          js_data << "$('#{watch}').check_exists = #{function_name};"
+          js_data << "Event.observe('#{watch}', 'change', #{function_name});"
+          js_data << "Event.observe('#{watch}', 'keyup', #{function_name});"
+
+          "<span class='select_id_name' id='#{name_ref}'>#{opts[:current]}</span>"
+        end
+
         def unique_id
           @counter ||= 0
           "#{Time.now.to_i}_#{@counter += 1}"

data/lib/zena/use/rendering.rb

@@ -241,6 +241,9 @@ module Zena
           path = ((path.empty? || path == "/") ? "/index" : URI.unescape(path))
           ext = params[:format].blank? ? 'html' : params[:format]
           path << ".#{ext}" unless path =~ /\.#{ext}(\?\d+|)$/
+          if cachestamp_format?(params['format'])
+            path << "?" << make_cachestamp(@node, params['mode'])
+          end
           path
         end
 

data/public/javascripts/zena.js

@@ -132,6 +132,9 @@ Zena.get_filename = function(source, target) {
     var path = $(source).value;
     var elements = path.split(/[\\\/]+/g);
     $(target).value = elements[elements.length - 1];
+    if ($(target).check_exists) {
+      $(target).check_exists();
+    }
   }
 }
 

data/test/functional/nodes_controller_test.rb

@@ -68,7 +68,7 @@ class NodesControllerTest < Zena::Controller::TestCase
         # cache info ok
         get 'show', :prefix => 'en', :path => ["image#{node.zip}.jpg"], :cachestamp => node.updated_at.to_i
         assert_response :success
-        assert File.exist?("#{SITES_ROOT}/test.host/public/en/image#{node.zip}.jpg")
+        assert File.exist?("#{SITES_ROOT}/test.host/public/en/image#{node.zip}.jpg?#{node.updated_at.to_i}")
       end
     end
   end
@@ -136,7 +136,8 @@ END:VCALENDAR
     node = secure!(Node) { nodes(:style_css) }
     without_files('/test.host/public') do
       name = "textdocument#{node.zip}.css"
-      filename = "#{SITES_ROOT}/test.host/public/en/#{name}"
+      base_filename = "#{SITES_ROOT}/test.host/public/en/#{name}"
+      filename = "#{base_filename}?#{node.updated_at.to_i}"
       with_caching do
         assert !File.exist?(filename)
         get 'show', :prefix => 'en', :path => [name], :cachestamp => node.updated_at.to_i
@@ -148,11 +149,13 @@ END:VCALENDAR
         assert node.errors.empty?
         assert_equal Zena::Status[:pub], node.version.status
         assert_equal versions_id(:style_css_en), node.version.id # auto publish
-        assert !File.exist?(filename) # cached page removed
+        assert !File.exist?(filename) # old cached page removed
+        filename = "#{base_filename}?#{node.updated_at.to_i}"
+        assert !File.exist?(filename) # not yet created
         get 'show', :prefix => 'en', :path => [name], :cachestamp => node.updated_at.to_i
         assert_response :success
-        assert_match %r[/\* empty \*/], File.read(filename)
         assert File.exist?(filename) # cached page created again
+        assert_match %r[/\* empty \*/], File.read(filename)
       end
     end
   end

data/test/unit/node_test.rb

@@ -869,6 +869,12 @@ class NodeTest < Zena::Unit::TestCase
     assert_equal TextDocument, Node.get_class('TextDocument')
   end
 
+  def test_get_class_without_plural
+    login(:lion)
+    vclass = VirtualClass.create(:superclass => 'Project', :name => 'Process', :create_group_id =>  groups_id(:public))
+    assert_equal vclass, Node.get_class('Process')
+  end
+
   def test_get_attributes_from_yaml
     f = Tempfile.new('any.yml')
     path = f.path

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "0.16.4"
+  s.version = "0.16.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-02-22}
+  s.date = %q{2010-04-15}
   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}
@@ -1918,7 +1918,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.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{CMS with super natural powers, based on Ruby on Rails}
   s.test_files = [
     "spec/controllers/versions_controller_spec.rb",
@@ -2024,18 +2024,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails>, ["= 2.3.4"])
       s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_runtime_dependency(%q<ts-delayed-delta>, [">= 1.0.2"])
       s.add_runtime_dependency(%q<shoulda>, [">= 2.10.2"])
       s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_runtime_dependency(%q<delayed_job>, [">= 1.8.4"])
       s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_runtime_dependency(%q<yamltest>, [">= 0.5.3"])
-      s.add_runtime_dependency(%q<thinking-sphinx>, [">= 1.3.14"])
       s.add_runtime_dependency(%q<json>, [">= 1.1.9"])
       s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
-      s.add_runtime_dependency(%q<gettext>, ["= 1.93.0"])
+      s.add_runtime_dependency(%q<gettext>, [">= 1.93.0"])
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<rmagick>, [">= 2.10.0"])
       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"])
@@ -2047,18 +2043,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails>, ["= 2.3.4"])
       s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_dependency(%q<ts-delayed-delta>, [">= 1.0.2"])
       s.add_dependency(%q<shoulda>, [">= 2.10.2"])
       s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_dependency(%q<delayed_job>, [">= 1.8.4"])
       s.add_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_dependency(%q<yamltest>, [">= 0.5.3"])
-      s.add_dependency(%q<thinking-sphinx>, [">= 1.3.14"])
       s.add_dependency(%q<json>, [">= 1.1.9"])
       s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
-      s.add_dependency(%q<gettext>, ["= 1.93.0"])
+      s.add_dependency(%q<gettext>, [">= 1.93.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rmagick>, [">= 2.10.0"])
       s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<differ>, [">= 0.1.1"])
       s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
@@ -2071,18 +2063,14 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails>, ["= 2.3.4"])
     s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
     s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-    s.add_dependency(%q<ts-delayed-delta>, [">= 1.0.2"])
     s.add_dependency(%q<shoulda>, [">= 2.10.2"])
     s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-    s.add_dependency(%q<delayed_job>, [">= 1.8.4"])
     s.add_dependency(%q<syntax>, ["= 1.0.0"])
     s.add_dependency(%q<yamltest>, [">= 0.5.3"])
-    s.add_dependency(%q<thinking-sphinx>, [">= 1.3.14"])
     s.add_dependency(%q<json>, [">= 1.1.9"])
     s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
-    s.add_dependency(%q<gettext>, ["= 1.93.0"])
+    s.add_dependency(%q<gettext>, [">= 1.93.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rmagick>, [">= 2.10.0"])
     s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<differ>, [">= 0.1.1"])
     s.add_dependency(%q<RedCloth>, ["= 3.0.4"])

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: zena
 version: !ruby/object:Gem::Version 
-  version: 0.16.4
+  prerelease: false
+  segments: 
+  - 0
+  - 16
+  - 5
+  version: 0.16.5
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -9,229 +14,257 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 +01:00
+date: 2010-04-15 00:00:00 +02:00
 default_executable: zena
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-recaptcha
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: tzinfo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 12
         version: 0.3.12
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rubyless
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 5
         version: 0.3.5
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rails
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 4
         version: 2.3.4
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: uuidtools
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: authlogic
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 3
         version: 2.1.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ts-delayed-delta
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.2
-    version: 
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 2
         version: 2.10.2
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: fast_gettext
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 16
         version: 0.4.16
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: delayed_job
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.4
-    version: 
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: syntax
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: yamltest
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 3
         version: 0.5.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: thinking-sphinx
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.14
-    version: 
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 9
         version: 1.1.9
-    version: 
+  type: :runtime
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: will_paginate
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 12
         version: 2.3.12
-    version: 
+  type: :runtime
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: gettext
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 93
+        - 0
         version: 1.93.0
-    version: 
+  type: :runtime
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rmagick
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.10.0
-    version: 
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: differ
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: RedCloth
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 4
         version: 3.0.4
-    version: 
+  type: :runtime
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: querybuilder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 8
         version: 0.5.8
-    version: 
+  type: :runtime
+  version_requirements: *id018
 description: 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).
 email: gaspard@teti.ch
 executables: 
@@ -2149,18 +2182,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: zena
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: CMS with super natural powers, based on Ruby on Rails