zena 1.2.4 → 1.2.5

data/bricks/zena/zena/migrate/20130712081512_alter_login_users.rb

@@ -0,0 +1,9 @@
+class AlterLoginUsers < ActiveRecord::Migration
+  def self.up
+    change_column :users, :login, :string, :limit => 255
+  end
+
+  def self.down
+    change_column :users, :login, :string, :limit => 20
+  end
+end

data/config/bricks.yml

@@ -9,10 +9,12 @@ test:
   worker:      OFF
   uv:          OFF
   spreadsheet: ON
+  activity:    ON
 
 
 development:
-#  asset_port: 7999
+#  asset_port: 7999  
+  activity:  ON
   mongrel:   OFF
   passenger: ON
   uv:
@@ -53,6 +55,7 @@ production:
 # Port used only to provide assets during custom rendering (pdf).
 # We need this to avoid deadlocks with round-robin based serving.
 #  asset_port: 7999
+  activity:  ON
   cache_path: '/public/cache'
   mongrel:   OFF
   passenger: ON

data/lib/bricks/loader.rb

@@ -33,10 +33,6 @@ module Bricks
       paths_for('models')
     end
 
-    def init_paths
-      paths_for('zena/init.rb')
-    end
-
     def migrations_for(brick)
       File.join(brick_path(brick), 'zena', 'migrate')
     end
@@ -93,7 +89,7 @@ module Bricks
     def load_zafu(mod)
       Bricks::CONFIG.keys.each do |brick_name|
         begin
-          mod.send(:include, eval("Bricks::#{brick_name.capitalize}::ZafuMethods"))
+          mod.send(:include, eval("Bricks::#{brick_name.camelcase}::ZafuMethods"))
         rescue NameError
           # ignore
         end
@@ -121,16 +117,28 @@ module Bricks
         path = File.join(path, 'lib')
         ActiveSupport::Dependencies.autoload_paths      << path
         ActiveSupport::Dependencies.autoload_once_paths << path
-        $LOAD_PATH                                  << 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
+      
+      # execute Zena.use module and load 'init'
+      bricks.each do |path|
+        mod = path.split('/').last
+        mod_path = "bricks/#{mod}"
+        if File.exist?("#{path}/lib/#{mod_path}.rb") # bricks/acl/lib/bricks/acl.rb
+          require mod_path
+          mod = eval "Bricks::#{mod.camelcase}"
+          Zena.use mod
+        
+          init_rb = "#{path}/zena/init.rb"
+          if File.exist?(init_rb)
+            require init_rb
+          end
+        end
       end
     end
   end

data/lib/tasks/zena.rake

@@ -143,6 +143,41 @@ namespace :zena do
       end
     end
   end
+  
+  desc "Create a new site alias, parameters are ALIAS, HOST"
+  task :mkalias => :environment do
+    # 0. set host name
+    unless host = ENV['HOST']
+      puts "Please set HOST to the hostname for the master site. Aborting."
+    else
+      unless ali = ENV['ALIAS']
+        puts "Please set ALIAS to the hostname of the alias site. Aborting."
+      else
+        if Site.find_by_host(ali)
+          puts "Host alias already exists in the database. Aborting."
+        else
+          unless site = Site.find_by_host(host)
+            puts "Master host not found in the database. Aborting."
+          else
+            alias_site = site.create_alias(ali)
+            
+            if alias_site.new_record?
+              puts "Could not create site alias ! Errors:"
+              alias_site.errors.each do |k,v|
+                puts "[#{k}] #{v}"
+              end
+              raise "Aborting."
+            else
+              # 1. create directories and symlinks
+              `rake zena:mksymlinks HOST=#{ali.inspect}`
+
+              puts "Site alias [#{ali} => #{host}] created."
+            end
+          end
+        end
+      end
+    end
+  end
 
   desc "Create symlinks for a site"
   task :mksymlinks => :zena_config do
@@ -362,11 +397,11 @@ namespace :zena do
     if ENV['HOST']
       sites = [Site.find_by_host(ENV['HOST'])]
     else
-      sites = Site.all
+      sites = Site.master_sites
     end
     
     sites.each do |site|
-      Thread.current[:visitor] = site.any_admin
+      setup_visitor(site.any_admin, site)
       
       if ENV['WORKER'] == 'false' || RAILS_ENV == 'test'
         # We avoid SiteWorker by passing nodes.
@@ -387,7 +422,7 @@ namespace :zena do
     if ENV['HOST']
       sites = [Site.find_by_host(ENV['HOST'])]
     else
-      sites = Site.all
+      sites = Site.master_sites
     end
     sites.each do |site|
       # Does not use SiteWorker.
@@ -401,11 +436,11 @@ namespace :zena do
     if ENV['HOST']
       sites = [Site.find_by_host(ENV['HOST'])]
     else
-      sites = Site.all
+      sites = Site.master_sites
     end
     sites.each do |site|
       # We avoid SiteWorker by passing nodes.
-      Thread.current[:visitor] = site.any_admin
+      setup_visitor(site.any_admin, site)
       nodes = Node.find(:all,
         :conditions => ['site_id = ?', site.id]
       )

data/lib/zafu/process/ruby_less_processing.rb

@@ -34,7 +34,8 @@ module Zafu
 
         rubyless_render(@method, params)
       rescue RubyLess::NoMethodError => err
-        parser_continue("#{err.error_message} <span class='type'>#{err.method_with_arguments}</span> (#{node.klass} context)")
+        klass_name = node.list_context? ? "[#{node.klass}]" : node.klass.to_s
+        parser_continue("#{err.error_message} <span class='type'>#{err.method_with_arguments}</span> (#{klass_name} context)")
       rescue RubyLess::Error => err
         parser_continue(err.message)
       end
@@ -181,10 +182,7 @@ module Zafu
           elsif node && node.list_context? && type = safe_method_from(Array, signature, node)
             # FIXME: why do we need this here ? Remove with related code in zafu_safe_definitions ?
             type = type[:class].call(self, node.klass, signature) if type[:class].kind_of?(Proc)
-            type.merge(:receiver => RubyLess::TypedString.new(node.name, :class => Array, :elem => node.klass.first))
-          elsif node && node.list_context? && type = safe_method_from(node.klass.first, signature, node)
-            type = type[:class].call(self, node.klass, signature) if type[:class].kind_of?(Proc)
-            type.merge(:receiver => RubyLess::TypedString.new("#{node.name}.first", :class => node.klass.first, :h => true))
+            type.merge(:receiver => RubyLess::TypedString.new(node.name, :class => Array, :query => node.opts[:query], :elem => node.klass.first))
           elsif @rendering_block_owner && @blocks.first.kind_of?(String) && !added_options
             # Insert the block content into the method: <r:trans>blah</r:trans> becomes trans("blah")
             signature_with_block = signature.dup

data/lib/zena.rb

@@ -333,6 +333,8 @@ EXT_TYPE = [
   [ "movie"     , "video/x-sgi-movie"              ],
   [ "mp2"       , "audio/mpeg"                     ],
   [ "mp3"       , "audio/mpeg"                     ],
+  [ "mp4"       , "video/mp4"                      ],
+  [ "m4v"       , "video/mp4"                      ],
   [ "mpe"       , "video/mpeg"                     ],
   [ "mpeg"      , "video/mpeg"                     ],
   [ "mpg"       , "video/mpeg"                     ],

data/lib/zena/acts/secure.rb

@@ -145,9 +145,10 @@ Just doing the above will filter all result according to the logged in user.
               find[:conditions] = node_find_scope
             end
           elsif klass.column_names.include?('site_id')
-            find[:conditions] = {klass.table_name => {:site_id => visitor.site[:id]}}
+            find[:conditions] = {klass.table_name => {:site_id => visitor.site.id}}
           elsif klass <= ::Site
-            find[:conditions] = {klass.table_name => {:id => visitor.site[:id]}}
+            id = visitor.site.id
+            find[:conditions] = ['id = ? or master_id = ?', id, id]
           end
 
           # FIXME: 'with_scope' is protected now. Can we live with something cleaner like this ?
@@ -309,6 +310,14 @@ def current_site
   visitor.site
 end
 
+# This method should be used to install a given user and site as the current visitor.
+def setup_visitor(user, site)
+  raise "Missing site information" unless site
+  Thread.current[:visitor] = user
+  # Load alias site in visitor
+  user.site = site
+end
+
 # Return the current visitor. Raise an error if the visitor is not set.
 # For controllers, this method must be redefined in Application
 def visitor

data/lib/zena/console.rb

@@ -99,17 +99,18 @@ module Zena
     def login(name, host = nil)
       finder = {}
       finder[:conditions] = cond = [[]]
+      site = nil
       if host
-        finder[:joins] = 'INNER JOIN sites ON sites.id = users.site_id'
-        cond.first << 'sites.host = ?'
-        cond << host.to_s
+        site = Site.find_by_host(host)
+        cond.first << 'site_id = ?'
+        cond << site.id
       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
+        setup_visitor(visitor, site || visitor.site)
         puts "Logged #{visitor.login} in #{visitor.site.host}"
       else
         raise ActiveRecord::RecordNotFound

data/lib/zena/core_ext/string.rb

@@ -101,9 +101,9 @@ class String
   def limit(size, readmore = '…')
     if self.size > size
       # readmore can contain a link: <a...> but this is defined in the zafu template.
-      ::ERB::Util.html_escape(self[0..(size-1)]) + readmore
+      self[0..(size-1)] + readmore
     else
-      ::ERB::Util.html_escape(self)
+      self
     end
   end
 

data/lib/zena/deploy.rb

@@ -162,6 +162,19 @@ Capistrano::Configuration.instance(:must_exist).load do
     run "chown -R www-data:www-data #{sites_root}/#{self[:host]}"
   end
   
+  desc "create a new site alias [-s host='...' -s alias='...' -s pass='...']"
+  task :mkalias, :roles => :app do
+    run "#{in_current} rake zena:mksite HOST='#{self[:host]}' ALIAS='#{self[:alias]}' RAILS_ENV='production'"
+    
+    # Same as mksite
+    self[:host] = self[:alias]
+    run "test -e #{sites_root}/#{self[:host]} || mkdir #{sites_root}/#{self[:host]}"
+    create_vhost
+    create_awstats
+    logrotate
+    run "chown -R www-data:www-data #{sites_root}/#{self[:host]}"
+  end
+  
   task :mksymlinks, :roles => :app do
     run "#{in_current} rake zena:mksymlinks HOST='#{self[:host]}'"
     run "chown -R www-data:www-data #{sites_root}/#{self[:host]}"
@@ -202,15 +215,18 @@ Capistrano::Configuration.instance(:must_exist).load do
   desc "Update vhost configuration file"
   task :create_vhost, :roles => :web do
     unless self[:host]
-      puts "HOST not set (use -s host=...)"
+      puts "HOST not set (use -s host=... -s lang_list=...)"
     else
+      lang = self[:lang] ||= (self[:lang_list] || 'en').split(',').map(&:strip).first
+      self[:lang_list] ||= lang
       vhost_files = []
-      if self[:ssl] == :all
         
-        public_path = Bricks.raw_config['public_path'] || '/public'
-        cache_path  = Bricks.raw_config['cache_path']  || '/public'
+      public_path = Bricks.raw_config['public_path'] || '/public'
+      cache_path  = Bricks.raw_config['cache_path']  || '/public'
+
+      self[:cache_path] = cache_path.sub(%r{^#{public_path}},'')
         
-        self[:cache_path] = cache_path.sub(%r{^#{public_path}},'')
+      if self[:ssl] == :all
         vhost = render("#{templates}/vhost.rhtml", :config => self, :ssl => true, :vhost_port => ':443')
         put(vhost, "#{vhost_root}/#{self[:host]}.ssl")
         vhost_files << "#{self[:host]}.ssl"
@@ -331,7 +347,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       awstats = '/etc/cron.d/awstats'
       run %Q{sed "/config=#{self[:host]} /d" #{awstats} >#{awstats}.tmp && mv #{awstats}.tmp #{awstats}}
 
-      logrotate_conf = "/etc/logrotate.d/#{self[:old_host]}"
+      logrotate_conf = "/etc/logrotate.d/#{db_name}-#{self[:old_host]}"
       run "test -e #{logrotate_conf} && rm #{logrotate_conf} || true"
 
       create_vhost

data/lib/zena/deploy/logrotate_app.rhtml

@@ -1,9 +1,12 @@
+# zena apache2 app logrotate configuration for <%= config[:db_name] %>
+# automatically generated file
+
 <%= config[:app_root] %>/log/production.log {
-	weekly
-	missingok
-	rotate 9
-	compress
-	delaycompress
-	notifempty
-	copytruncate
+  weekly
+  missingok
+  rotate 9
+  compress
+  delaycompress
+  notifempty
+  copytruncate
 }

data/lib/zena/deploy/logrotate_host.rhtml

@@ -1,34 +1,29 @@
+# zena apache2 logrotate configuration for <%= config[:host] %>
+# automatically generated file
+
 <%= config[:sites_root] %>/<%= config[:host] %>/log/apache2.access.log {
-	weekly
-	missingok
-	rotate 52
-	compress
-	delaycompress
-	notifempty
-	create 640 www-data www-data
-	sharedscripts
+  weekly
+  missingok
+  rotate 52
+  compress
+  delaycompress
+  notifempty
+  create 640 www-data www-data
+  copytruncate
+  sharedscripts
   prerotate
   /usr/lib/cgi-bin/awstats.pl -update -config=<%= config[:host] %>
   endscript
-	postrotate
-		if [ -f "`. /etc/apache2/envvars ; echo ${APACHE_PID_FILE:-/var/run/apache2.pid}`" ]; then
-			/etc/init.d/apache2 reload > /dev/null
-		fi
-	endscript
 }
 
 <%= config[:sites_root] %>/<%= config[:host] %>/log/apache2.error.log {
-	weekly
-	missingok
-	rotate 52
-	compress
-	delaycompress
-	notifempty
-	create 640 www-data www-data
-	sharedscripts
-	postrotate
-		if [ -f "`. /etc/apache2/envvars ; echo ${APACHE_PID_FILE:-/var/run/apache2.pid}`" ]; then
-			/etc/init.d/apache2 reload > /dev/null
-		fi
-	endscript
+  weekly
+  missingok
+  rotate 52
+  compress
+  delaycompress
+  notifempty
+  create 640 www-data www-data
+  copytruncate
+  sharedscripts
 }

data/lib/zena/deploy/vhost.rhtml

@@ -75,10 +75,10 @@ end %>
   # Rewrite index to check for static
   RewriteRule ^/$ /index.html [QSA]
 
-  # Serve static (cached) assets
+  # Serve static (recently cached) assets
   RewriteCond %{QUERY_STRING} ^[0-9]+$
-  RewriteCond %{DOCUMENT_ROOT}<%= config[:cache_path] %>%{REQUEST_FILENAME}.%{QUERY_STRING} -f
-  RewriteRule ^/(.*)$ <%= config[:cache_path] %>%{REQUEST_FILENAME}.%{QUERY_STRING} [L]
+  RewriteCond %{DOCUMENT_ROOT}<%= config[:cache_path] %>%{REQUEST_FILENAME} -f
+  RewriteRule ^/(.*)$ <%= config[:cache_path] %>%{REQUEST_FILENAME} [L]
 
   # Static CSS, JS
   RewriteCond %{QUERY_STRING} ^[0-9]+$

data/lib/zena/foxy_parser.rb

@@ -709,7 +709,7 @@ module Zena
       end
 
       def multi_site_id_keys
-        super + ['su', 'anon']
+        super + ['su', 'anon', 'master']
       end
   end
 

data/lib/zena/info.rb

@@ -1,4 +1,4 @@
 module Zena
-  VERSION        = '1.2.4'
+  VERSION        = '1.2.5'
   ROOT           = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/lib/zena/site_worker.rb

@@ -19,7 +19,7 @@ module Zena
     def perform(site = nil)
       if site.nil?
         site ||= Site.find(site_id)
-        Thread.current[:visitor] = site.any_admin
+        setup_visitor(site.any_admin, site)
       end
 
       if page.nil?
@@ -58,7 +58,7 @@ module Zena
 
     # Return a textual description of the operation.
     def info
-      if site_id == current_site.id
+      if site_id == current_site.site_id
         "#{action}, #{_('page')} #{page}/#{page_count}"
       else
         # Do not show jobs from other sites

data/lib/zena/use.rb

@@ -27,7 +27,6 @@ module Zena
       end
 
       def each_module_for(name)
-        create_module_hash
         modules_for(name).each do |mod|
           yield(mod)
         end