zena 1.0.0.rc2 → 1.0.0.rc3

data/lib/bricks/loader.rb

@@ -1,5 +1,7 @@
 module Bricks
   module Loader
+    @@no_init = false
+
     def bricks
       @@bricks ||= bricks_folders.map do |bricks_folder|
         if File.exist?(bricks_folder)
@@ -21,12 +23,12 @@ module Bricks
         !File.exist?(f)
       end
     end
-    
+
     # Find all paths matching 'sub_path' in the active bricks.
     def paths_for(sub_path)
       bricks.map {|f| Dir["#{f}/#{sub_path}"] }.flatten
     end
-    
+
     def models_paths
       paths_for('models')
     end
@@ -36,11 +38,20 @@ module Bricks
     end
 
     def migrations_for(brick)
-      File.join(Zena::ROOT, 'bricks', brick, 'zena', 'migrate')
+      File.join(brick_path(brick), 'zena', 'migrate')
     end
 
     def fixtures_path_for(brick)
-      File.join(Zena::ROOT, 'bricks', brick, 'zena', 'test', 'sites')
+      File.join(brick_path(brick), 'zena', 'test', 'sites')
+    end
+
+    def brick_path(brick)
+      p = nil
+      bricks_folders.each do |f|
+        p = File.join(f, brick)
+        return p if File.exist?(p)
+      end
+      return p
     end
 
     def zafu_tests
@@ -77,17 +88,15 @@ module Bricks
       end
     end
 
-    # FIXME: remove
+    # FIXME: remove when we can use
+    # Zena::Use.modules_for('Zafu')
     def load_zafu(mod)
-      old_foreach_brick do |brick_path|
-        brick_name = File.basename(brick_path)
-        zafu_path  = File.join(brick_path, 'zafu')
-        next unless File.exist?(zafu_path)
-        Dir.foreach(zafu_path) do |rules_name|
-          next if rules_name =~ /\A\./
-          load File.join(zafu_path, rules_name)
+      Bricks::CONFIG.keys.each do |brick_name|
+        begin
+          mod.send(:include, eval("Bricks::#{brick_name.capitalize}::ZafuMethods"))
+        rescue NameError
+          # ignore
         end
-        mod.send(:include, eval("Bricks::#{brick_name.capitalize}::ZafuMethods"))
       end
     end
 
@@ -97,14 +106,28 @@ module Bricks
       end
     end
 
+    def no_init=(v)
+      @@no_init = v
+    end
+
+    # Returns true if the Bricks code should not be executed (such
+    # as during the initial migrations, legacy cleanup, etc).
+    def no_init
+      !Zena::Db.migrated_once? || @@no_init
+    end
+
     def load_bricks
       bricks.each do |path|
         path = File.join(path, 'lib')
-        ActiveSupport::Dependencies.load_paths      << path
-        ActiveSupport::Dependencies.load_once_paths << path
+        ActiveSupport::Dependencies.autoload_paths      << path
+        ActiveSupport::Dependencies.autoload_once_paths << path
         $LOAD_PATH                                  << path
       end
 
+      if @@no_init
+        puts "=> Not executing bricks init code."
+        return
+      end
       # load 'init'
       init_paths.each do |init_path|
         require init_path

data/lib/tasks/zena.rake

@@ -112,7 +112,7 @@ namespace :zena do
     end
   end
 
-  desc "Create a new site, parameters are PASSWORD, HOST, LANG"
+  desc "Create a new site, parameters are PASSWORD, HOST, HOST_LANG"
   task :mksite => :environment do
     # 0. set host name
     unless host = ENV['HOST']
@@ -121,18 +121,18 @@ namespace :zena do
       unless pass = ENV['PASSWORD']
         puts "Please set PASSWORD to the admin password for the new site. Aborting."
       else
-        ENV['LANG'] ||= 'en'
+        ENV['HOST_LANG'] ||= 'en'
         host_path = "#{SITES_ROOT}/#{host}"
         if Site.find_by_host(host)
           puts "Host already exists in the database. Aborting."
         else
-          site = Site.create_for_host(host, pass, :default_lang => ENV['LANG'])
+          site = Site.create_for_host(host, pass, :default_lang => ENV['HOST_LANG'])
           if site.new_record?
             puts "Could not create site ! Errors:"
             site.errors.each do |k,v|
               puts "[#{k}] #{v}"
             end
-            puts "Aborting."
+            raise "Aborting."
           else
             # 1. create directories and symlinks
             `rake zena:mksymlinks HOST=#{host.inspect}`
@@ -155,8 +155,12 @@ namespace :zena do
         next if File.exist?("#{host_path}/#{dir}")
         FileUtils.mkpath("#{host_path}/#{dir}")
       end
-       # FIXME! should not symlink RAILS_ROOT but /home/app_name/app/current ...
-      symlink_assets(RAILS_ROOT, host_path)
+      if RAILS_ROOT =~ /releases\/\d+/
+        root = (Pathname(RAILS_ROOT) + '../../current').to_s
+      else
+        root = RAILS_ROOT
+      end
+      symlink_assets(root, host_path)
     end
   end
 
@@ -245,8 +249,14 @@ namespace :zena do
     puts `#{cmd}`
   end
 
+  desc "Load environment without running brick init code."
+  task :environment_without_bricks do
+    Bricks.no_init = true
+    Rake::Task["environment"].invoke
+  end
+
   desc "Migrate the database through scripts in db/migrate. Target specific brick and version with BRICK=x and VERSION=x"
-  task :migrate => :environment do
+  task :migrate => :environment_without_bricks do
     if ENV['VERSION'] || ENV['BRICK']
       ENV['BRICK']    ||= 'zena'
       # migrate specific bricks only
@@ -285,6 +295,8 @@ namespace :zena do
     if RAILS_ENV == 'production'
       puts "You cannot reset database in production !"
     else
+      ENV['WORKER'] = 'false'
+      # FIXME: it seems the ENV is not propagated to the tasks below...
       %w{db:drop db:create zena:migrate zena:build_fixtures db:test:clone}.each do |task|
         puts "******************************* #{task}"
         Rake::Task[task].invoke
@@ -336,34 +348,67 @@ namespace :zena do
 
       index_tables = Node.connection.tables.select {|t| t =~ /^idx_/ }
       Zena::FoxyParser.dump_fixtures(index_tables)
+      # Currently, inline indexes are not serialized in the fixtures and need to be
+      # explicitely set along with the property value.
     end
   end
 
-  desc 'Rebuild index for all sites (without SiteWorker)'
+  desc 'Rebuild index for all sites or site defined by HOST param.'
   task :rebuild_index => :environment do
     include Zena::Acts::Secure
-
-    Site.all.each do |site|
-      # We avoid SiteWorker because it's async.
-      Thread.current[:visitor] = User.find_by_login_and_site_id(nil, site.id)
-      nodes = Node.find(:all,
-        :conditions => ['site_id = ?', site.id]
-      )
-      site.rebuild_index(secure_result(nodes))
+    if ENV['HOST']
+      sites = [Site.find_by_host(ENV['HOST'])]
+    else
+      sites = Site.all
+    end
+    sites.each do |site|
+      if ENV['WORKER'] == 'false' || RAILS_ENV == 'test'
+        # We avoid SiteWorker by passing nodes.
+        Thread.current[:visitor] = site.any_admin
+        nodes = Node.find(:all,
+          :conditions => ['site_id = ?', site.id]
+        )
+        site.rebuild_index(secure_result(nodes))
+      else
+        # We try to use the site worker.
+        Thread.current[:visitor] = site.any_admin
+        site.rebuild_index
+      end
     end
   end
 
-  desc 'Rebuild fullpath for all sites (without SiteWorker)'
+  desc 'Rebuild fullpath for all sites or site defined by HOST param.'
   task :rebuild_fullpath => :environment do
     include Zena::Acts::Secure
-
-    Site.all.each do |site|
-      # We avoid SiteWorker because it's async.
-      Thread.current[:visitor] = User.find_by_login_and_site_id(nil, site.id)
+    if ENV['HOST']
+      sites = [Site.find_by_host(ENV['HOST'])]
+    else
+      sites = Site.all
+    end
+    sites.each do |site|
+      # Does not use SiteWorker.
       site.rebuild_fullpath
     end
   end
 
+  desc 'Rebuild vhash for all sites or site defined by HOST param.'
+  task :rebuild_vhash => :environment do
+    include Zena::Acts::Secure
+    if ENV['HOST']
+      sites = [Site.find_by_host(ENV['HOST'])]
+    else
+      sites = Site.all
+    end
+    sites.each do |site|
+      # We avoid SiteWorker by passing nodes.
+      Thread.current[:visitor] = site.any_admin
+      nodes = Node.find(:all,
+        :conditions => ['site_id = ?', site.id]
+      )
+      site.rebuild_vhash(secure_result(nodes))
+    end
+  end
+
   Rake::RDocTask.new do |rdoc|
        files = ['README', 'doc/README_FOR_APP', 'CREDITS', 'MIT-LICENSE', 'app/**/*.rb',
                 'lib/**/*.rb']
@@ -476,15 +521,15 @@ namespace :zena do
     # FIXME: how to run sub-task
     ENV['RAILS_ENV'] = RAILS_ENV || 'production'
     ENV['HOST']      ||= 'localhost'
-    ENV['LANG']        = ENV['LANG'].to_s
-    ENV['LANG']        = 'en' if ENV['LANG'].empty?
+    ENV['HOST_LANG']   = ENV['HOST_LANG'].to_s
+    ENV['HOST_LANG']   = 'en' if ENV['HOST_LANG'].empty?
     ENV['PASSWORD']  ||= 'admin'
 
     Rake::Task["db:create"].invoke
     Rake::Task["zena:migrate"].invoke
 
     # We cannot use 'invoke' here because the User class needs to be reloaded
-    env = %w{RAILS_ENV HOST LANG PASSWORD}.map{|e| "#{e}=#{ENV[e]}"}.join(' ')
+    env = %w{RAILS_ENV HOST HOST_LANG PASSWORD}.map{|e| "#{e}=#{ENV[e]}"}.join(' ')
     cmd = "rake zena:mksite #{env}"
     puts cmd
     system(cmd)
@@ -504,5 +549,10 @@ namespace :zena do
       exec cmd
     end
   end
+end # zena
 
+namespace :gettext do
+  def files_to_translate
+    Dir.glob("{app,lib,bricks,config,locale}/**/*.{rb,erb,rjs,rhtml}")
+  end
 end

data/lib/zena/acts/enrollable.rb

@@ -191,8 +191,11 @@ module Zena
 
       module Common
         extend self
+        # Resolve class for @post ==> Post, etc. Used in Zena::Use::Context.
         def get_class(class_name)
-          VirtualClass.find_by_name(class_name)
+          VirtualClass[class_name] || Module.const_get(class_name)
+        rescue NameError => err
+          nil
         end
       end # Common
 

data/lib/zena/acts/secure.rb

@@ -316,54 +316,8 @@ def visitor
 end
 
 if defined?(IRB)
-  puts "IRB console: including Zena::Acts::Secure in main"
+  puts "IRB console: including Zena::Console in main"
   class << self
-    include Zena::Acts::Secure
-
-    def err(obj)
-      obj.errors.each_error do |er,msg|
-        puts "[#{er}] #{msg}"
-      end
-    end
-
-    def rename_prop(list, old_key, new_key)
-      list.each do |rec|
-        prop  = rec.prop
-        if value = prop.delete(old_key)
-          prop[new_key] = value
-          Zena::Db.execute "UPDATE #{rec.class.table_name} SET properties=#{Zena::Db.quote(rec.class.encode_properties(prop))} WHERE id=#{rec[:id]}"
-        end
-      end
-    end
-
-    def login(name, host = nil)
-      finder = {}
-      finder[:conditions] = cond = [[]]
-      if host
-        finder[:joins] = 'INNER JOIN sites ON sites.id = users.site_id'
-        cond.first << 'sites.host = ?'
-        cond << host.to_s
-      end
-
-      cond.first << 'users.login = ?'
-      cond << name.to_s
-      cond[0] = cond.first.join(' AND ')
-      if visitor = User.find(:first, finder)
-        Thread.current[:visitor] = visitor
-        puts "Logged #{visitor.login} in #{visitor.site.host}"
-      else
-        raise ActiveRecord::RecordNotFound
-      end
-    rescue ActiveRecord::RecordNotFound
-      puts "Could not login with user name: #{name}"
-    end
-
-    def nodes(zip_or_name)
-      if zip_or_name.kind_of?(Fixnum)
-        secure(Node) { Node.find_by_zip(zip_or_name) }
-      else
-        secure(Node) { Node.find_by_title(zip_or_name) }
-      end
-    end
+    include Zena::Console
   end
 end

data/lib/zena/acts/serializable.rb

@@ -12,7 +12,6 @@ module Zena
         end
 
         protected
-
           def raw_value
             @raw_value ||= @record.prop[name]
           end
@@ -76,6 +75,17 @@ module Zena
       end
 
       module ModelMethods
+        def self.included(base)
+          class << base
+            cattr_accessor :export_procs
+
+            def export_xml(proc)
+              self.export_procs << proc
+            end
+          end
+          base.export_procs = []
+        end
+
         def to_xml(options = {}, &block)
           options = default_serialization_options.merge(options)
           serializer = XmlNodeSerializer.new(self, options)
@@ -85,6 +95,8 @@ module Zena
         def default_serialization_options
           { :only       => %w{created_at updated_at log_at event_at kpath ref_lang fullpath position},
             :methods    => %w{v_status klass},
+            :procs      => self.class.export_procs,
+            :record     => self, # needed by procs
             :properties => export_properties,
             :ids        => export_ids,
             :dasherize  => false,

data/lib/zena/app.rb

@@ -30,7 +30,16 @@ module Zena
     def self.included(base)
       base.prepend_view_path SITES_ROOT
       base.class_eval do
+        bricks = []
         Zena::Use.each_module_for('Controller') do |mod|
+          if mod.to_s =~ /^Bricks::/
+            bricks << mod
+          else
+            include mod
+          end
+        end
+
+        bricks.each do |mod|
           include mod
         end