zena 1.0.0.beta2 → 1.0.0.beta3

data/app/models/text_document.rb

@@ -43,7 +43,7 @@ class TextDocument < Document
         return text
       end
 
-      current_dir = parent.fullpath
+      base_path = parent.fullpath
 
       res.gsub!(/url\(\s*(.*?)\s*\)/) do
         match, src = $&, $1
@@ -71,7 +71,7 @@ class TextDocument < Document
         else
           if new_src = helper.send(:template_url_for_asset,
               :src          => src,
-              :base_path    => current_dir,
+              :base_path    => base_path,
               :parse_assets => true )
 
             "url(#{quote}#{new_src}#{quote})"
@@ -118,7 +118,7 @@ class TextDocument < Document
     if key == 'text' && prop['content_type'] == 'text/css'
       res = text.dup
       # use parent as relative root
-      current_dir = parent.fullpath
+      base_path = parent.fullpath
 
       res.gsub!(/url\(('|")(.*?)\1\)/) do
         if $2[0..6] == 'http://'
@@ -128,7 +128,7 @@ class TextDocument < Document
           if url =~ /\A\/\w\w\/.*?(\d+)(_\w+|)\./
             zip, mode = $1, $2
             if asset = secure(Node) { Node.find_by_zip(zip) }
-              if asset.fullpath =~ /\A#{current_dir}\/(.+)/
+              if asset.fullpath =~ /\A#{base_path}\/(.+)/
                 "url(#{quote}#{$1}#{mode}.#{asset.prop['ext']}#{quote})"
               else
                 "url(#{quote}/#{asset.fullpath}#{mode}.#{asset.prop['ext']}#{quote})"

data/app/models/user.rb

@@ -192,6 +192,11 @@ class User < ActiveRecord::Base
     status == User::Status[:deleted]
   end
 
+  # Return true if the visitor is allowed API acces
+  def api_authorized?
+    group_ids.include?(current_site.api_group_id)
+  end
+
   # Returns a list of the group ids separated by commas for the user (this is used mainly in SQL clauses).
   # TODO: Performance
   #
@@ -199,9 +204,18 @@ class User < ActiveRecord::Base
   # Zena::Db.fetch_ids("SELECT group_id FROM groups_users WHERE user_id = #{id} ORDER BY name ASC", 'group_id')
   def group_ids
     @group_ids ||= if is_admin?
-      site.groups.map{|g| g[:id]}
+      site.groups.map(&:id)
+    else
+      groups.all(:order=>'name').map(&:id)
+    end
+  end
+
+  # Return all groups (used in forms) managed by the user.
+  def all_groups
+    if is_admin?
+      site.groups
     else
-      groups.find(:all, :order=>'name').map{ |g| g[:id] }
+      groups.all(:order=>'name').map(&:id)
     end
   end
 
@@ -265,13 +279,12 @@ class User < ActiveRecord::Base
 
       @contact = secure!(BaseContact) { BaseContact.new(
         # owner is the user except for anonymous and super user.
-        # TODO: not sure this is a good idea...
-        :user_id     => (self[:id] == site[:anon_id] || self[:id] == site[:su_id]) ? visitor[:id] : self[:id],
+        :user_id     => visitor[:id],
         :title       => (name.blank? || first_name.blank?) ? login : fullname,
         :first_name  => first_name,
-        :name        => (name || login ),
+        :name        => (name || login),
         :email       => email,
-        :v_status      => Zena::Status[:pub]
+        :v_status    => Zena::Status[:pub]
       )}
 
       @contact[:parent_id] = site[:root_id]
@@ -360,8 +373,8 @@ class User < ActiveRecord::Base
       g_ids.compact!
       self.groups = []
       g_ids.each do |id|
-        group = Group.find(id)
-        unless site.being_created? || group.site_id == self.site_id
+        group = Group.find(:first, :conditions => {:id => id})
+        unless group && (group.site_id == self.site_id || site.being_created?)
           errors.add('group', 'not found')
           next
         end

data/app/views/columns/_li.html.erb

@@ -4,6 +4,7 @@
           :url    => edit_column_path(li),
           :method => :get) %></td>
   <td class='ruby'>
+    <span class='spacer'><%= (li.role.kind_of?(VirtualClass) ? '+ ' : '<span>* </span>') %></span>
     <span class='constant'><%= li.role.name %></span>
     <span class='text'>p.<%= li.ptype %></span>
     <span class='string'>'<%= li.name %>'<span><%= li.import_result ? " (#{li.import_result})" : ''%><% if !li.index.blank? -%>, <span class='symbol'>:index</span> =&gt; <span class='symbol'>:<%= li.index %></span><% end -%>

data/app/views/nodes/_groups.rhtml

@@ -15,7 +15,7 @@
     <li><label><%= _('publishers') %></label><%= select('node', 'dgroup_id', form_groups, { :include_blank => true }, {:disabled=>(@node[:inherit] != 0)}) %></li>
     <li><label><%= _('writers') %></label><%= select('node', 'wgroup_id',    form_groups, { :include_blank => true }, {:disabled=>(@node[:inherit] != 0)}) %></li>
     <li><label><%= _('readers') %></label><%= select('node', 'rgroup_id',    form_groups, { :include_blank => true }, {:disabled=>(@node[:inherit] != 0)}) %></li>
-    <li><label><%= _('skin') %></label><%= select('node', 'skin',    form_skins,{}, {:disabled=>(@node[:inherit] == 1)}) %></li>
+    <li><label><%= _('skin') %></label><%= select('node',    'skin_id',      form_skins,  {},                         {:disabled=>(@node[:inherit] == 1)}) %></li>
     <li class='submit'><%= submit_tag _('change') %></li>
   </form>
   <% else %>

data/app/views/sites/_form.erb

@@ -5,7 +5,7 @@
     link_to_function _('btn_x'), "['add_site', 'add_site_form'].each(Element.toggle)"
   end %>
 </td>
-<td class='add' colspan='8'>
+<td class='add' colspan='9'>
   <div id='site_errors'><%= error_messages_for(:site, :object => @site) %></div>
   <% unless @site.new_record? %>
   <%= form_remote_tag(:url => site_path(@site), :method => :put ) %>
@@ -20,6 +20,8 @@
     <tr><td class='label'><%= _('redit_time') %></td><td><%= text_field('site', :redit_time, :size=>15, :value => @site.redit_time) %></td></tr>
     <tr><td class='label'><%= _('public group') %></td><td><%= @site.public_group.name %></td></tr>
     <tr><td class='label'><%= _('site group') %></td><td><%= @site.site_group.name %></td></tr>
+    <tr><td class='label'><%= _('API group') %></td><td><%= select('site', 'api_group_id',  visitor.all_groups.map{|g| [g.name, g.id]}, {:include_blank => true, :selected => @site.api_group_id} ) %></td></tr>
+
     <tr><td class='label'><%= _('options') %></td><td>
     <% Site.attributes_for_form[:bool].each do |sym| -%>
     <input type='hidden' name='site[<%= sym %>]' value=''/>

data/app/views/sites/_li.erb

@@ -8,6 +8,7 @@
   <% end -%>
   <td class='public_group'><%= li.public_group.name %></td>
   <td class='site_group'  ><%= li.site_group.name   %></td>
+  <td class='api_group'   ><%= li.api_group ? li.api_group.name : _('no API')    %></td>
   <td class='redit_time'  ><%= li.redit_time %></td>
   <td class='options'><%= Site.attributes_for_form[:bool].reject{|sym| !li.send(sym)}.join(', ') %></td>
 </tr>

data/app/views/sites/index.erb

@@ -1,6 +1,6 @@
 <h2 class='title'><%= _('manage sites') %></h2>
 
 <table id='site_list' class='admin' cellspacing="0">
-  <tr><th class='nav' colspan='9'><%= will_paginate @sites %>
+  <tr><th class='nav' colspan='10'><%= will_paginate @sites %>
   <%= render :partial=>'sites/li',  :collection=>@sites %>
 </table>

data/app/views/virtual_classes/_form.erb

@@ -14,13 +14,22 @@
   <% end %>
   <table cellspacing='0' class='edit_virtual_class'>
     <tr><td class='label'><%= _('name')%>      </td><td><%= text_field('virtual_class', 'name',        :size=>15 ) %></td></tr>
-    <tr><td class='label'><%= _('superclass')%></td><td><%= select('virtual_class', 'superclass',  Node.classes_for_form(:without => (@virtual_class.new_record? ? nil : @virtual_class.to_s)), :selected => @virtual_class.superclass.to_s ) %></td></tr>
+    <tr>
+      <td class='label'><%= _('type')%>      </td>
+      <% if @virtual_class.new_record? %><td>
+        <%= select('virtual_class', 'type',  ['Class', 'Role'], :selected => 'Class' ) %></td>
+      <% else -%>
+      <td><%= @virtual_class.kind_of?(VirtualClass) ? 'Class' : 'Role' %></td>
+      <% end -%>
+    </tr>
+
+    <tr><td class='label'><%= _('superclass')%></td><td><%= select('virtual_class', 'superclass',  Node.classes_for_form(:without => ((@virtual_class.new_record? || @virtual_class.kind_of?(Role)) ? nil : @virtual_class.to_s)), :selected => @virtual_class.superclass.to_s ) %></td></tr>
 
 <% Zena::Use::Fulltext::FULLTEXT_FIELDS.reverse_each do |fld| -%>
     <tr><td class='label'><%= _(fld)%></td><td><%= text_area('virtual_class', fld, :rows => 2, :cols => 30) %></td></tr>
 <% end -%>
 
-    <tr><td class='label'><%= _('create group')%></td><td><%= select('virtual_class', 'create_group_id',  visitor.groups.map{|g| [g.name, g.id]} ) %></td></tr>
+    <tr><td class='label'><%= _('create group')%></td><td><%= select('virtual_class', 'create_group_id',  visitor.all_groups.map{|g| [g.name, g.id]} ) %></td></tr>
     <tr><td class='label'><%= _('auto create discussion')%></td><td><%= check_box('virtual_class', 'auto_create_discussion') %></td></tr>
     <tr><td class='label'><%= _('icon')%>      </td><td><%= text_field('virtual_class', 'icon',        :size=>15 ) %></td></tr>
     <tr><td colspan='3'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>

data/app/views/virtual_classes/_li.erb

@@ -1,7 +1,7 @@
 <% if li.kind_of?(Class) -%>
 <tr class='real_class'>
   <td class="adm_icon"><%= _('virtual_class_img') %></td>
-  <td class='ruby'><span class='spacer'><%= li.kpath[1..-1].gsub(/./, '| ') %></span><span class='constant'><%= li.name %></span></td>
+  <td class='ruby'><span class='spacer'><%= li.kpath[1..-1].gsub(/./, '| ') + '+ ' %></span><span class='constant'><%= li.name %></span></td>
   <td>&nbsp;</td>
   <td class="auto_create_discussion" >&nbsp;</td>
 </tr>
@@ -11,7 +11,10 @@
           :update =>"virtual_class#{li[:id]}",
           :url    => edit_virtual_class_path(li),
           :method => :get) %></td>
-  <td class='ruby'><span class='spacer'><%= li.kpath[1..-1].gsub(/./, '| ') %></span><span class='constant'><%= li.name %><%= li.import_result ? " (#{li.import_result})" : ''%></span></td>
+  <td class='ruby'>
+    <span class='spacer'><%= li.kpath[1..-1].gsub(/./, '| ') %><%= li.kind_of?(VirtualClass) ? '+ ' : '| <span>* </span>' %></span>
+    <span class='constant'><%= li.name %><%= (li.kind_of?(VirtualClass) && li.import_result) ? " (#{li.import_result})" : ''%></span>
+  </td>
   <td class='idx'><%= Zena::Use::Fulltext::FULLTEXT_FIELDS.map {|fld| li[fld].blank? ? nil : fld.gsub('idx_text_','')}.compact.join(', ') %>
   <td class="auto_create_discussion" ><%= li.auto_create_discussion ? _('auto discussion') : '' %></td>
 </tr>

data/bin/zena

@@ -19,4 +19,4 @@ Rails::Generator::Base.use_application_sources!
 Rails::Generator::Scripts::Generate.new.run(
   args,
   :generator => 'app'
-)
+)

data/bricks/math/lib/bricks/math.rb

@@ -26,7 +26,7 @@ module Bricks
           filename = math_id + '.png'
           filepath = node.asset_path(filename)
           unless File.exist?(filepath)
-            if opts[:preview]
+            if !Bricks::CONFIG['math']['live'] && opts[:preview]
               # do not render image during preview
               tag = content =~ /\n/ ? 'pre' : 'span'
               return "<#{tag} class='math_preview'>#{content}</#{tag}>"

data/bricks/mongrel/README

@@ -0,0 +1,3 @@
+This brick contains rules to deploy a Zena application by using a Mongrel cluster and load balancing.
+
+You should enable this brick if and only if you intend to deploy your application with Mongrel.

data/bricks/mongrel/zena/deploy.rb

@@ -0,0 +1,56 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  brick_deploy = :mongrel
+  if self[:app_type] != brick_deploy
+    puts %Q{##############################################################################
+ ERROR: Loading '#{brick_deploy}' deploy rules when deploying with #{app_type}
+        incompatibility between config/bricks.yml (enabled #{brick_deploy} brick) and
+        config/deploy.rb (:app_type = #{app_type})
+##############################################################################}
+  else
+    #========================== MONGREL ===============================#
+    namespace :app 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
+
+      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
+
+      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"
+      end
+    end
+  end
+end

data/bricks/passenger/README

@@ -0,0 +1,3 @@
+This brick contains rules to deploy a Zena application by using Passenger.
+
+You should enable this brick if and only if you intend to deploy your application with Passenger.

data/bricks/passenger/zena/deploy.rb

@@ -0,0 +1,49 @@
+# Passenger deployment recipes
+Capistrano::Configuration.instance(:must_exist).load do
+  brick_deploy = :passenger
+
+  if self[:app_type] != brick_deploy
+    puts %Q{##############################################################################
+ ERROR: Loading '#{brick_deploy}' deploy rules when deploying with #{app_type}
+        incompatibility between config/bricks.yml (enabled #{brick_deploy} brick) and
+        config/deploy.rb (:app_type = #{app_type})
+##############################################################################}
+  else
+    namespace :upload_progress do
+      desc "Build and install upload progress extension for Apache2"
+      task :setup, :roles => :app do
+        tmp_dir = "/tmp/mod_upload_progress.tmp"
+        c_file = File.read("#{Zena::ROOT}/vendor/apache2_upload_progress/mod_upload_progress.c")
+        run "test -e #{tmp_dir}  || mkdir #{tmp_dir}"
+        put c_file, "#{tmp_dir}/mod_upload_progress.c"
+        run "cd #{tmp_dir} && apxs2 -c -i mod_upload_progress.c && rm -rf #{tmp_dir}"
+      end
+    end
+
+    before "zena:setup", "upload_progress:setup"
+
+    namespace :app do
+
+      desc "Restart Passenger app"
+      task :restart, :roles => :app do
+        stop
+        start
+      end
+
+      desc "Start Passenger app"
+      task :start, :roles => :app do
+        run "#{in_current} touch tmp/restart.txt"
+      end
+
+      desc "Stop Passenger app (only halt upload DRB)"
+      task :stop, :roles => :app do
+        # Cannot stop
+      end
+
+      desc "Kill Passenger spawner"
+      task :kill, :roles => :app do
+        run "kill $( passenger-memory-stats | grep 'Passenger spawn server' | awk '{ print $1 }' )"
+      end
+    end
+  end
+end

data/config/bricks.yml

@@ -5,6 +5,9 @@ test:
   worker:   OFF
 
 development:
+  math:
+    switch: ON
+    live:   ON
   tags:     ON
   captcha:  ON
   sphinx:
@@ -21,6 +24,9 @@ development:
   data2pdf: ON
 
 production:
+  math:
+    switch: ON
+    live:   ON
   tags:     ON
   captcha:  ON
   sphinx:

data/config/deploy.rb

@@ -1,24 +1,27 @@
-set :db_name,             "zena"   # If you change this: no dots in this name !
-set :server_ip,           nil      # FIXME: set this to your remote server IP in the form: "215.0.0.1"
-set :mongrel_port,        "8000"
-set :mongrel_count,       "3"
-set :db_password,         nil      # FIXME: set password (can be anything).
-set :db_user,             "zena"
-set :repository,          "http://svn.zenadmin.org/zena/trunk"
+set :db_name,               "zena"     # If you change this: no dots in this name !
+set :server_ip,             nil        # FIXME: set this to your remote server IP in the form: "215.0.0.1"
+set :app_type,              :passenger
+set :db_password,           nil        # FIXME: set password (can be anything).
+
+# You need to give the public key from the server to the git repository if the application is not public
+set :scm,                   'git'
+set :repository,            'git@github.com:YOUR_PROJECT/APPLICATION.git'
+set :branch,                'master'
 
 if self[:server_ip]
   #================= ADVANCED SETTINGS =============#
 
-  set :deploy_to,    "/var/zena"
-  set :sites_root,   "/var/www/zena"
-  set :vhost_root,   "/etc/apache2/sites-available"
-  set :deflate,       true
-  set :debug_deflate, false
-  set :debug_rewrite, false
-  set :static,        []
-  set :apache2_reload_cmd, "/etc/init.d/apache2 reload"
-  set :debian_host,           true
-  set :ssh_user,              "root"
+  set :deploy_to,            "/home/#{db_name}/app"
+  set :sites_root,           "/home/#{db_name}/sites"
+
+  set :vhost_root,           "/etc/apache2/sites-available"
+  set :deflate,              true
+  set :debug_deflate,        false
+  set :debug_rewrite,        false
+  set :static,               []
+  set :apache2_reload_cmd,   "/etc/init.d/apache2 reload"
+  set :debian_host,          true
+  set :ssh_user,             "root"
 
   role :web,         "#{ssh_user}@#{server_ip}"
   role :app,         "#{ssh_user}@#{server_ip}"
@@ -33,13 +36,16 @@ if self[:server_ip]
     ::RAILS_ENV = 'production'
   end
 
-  # This file is copied into zena applications.
   deploy_path = "#{RAILS_ROOT}/lib/zena/deploy"
   if File.exist?("#{deploy_path}.rb")
     # We are running directly inside zena
     require deploy_path
   else
     # Zena app, using zena as gem
+    env = File.read(File.join(File.dirname(__FILE__), 'environment.rb'))
+    if env =~ /config.gem.*zena.*version.*'(.*?)'/
+      gem 'zena', "= #{$1}"
+    end
     require 'zena/deploy'
   end
 

data/config/gems.yml

@@ -12,12 +12,12 @@ will_paginate:  '~> 2.3.12'
 differ:         '>= 0.1.1'
 shoulda:        '>= 2.10.2'
 
-querybuilder:   '>= 0.8.0'
+querybuilder:   '>= 0.9.0'
 yamltest:       '>= 0.7.0'
-rubyless:       '>= 0.6.0'
+rubyless:       '>= 0.7.0'
 property:       '>= 1.1.0'
 versions:       '>= 0.3.1'
-zafu:           '>= 0.6.2'
+zafu:           '>= 0.7.1'
 
 jeweler:
 

data/db/migrate/20100915062903_add_api_group_id_to_site.rb

@@ -0,0 +1,9 @@
+class AddApiGroupIdToSite < ActiveRecord::Migration
+  def self.up
+    add_column :sites, :api_group_id, :integer
+  end
+
+  def self.down
+    remove_column :sites, :api_group_id
+  end
+end