zena 1.0.0.beta2 → 1.0.0.beta3

data/lib/tasks/zena.rake

@@ -295,45 +295,49 @@ namespace :zena do
 
   desc 'Rebuild foxy fixtures for all sites'
   task :build_fixtures => :environment do
-    Dir["#{RAILS_ROOT}/test/fixtures/*.yml"].each do |f|
-      FileUtils.rm f
-    end
+    if RAILS_ENV != 'test'
+      puts "## You can only build fixtures by using the test environment to avoid loosing data (used = #{RAILS_ENV})"
+    else
+      Dir["#{RAILS_ROOT}/test/fixtures/*.yml"].each do |f|
+        FileUtils.rm f
+      end
 
-    tables = Node.connection.tables
-    ordered_tables = %w{roles versions nodes attachments zips relations links}
-
-    tables -= ordered_tables
-    tables += ordered_tables
-    roles, versions, nodes = nil, nil, nil
-    tables.each do |table|
-      case table
-      when 'roles'
-        roles = Zena::FoxyParser.new(table)
-        roles.run
-      when 'versions'
-        versions = Zena::FoxyParser.new(table)
-        versions.run
-      when 'nodes'
-        nodes = Zena::FoxyParser.new(table, :versions => versions, :roles => roles)
-        nodes.run
-      when 'zips'
-        Zena::FoxyParser.new(table, :nodes => nodes).run
-      when 'relations'
-        Zena::FoxyParser.new(table, :roles => roles).run
-      when 'links'
-        Zena::FoxyParser.new(table, :nodes => nodes).run
-      else
-        Zena::FoxyParser.new(table).run
+      tables = Node.connection.tables
+      ordered_tables = %w{roles versions nodes attachments zips relations links}
+
+      tables -= ordered_tables
+      tables += ordered_tables
+      roles, versions, nodes = nil, nil, nil
+      tables.each do |table|
+        case table
+        when 'roles'
+          roles = Zena::FoxyParser.new(table)
+          roles.run
+        when 'versions'
+          versions = Zena::FoxyParser.new(table)
+          versions.run
+        when 'nodes'
+          nodes = Zena::FoxyParser.new(table, :versions => versions, :roles => roles)
+          nodes.run
+        when 'zips'
+          Zena::FoxyParser.new(table, :nodes => nodes).run
+        when 'relations'
+          Zena::FoxyParser.new(table, :roles => roles).run
+        when 'links'
+          Zena::FoxyParser.new(table, :nodes => nodes).run
+        else
+          Zena::FoxyParser.new(table).run
+        end
       end
-    end
 
-    %w{db:fixtures:load zena:rebuild_index}.each do |task|
-      puts "******************************* #{task}"
-      Rake::Task[task].invoke
-    end
+      %w{db:fixtures:load zena:rebuild_index}.each do |task|
+        puts "******************************* #{task}"
+        Rake::Task[task].invoke
+      end
 
-    index_tables = Node.connection.tables.select {|t| t =~ /^idx_/ }
-    Zena::FoxyParser.dump_fixtures(index_tables)
+      index_tables = Node.connection.tables.select {|t| t =~ /^idx_/ }
+      Zena::FoxyParser.dump_fixtures(index_tables)
+    end
   end
 
   desc 'Rebuild index for all sites (without SiteWorker)'

data/lib/zena.rb

@@ -212,12 +212,11 @@ unless File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml'))
   FileUtils.cp(File.join(Zena::ROOT, 'config', 'database_example.yml'), File.join(RAILS_ROOT, 'config', 'database.yml'))
 end
 
-unless File.exist?(File.join(RAILS_ROOT, 'log'))
-  FileUtils.mkpath(File.join(RAILS_ROOT, 'log'))
-end
-
-unless File.exist?(File.join(RAILS_ROOT, 'sites'))
-  FileUtils.mkpath(File.join(RAILS_ROOT, 'sites'))
+%w{log sites}.each do |dir|
+  path = File.join(RAILS_ROOT, dir)
+  if !File.exist?(path) && !File.symlink?(path)
+    FileUtils.mkpath(path)
+  end
 end
 
 # this list is taken from http://www.duke.edu/websrv/file-extensions.html

data/lib/zena/acts/enrollable.rb

@@ -35,7 +35,7 @@ module Zena
 
         # We overwrite safe_method_type from RubyLess to include the properties loaded
         # with load_roles!.
-        def safe_method_type(signature)
+        def safe_method_type(signature, receiver = nil)
           if signature.size == 1 && (column = loaded_role_properties[signature.first])
             RubyLess::SafeClass.safe_method_type_for_column(column, true)
           else
@@ -59,12 +59,14 @@ module Zena
         end
 
         def all_possible_roles
-          kpaths = []
+          @all_possible_roles ||= begin
+            kpaths = []
 
-          kpath = self.kpath || vclass.kpath
-          kpath.split(//).each_index { |i| kpaths << kpath[0..i] }
-          # FIXME: !! manage a memory cache for Roles
-          Role.all(:conditions => ['kpath IN (?)', kpaths])
+            kpath = self.kpath || vclass.kpath
+            kpath.split(//).each_index { |i| kpaths << kpath[0..i] }
+            # FIXME: !! manage a memory cache for Roles
+            Role.all(:conditions => ['kpath IN (?) AND site_id = ?', kpaths, current_site.id], :order => 'kpath ASC')
+          end
         end
       end # LoadRoles
 
@@ -92,10 +94,13 @@ module Zena
             alias_method_chain :properties=, :enrollable
             alias_method_chain :rebuild_index!, :enrollable
 
+            before_validation  :check_unknown_attributes
             before_validation  :prepare_roles
             after_save  :update_roles
             after_destroy :destroy_nodes_roles
             has_and_belongs_to_many :roles, :class_name => '::Role'
+            safe_context :possible_roles => {:class => [Role], :method => 'zafu_possible_roles'}
+            safe_context :roles => {:class => [Role], :method => 'zafu_roles'}
 
             property do |p|
               p.serialize :cached_role_ids, Array
@@ -106,6 +111,8 @@ module Zena
         def attributes_with_enrollable=(attrs)
           load_roles!
           self.attributes_without_enrollable = attrs
+        rescue ActiveRecord::UnknownAttributeError => err
+          @unknown_attribute_error = err
         end
 
         def properties_with_enrollable=(attrs)
@@ -126,7 +133,31 @@ module Zena
           rebuild_index_without_enrollable!
         end
 
+        def zafu_possible_roles
+          roles = all_possible_roles
+          roles.empty? ? nil : roles
+        end
+
+        def zafu_roles
+          return nil unless role_ids = self.prop['cached_role_ids']
+          # FIXME: memory cache for roles
+          roles = Role.all(:conditions => ['id IN (?) AND site_id = ?', role_ids, current_site.id], :order => 'kpath ASC')
+          roles.empty? ? nil : roles
+        end
+
         private
+          # Do not go any further if the object contains errors
+          def check_unknown_attributes
+            if @unknown_attribute_error
+              name = @unknown_attribute_error.message[%r{unknown attribute: (.+)}, 1]
+              errors.add(name, "unknown attribute")
+              @unknown_attribute_error = nil
+              false
+            else
+              true
+            end
+          end
+
           # Prepare roles to add/remove to object.
           def prepare_roles
             return unless prop.changed?

data/lib/zena/app.rb

@@ -2,21 +2,23 @@ require File.join(File.dirname(__FILE__), 'info')
 
 Zena::Use.module  [
   Zena::Use::Action,
-  Zena::Use::Ajax,
   Zena::Use::Authlogic,
   Zena::Use::Calendar,
   Zena::Use::Context,
   Zena::Use::Dates,
-  Zena::Use::Display,
   Zena::Acts::Enrollable,
   Zena::Use::ErrorRendering,
   Zena::Use::Forms,
   Zena::Use::HtmlTags,
   Zena::Use::I18n,
   Zena::Use::NestedAttributesAlias,
+  # Must appear before Display so that we first try to resolve as QB before r_show fallback.
   Zena::Use::QueryBuilder,
+  Zena::Use::Display,
   Zena::Use::Refactor,
   Zena::Use::Rendering,
+  # Ajax must appear after rendering because it uses 'super' in js_render
+  Zena::Use::Ajax,
   Zena::Use::Upload,
   Zena::Use::Urls,
   Zena::Use::ZafuAttributes,

data/lib/zena/deploy.rb

@@ -30,14 +30,20 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   set :templates, File.join(File.dirname(__FILE__), 'deploy')
   self[:app_type]   ||= :mongrel
-  self[:app_root]   ||= '/var/zena/current'
-  self[:sites_root] ||= '/var/www/zena'
+
+  self[:deploy_to]  ||= "/home/#{db_name}/app"
+  self[:sites_root] ||= "/home/#{db_name}/sites"
+  self[:dump_root]  ||= "/home/#{db_name}/dump"
+
+  self[:app_root]   ||= "#{deploy_to}/current"
+
   self[:balancer]   ||= db_name
+  self[:db_user]    ||= db_name
   self[:runner]     ||= 'root'
   self[:on_stop]    = []
   self[:on_start]   = []
 
-  set :in_current, "cd #{deploy_to}/current &&"
+  set :in_current, "cd #{app_root} &&"
 
   class RenderClass
     def initialize(path)
@@ -67,12 +73,29 @@ Capistrano::Configuration.instance(:must_exist).load do
     self[:on_start] << block
   end
 
+  def ancestry(path)
+    # Build directory ancestry ['/a', '/a/b', '/a/b/c']
+    paths = path.split('/')[1..-1].inject(['']) do |res, cur|
+      res << (res.last + "/#{cur}")
+      res
+    end[1..-1]
+  end
+
   #========================== SOURCE CODE   =========================#
 
 
   desc "set permissions to www-data"
   task :set_permissions, :roles => :app do
-    run "chown -R www-data:www-data #{deploy_to}/current/public #{deploy_to}/current/log #{deploy_to}/current/tmp"
+    directories = [
+      'current/public',
+      'current/tmp',
+      'current/log',
+      'shared/log',
+    ].map {|dir| "#{deploy_to}/#{dir}"}
+
+    # make sure production.log is created before so that it gets the correct permissionsong
+    run "touch #{deploy_to}/shared/log/production.log"
+    run "chown -R www-data:www-data #{directories.join(' ')}"
   end
 
   "Update the currently released version of the software directly via an SCM update operation"
@@ -93,7 +116,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   desc "after code update"
   task :after_update, :roles => :app do
     app_update_symlinks
-    db_update_config
+    db::update_config
     apache2_setup
     migrate
     clear_zafu
@@ -102,7 +125,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "update symlink to 'sites' directory"
   task :app_update_symlinks, :roles => :app do
-    run "test ! -e #{deploy_to}/current/sites || rm #{deploy_to}/current/sites"
+    run "test ! -e #{deploy_to}/current/sites || rm -rf #{deploy_to}/current/sites || true"
     run "ln -sf #{sites_root} #{deploy_to}/current/sites"
     set_permissions
   end
@@ -114,10 +137,11 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "initial app setup"
   task :app_setup, :roles => :app do
-    gem_update
-    run "test -e #{deploy_to}  || mkdir #{deploy_to}"
-    run "test -e #{sites_root} || mkdir #{sites_root}"
-    deploy::setup
+    paths = ancestry(deploy_to) + ancestry(sites_root) + ancestry("#{deploy_to}/shared/log") + ancestry(dump_root)
+
+    paths.uniq.sort.each do |dir|
+      run "test -e #{dir} || mkdir #{dir}"
+    end
   end
 
   #========================== MANAGE HOST   =========================#
@@ -133,7 +157,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   desc "update code in the current version"
   task :up, :roles => :app do
     run "cd #{deploy_to}/current && #{self[:scm] == 'git' ? "git pull origin #{self[:branch] || 'master'}" : 'svn up'} && (echo #{strategy.configuration[:real_revision]} > #{deploy_to}/current/REVISION)"
-    db_update_config
+    db::update_config
     clear_zafu
     clear_cache
     migrate
@@ -173,9 +197,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "test -e /etc/apache2/sites-enabled/#{self[:host]} || a2ensite #{self[:host]}" if debian_host
 
       unless self[:host] =~ /^www/
-        vhost_www = render("#{templates}/vhost_www.rhtml",
-                      :host        => self[:host]
-                      )
+        vhost_www = render("#{templates}/vhost_www.rhtml", :config => self)
         put(vhost_www, "#{vhost_root}/www.#{self[:host]}")
         run "test -e /etc/apache2/sites-enabled/www.#{self[:host]} || a2ensite www.#{self[:host]}" if debian_host
       end
@@ -193,13 +215,13 @@ Capistrano::Configuration.instance(:must_exist).load do
         puts "host or password not set (use -s host=... -s pass=...)"
       else
         # create awstats config file
-        awstats_conf = render("#{templates}/awstats.conf.rhtml", :host => self[:host] )
+        awstats_conf = render("#{templates}/awstats.conf.rhtml", :config => self)
         put(awstats_conf, "/etc/awstats/awstats.#{self[:host]}.conf")
         run "chown www-data:www-data /etc/awstats/awstats.#{self[:host]}.conf"
         run "chmod 640 /etc/awstats/awstats.#{self[:host]}.conf"
 
         # create stats vhost
-        stats_vhost = render("#{templates}/stats.vhost.rhtml", :host => self[:host] )
+        stats_vhost = render("#{templates}/stats.vhost.rhtml", :config => self)
         put(stats_vhost, "#{vhost_root}/stats.#{self[:host]}")
         run "test -e /etc/apache2/sites-enabled/stats.#{self[:host]} || a2ensite stats.#{self[:host]}"
 
@@ -211,7 +233,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "cat /etc/cron.d/awstats | grep \"#{self[:host]}\" || echo \"0,10,20,30,40,50 * * * * www-data [ -x /usr/lib/cgi-bin/awstats.pl -a -f /etc/awstats/awstats.#{self[:host]}.conf -a -r #{sites_root}/#{self[:host]}/log/apache2.access.log ] && /usr/lib/cgi-bin/awstats.pl -config=#{self[:host]} -update >/dev/null\n\" >> /etc/cron.d/awstats"
 
         # create .htpasswd file
-        run "test ! -e #{sites_root}/#{self[:host]}/log/.awstatspw || rm #{sites_root}/#{self[:host]}/log/.awstatspw"
+        run "test ! -e #{sites_root}/#{self[:host]}/log/.awstatspw || rm #{sites_root}/#{self[:host]}/log/.awstatspw || true"
         run "htpasswd -c -b #{sites_root}/#{self[:host]}/log/.awstatspw 'admin' '#{self[:pass]}'"
         run "chmod 600 #{sites_root}/#{self[:host]}/log/.awstatspw"
         run "chown www-data:www-data #{sites_root}/#{self[:host]}/log/.awstatspw"
@@ -269,7 +291,9 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "Apache2 initial setup"
   task :apache2_setup, :roles => :web do
-    self[:ports] = (mongrel_port.to_i...(mongrel_port.to_i + mongrel_count.to_i)).to_a
+    if self[:mongrel_port]
+      self[:ports] = (mongrel_port.to_i...(mongrel_port.to_i + mongrel_count.to_i)).to_a
+    end
     httpd_conf = render("#{templates}/httpd.rhtml", :config => self)
     log_rotate = render("#{templates}/logrotate_app.rhtml", :config => self)
     if debian_host
@@ -293,26 +317,25 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "install zena gem on remote server"
   task :gem_update, :roles => :app do
-    run "gem sources -a http://gems.github.com"
     run "gem install zena"
   end
 
   #========================== MYSQL   ===============================#
 
-  desc "set database.yml file according to settings"
-  task :db_update_config, :roles => :app do
-    db_app_config = render("#{templates}/database.rhtml",
-                  :db_name     => db_name,
-                  :db_user     => db_user,
-                  :db_password => db_password
-                  )
-    put(db_app_config, "#{deploy_to}/current/config/database.yml")
-  end
+  namespace :db do
+    desc "set database.yml file according to settings"
+    task :update_config, :roles => :app do
+      db_app_config = render("#{templates}/database.rhtml",
+                    :db_name     => db_name,
+                    :db_user     => db_user,
+                    :db_password => db_password
+                    )
+      put(db_app_config, "#{deploy_to}/current/config/database.yml")
+    end
 
-  desc "create database"
-  task :db_create, :roles => :db do
-    on_rollback do
-      run "mysql -u root -p -e \"DROP DATABASE #{db_name};\"" do |channel, stream, data|
+    desc "create database"
+    task :create, :roles => :db do
+      run "mysql -u root -p -e \"CREATE DATABASE #{db_name} DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; GRANT ALL ON #{db_name}.* TO '#{db_user}'@'localhost' IDENTIFIED BY '#{db_password}';\"" do |channel, stream, data|
         if data =~ /^Enter password:\s*/m
           logger.info "#{channel[:host]} asked for password"
           channel.send_data "#{password}\n"
@@ -321,121 +344,73 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
-    run "mysql -u root -p -e \"CREATE DATABASE #{db_name} DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; GRANT ALL ON #{db_name}.* TO '#{db_user}'@'localhost' IDENTIFIED BY '#{db_password}';\"" do |channel, stream, data|
-      if data =~ /^Enter password:\s*/m
-        logger.info "#{channel[:host]} asked for password"
-        channel.send_data "#{password}\n"
+    desc "drop database"
+    task :drop, :roles => :db do
+      run "mysql -u root -p -e \"DROP DATABASE #{db_name};\"" do |channel, stream, data|
+        if data =~ /^Enter password:\s*/m
+          logger.info "#{channel[:host]} asked for password"
+          channel.send_data "#{password}\n"
+        end
+        puts data
       end
-      puts data
     end
-  end
 
-  desc "initial database setup"
-  task :db_setup, :roles => :db do
-    transaction do
-      db_create
+    desc "initial database setup"
+    task :setup, :roles => :db do
+      create
     end
-  end
-
-
-  desc "Full initial setup"
-  task :initial_setup do
-    transaction do
-      app_setup
 
-      db_setup
-
-      deploy::update
-
-      apache2_setup
-
-      set_permissions
-
-      start
-    end
-  end
-
-  desc "Database dump"
-  task :db_dump, :roles => :db do
-    run "mysqldump #{db_name} -u root -p > #{deploy_to}/current/#{db_name}.sql" do |channel, stream, data|
-      if data =~ /^Enter password:\s*/m
-        logger.info "#{channel[:host]} asked for password"
-        channel.send_data "#{password}\n"
+    desc "Database dump"
+    task :dump, :roles => :db do
+      run "mysqldump #{db_name} -u root -p | /bin/gzip > #{dump_root}/`date +%Y-%m-%d_%H:%M`.sql.gz" do |channel, stream, data|
+        if data =~ /^Enter password:\s*/m
+          logger.info "#{channel[:host]} asked for password"
+          channel.send_data "#{password}\n"
+        end
+        puts data
       end
-      puts data
     end
-    run "#{in_current} tar czf #{db_name}.sql.tgz #{db_name}.sql"
-    run "#{in_current} rm #{db_name}.sql"
-  end
-
-  desc "Get backup file back"
-  task :get_backup, :roles => :app do
-    get "#{deploy_to}/current/#{db_name}_data.tgz", "./#{db_name}_#{Time.now.strftime '%Y-%m-%d-%H'}.tgz"
-  end
-
-  # FIXME: backup not loading data for every site...
-  desc "Backup all data and bring it backup here"
-  task :backup, :roles => :app do
-    db_dump
-    # key track of the current svn revision for app
-
-    run "#{in_current} svn info > #{deploy_to}/current/zena_version.txt"
-    run "#{in_current} rake zena:full_backup RAILS_ENV='production'"
-    run "#{in_current} tar czf #{db_name}_data.tgz #{db_name}.sql.tgz sites_data.tgz zena_version.txt"
-    get_backup
-  end
+  end # db
+
+  # Would need to be fixed before being used
+  #
+  # desc "Get backup file back"
+  # task :get_backup, :roles => :app do
+  #   get "#{deploy_to}/current/#{db_name}_data.tgz", "./#{db_name}_#{Time.now.strftime '%Y-%m-%d-%H'}.tgz"
+  # end
+  #
+  # # FIXME: backup not loading data for every site...
+  # desc "Backup all data and bring it backup here"
+  # task :backup, :roles => :app do
+  #   db_dump
+  #   # key track of the current svn revision for app
+  #
+  #   run "#{in_current} svn info > #{deploy_to}/current/zena_version.txt"
+  #   run "#{in_current} rake zena:full_backup RAILS_ENV='production'"
+  #   run "#{in_current} tar czf #{db_name}_data.tgz #{db_name}.sql.tgz sites_data.tgz zena_version.txt"
+  #   get_backup
+  # end
 
   Bricks.load_filename('deploy')
 
+  #========================== DEPLOY ===============================#
 
-  #========================== MONGREL ===============================#
-  namespace :mongrel do
-
-    desc "configure mongrel"
-    task :configure, :roles => :app do
-      run "#{in_current} mongrel_rails cluster::configure -e production -p #{mongrel_port} -N #{mongrel_count} -c #{deploy_to}/current -P log/mongrel.pid -l log/mongrel.log -a 127.0.0.1 --user www-data --group www-data"
-      run "#{in_current} echo 'config_script: config/mongrel_upload_progress.conf' >> config/mongrel_cluster.yml"
-    end
+  namespace :zena do
+    desc "Prepare server for deployment"
+    task :setup, :roles => :app do
+      transaction do
+        app_setup
 
-    desc "Stop the drb upload_progress server"
-    task :upload_progress_stop , :roles => :app do
-      run "#{in_current} ruby lib/upload_progress_server.rb stop"
-    end
-
-    desc "Start the drb upload_progress server"
-    task :upload_progress_start , :roles => :app do
-      run "#{in_current} lib/upload_progress_server.rb start"
-    end
-
-    desc "Restart the upload_progress server"
-    task :upload_progress_restart, :roles => :app do
-      upload_progress_stop
-      upload_progress_start
-    end
-
-    desc "Restart mongrels"
-    task :restart, :roles => :app do
-      stop
-      start
-    end
+        db::setup
 
-    desc "Start mongrels"
-    task :start, :roles => :app do
-      configure
-      upload_progress_start
-      run "#{in_current} mongrel_rails cluster::start"
-    end
-
-    desc "Stop mongrels"
-    task :stop, :roles => :app do
-      configure
-      upload_progress_stop
-      run "#{in_current} mongrel_rails cluster::stop"
+        apache2_setup
+      end
     end
   end
 
-  namespace :deploy do
+  before 'deploy:setup', 'zena:setup'
 
+  namespace :deploy do
     desc "Restart application"
     task :restart, :roles => :app do
 
@@ -446,12 +421,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       self[:on_start].each do |block|
         block.call
       end
-      case self[:app_type]
-      when :mongrel
-        mongrel.restart
-      else
-        puts "'#{self[:app_type]}' not supported."
-      end
+
+      app.restart
     end
 
     desc "Start application"
@@ -461,12 +432,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         block.call
       end
 
-      case self[:app_type]
-      when :mongrel
-        mongrel.start
-      else
-        puts "'#{self[:app_type]}' not supported."
-      end
+      app.start
     end
 
     desc "Stop application"
@@ -476,14 +442,8 @@ Capistrano::Configuration.instance(:must_exist).load do
         block.call
       end
 
-      case self[:app_type]
-      when :mongrel
-        mongrel.stop
-      else
-        puts "'#{self[:app_type]}' not supported."
-      end
+      app.stop
     end
 
-  end
-
+  end # mongrel/deploy
 end