zena 1.0.0.beta3 → 1.0.0.rc1

data/db/fix/old_migrations/20100926192223_remove_su_user.rb

@@ -0,0 +1,8 @@
+class RemoveSuUser < ActiveRecord::Migration
+  def self.up
+    remove_column :sites, :su_id
+  end
+
+  def self.down
+  end
+end

data/db/fix/old_migrations/20100927141658_add_eval_attributes_to_v_class.rb

@@ -0,0 +1,12 @@
+class AddEvalAttributesToVClass < ActiveRecord::Migration
+  def self.up
+    add_column :roles, :properties, :text
+    remove_column :roles, :dyn_keys
+    remove_column :roles, :idx_text_high
+    remove_column :roles, :idx_text_medium
+    remove_column :roles, :idx_text_low
+  end
+
+  def self.down
+  end
+end

data/db/fix/old_migrations/20100928185257_add_obvious_idx.rb

@@ -0,0 +1,52 @@
+class AddObviousIdx < ActiveRecord::Migration
+  INDICES = {
+    #:attachments,
+    :cached_pages         => %w{node_id},
+    :cached_pages_nodes   => %w{node_id cached_page_id},
+    :columns              => %w{role_id name},
+    :comments             => %w{discussion_id reply_to user_id},
+    :data_entries         => DataEntry::NodeLinkSymbolsId,
+    :discussions          => %w{node_id},
+    :groups_users         => %w{group_id user_id},
+    :idx_nodes_ml_strings => %w{value node_id},
+    :idx_nodes_strings    => %w{value node_id},
+    :idx_templates        => %w{tkpath format mode site_id node_id version_id},
+    # :iformats
+    :links                => %w{source_id target_id relation_id status date},
+    :nodes                => %w{kpath parent_id project_id section_id rgroup_id wgroup_id publish_from site_id},
+    :nodes_roles          => %w{node_id role_id},
+    :relations            => %w{source_role target_role site_id},
+    :roles                => %w{name kpath site_id},
+    # :sessions
+    :sites                => %w{host},
+    # :users
+    :versions             => %w{node_id user_id},
+    :zips                 => %w{site_id},
+  }
+
+  def self.up
+    add_index(:nodes, [:zip, :site_id])
+    add_index(:idx_nodes_ml_strings, [:node_id, :key, :lang])
+    add_index(:idx_nodes_strings, [:node_id, :key])
+
+    INDICES.each do |table, indices|
+      indices.each do |key|
+        add_index(table, key)
+      end
+    end
+
+
+  end
+
+  def self.down
+    remove_index(:nodes, :column => [:zip, :site_id])
+    remove_index(:idx_nodes_ml_strings, :column => [:node_id, :key, :lang])
+    remove_index(:idx_nodes_strings, :column => [:node_id, :key])
+
+    INDICES.each do |table, indices|
+      indices.each do |key|
+        remove_index(table, key)
+      end
+    end
+  end
+end

data/db/fix/old_migrations/20100929143111_remove_node_name.rb

@@ -0,0 +1,11 @@
+class RemoveNodeName < ActiveRecord::Migration
+  def self.up
+    remove_column :nodes, :node_name
+    add_column :nodes, :_id, :string, :limit => 40
+  end
+
+  def self.down
+    remove_column :nodes, :_id
+    add_column :nodes, :node_name, :text
+  end
+end

data/db/fix/old_migrations/20101006090454_store_properties_in_long_text.rb

@@ -0,0 +1,9 @@
+class StorePropertiesInLongText < ActiveRecord::Migration
+  def self.up
+    Zena::Db.change_column :versions, :properties, :text
+  end
+
+  def self.down
+    change_column :versions, :properties, :text
+  end
+end

data/db/fix/old_migrations/20101014185753_remove_user_prototype_id.rb

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

data/db/fix/old_migrations/20101101084318_create_scope_index.rb

@@ -0,0 +1,35 @@
+class CreateScopeIndex < ActiveRecord::Migration
+  def self.up
+    # Model to use as index
+    add_column :roles, :idx_class, :string, :limit => 30
+    
+    # Related models whose scope indices need to be updated after
+    # save
+    add_column :roles, :idx_scope, :string
+
+    create_table(:idx_projects, :options => Zena::Db.table_options) do |t|
+      t.integer  :site_id
+      t.integer  :node_id
+      
+      # Blog (self) (NPPB)
+      t.integer  :NPP_id
+      t.string   :NPP_title
+      
+      # Contact (project or references) (NRC)
+      t.integer  :NRC_id
+      t.string   :NRC_first_name
+      t.string   :NRC_name
+      
+      # Tag (project) (NPT)
+      t.integer  :NPT_id
+      t.datetime :NPT_created_at
+      t.string   :NPT_title
+    end
+  end
+
+  def self.down
+    remove_column :roles, :idx_class
+    remove_column :roles, :idx_scope
+    drop_table :idx_projects
+  end
+end

data/db/fix/old_migrations/20101109074232_create_idx_nodes_tables.rb

@@ -0,0 +1,65 @@
+class CreateIdxNodesTables < ActiveRecord::Migration
+  def self.up
+    # index float for nodes
+    create_table :idx_nodes_floats, :options => Zena::Db.table_options do |t|
+      t.integer  'node_id', :null => false
+      t.string   'key'
+      t.float    'value'
+    end
+    add_index(:idx_nodes_floats, [:node_id, :key])
+    add_index(:idx_nodes_floats, :value)
+    add_index(:idx_nodes_floats, :node_id)
+
+    # index datetime for nodes
+    create_table :idx_nodes_datetimes, :options => Zena::Db.table_options do |t|
+      t.integer  'node_id', :null => false
+      t.string   'key'
+      t.datetime 'value'
+    end
+    
+    add_index :idx_nodes_datetimes, [:node_id, :key]
+    add_index :idx_nodes_datetimes, :value
+    add_index :idx_nodes_datetimes, :node_id
+     
+    add_column :nodes, :idx_datetime1, :datetime
+    add_index  :nodes, :idx_datetime1
+    
+    add_column :nodes, :idx_datetime2, :datetime
+    add_index  :nodes, :idx_datetime2
+    
+    add_column :nodes, :idx_float1, :float
+    add_index  :nodes, :idx_float1
+    
+    add_column :nodes, :idx_float2, :float
+    add_index  :nodes, :idx_float2
+    
+    add_column :nodes, :idx_string1, :string
+    add_index  :nodes, :idx_string1
+    
+    add_column :nodes, :idx_string2, :string
+    add_index  :nodes, :idx_string2
+  end
+
+  def self.down
+    drop_table 'idx_nodes_floats'
+    drop_table 'idx_nodes_datetimes'
+    
+    remove_column :nodes, :idx_datetime1
+    remove_index  :nodes, :idx_datetime1
+    
+    remove_column :nodes, :idx_datetime2
+    remove_index  :nodes, :idx_datetime2
+    
+    remove_column :nodes, :idx_float1
+    remove_index  :nodes, :idx_float1
+    
+    remove_column :nodes, :idx_float2
+    remove_index  :nodes, :idx_float2
+    
+    remove_column :nodes, :idx_string1
+    remove_index  :nodes, :idx_string1
+    
+    remove_column :nodes, :idx_string2
+    remove_index  :nodes, :idx_string2
+  end
+end

data/db/fix/old_migrations/20101110184235_add_role_update_to_site.rb

@@ -0,0 +1,9 @@
+class AddRoleUpdateToSite < ActiveRecord::Migration
+  def self.up
+    add_column :sites, :roles_updated_at, :datetime
+  end
+
+  def self.down
+    remove_column :sites, :roles_updated_at
+  end
+end

data/db/fix/old_migrations/20101116103920_change_scope_index.rb

@@ -0,0 +1,31 @@
+class ChangeScopeIndex < ActiveRecord::Migration
+  def self.up
+    drop_table :idx_projects
+    create_table(:idx_projects, :options => Zena::Db.table_options) do |t|
+      t.integer  :site_id
+      t.integer  :node_id
+
+      # Blog (self) (NPPB)
+      t.integer  :blog_id
+      t.string   :blog_title
+
+      # Contact in project
+      t.integer  :contact_id
+      t.string   :contact_first_name
+      t.string   :contact_name
+
+      # Contact as reference
+      t.integer  :reference_id
+      t.string   :reference_name
+      t.string   :reference_title
+
+      # Tag in project
+      t.integer  :tag_id
+      t.datetime :tag_created_at
+      t.string   :tag_title
+    end
+  end
+
+  def self.down
+  end
+end

data/db/fix/old_migrations/20101123125822_add_integer_idx.rb

@@ -0,0 +1,17 @@
+class AddIntegerIdx < ActiveRecord::Migration
+  def self.up
+    # index float for nodes
+    create_table :idx_nodes_integers, :options => Zena::Db.table_options do |t|
+      t.integer  'node_id', :null => false
+      t.string   'key'
+      t.integer  'value'
+    end
+    add_index(:idx_nodes_integers, [:node_id, :key])
+    add_index(:idx_nodes_integers, :value)
+    add_index(:idx_nodes_integers, :node_id)
+  end
+
+  def self.down
+    drop_table 'idx_nodes_integers'
+  end
+end

data/db/fix/old_migrations/20101130134522_add_index_field.rb

@@ -0,0 +1,13 @@
+class AddIndexField < ActiveRecord::Migration
+  def self.up
+    add_column :nodes, :idx_integer1, :integer
+    add_index  :nodes, :idx_integer1
+    add_column :nodes, :idx_integer2, :integer
+    add_index  :nodes, :idx_integer2
+  end
+
+  def self.down
+    remove_column :nodes, :idx_integer1
+    remove_column :nodes, :idx_integer2
+  end
+end

data/db/fix/old_migrations/20101213133816_add_group_to_relation.rb

@@ -0,0 +1,9 @@
+class AddGroupToRelation < ActiveRecord::Migration
+  def self.up
+    add_column :relations, :rel_group, :string
+  end
+
+  def self.down
+    remove_column :relations, :rel_group
+  end
+end

data/db/init/base/help.fr.zml

@@ -1,5 +1,5 @@
 class: Page
-title: aide
+title: help
 summary: |
   |_. code |_. résultat |
   | @le chat *noir*@ | le chat *noir* |

data/db/init/base/skins/default.zml

@@ -1,7 +1,6 @@
 class: Skin
 title: default
 summary: official default skin
-comment: version 0.9
 text: |
   This is the default skin for zena. You should be *very careful* if you change this skin: it is used to display/edit itself.
 

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

@@ -11,7 +11,7 @@
           <r:else do='link' do='img' alt_src='icon' mode='pv'/>
         </p>
         <p class='result_name'><r:link/></p>
-        <p class='result_path'><r:show attr='rootpath'/></p>
+        <p class='result_path'><r:show attr='short_path'/></p>
         <r:summary/>
         <div class='clear'></div>
       </li>

data/db/init/base/skins/default/Node-tree.zafu

@@ -5,11 +5,11 @@
   <div class='header'><h1 do='title' class='s70' status='true' actions='all'>this is the title</h1></div>
     <ul class='tree' do='nodes'>
       <li class='parent' do='parent'><r:title actions='all' link='tree'/></li>
-      <li class='current'><r:show attr='node_name'/></li>
-      <li do='each'><r:show attr='node_name' edit='true'/>
+      <li class='current'><r:show attr='title'/></li>
+      <li do='each'><r:show attr='title' edit='true'/>
         <ul do='nodes' name='tree'>
           <li do='each'>
-            <r:link mode='tree' attr='node_name'/>
+            <r:link mode='tree' attr='title'/>
           </li>
         </ul>
       </li>

data/db/init/base/skins/default/Node.zafu

@@ -69,17 +69,17 @@
             </li>
           </ol>
         </r:pages>
-        <r:references name='references'><h3 do='trans'>references</h3>
+        <r:nodes where='kpath not like "ND%" and kpath not like "NP%"'><h3 do='trans'>references</h3>
           <ol>
             <li do='each' class='li_s#{v.status}' do='link'/>
             <li do='add' before='self'/>
             <li class='inline_form' do='form'>
-              <p class='node_klass'>  <r:select name='klass' root_class='Reference'/></p>
+              <p class='node_klass'>  <r:select name='klass' root_class='Node'/></p>
               <p class='node_title'><input type='text' name='title' value=''/></p>
               <p class='btn_validate'><input type="submit" value='#{trans("validate")}'/></p>
             </li>
           </ol>
-        </r:references>
+        </r:nodes>
 
       </div> <!-- related -->
       <div id='main'>

data/lib/bricks/loader.rb

@@ -96,7 +96,10 @@ module Bricks
 
     def load_bricks
       bricks.each do |path|
-        $LOAD_PATH << File.join(path, 'lib')
+        path = File.join(path, 'lib')
+        ActiveSupport::Dependencies.load_paths      << path
+        ActiveSupport::Dependencies.load_once_paths << path
+        $LOAD_PATH                                  << path
       end
 
       # load 'init'

data/lib/bricks/requirements_validation.rb

@@ -34,12 +34,17 @@ module Bricks
       errors.empty? ? nil : errors
     end
 
+    def raw_config
+      @raw_config ||=
+        if File.exist?("#{RAILS_ROOT}/config/bricks.yml")
+          raw_config = YAML.load_file("#{RAILS_ROOT}/config/bricks.yml")[RAILS_ENV] || {}
+        else
+          raw_config = YAML.load_file("#{Zena::ROOT}/config/bricks.yml")[RAILS_ENV] || {}
+        end
+    end
+
     def config_for_active_bricks
-      if File.exist?("#{RAILS_ROOT}/config/bricks.yml")
-        raw_config = YAML.load_file("#{RAILS_ROOT}/config/bricks.yml")[RAILS_ENV] || {}
-      else
-        raw_config = YAML.load_file("#{Zena::ROOT}/config/bricks.yml")[RAILS_ENV] || {}
-      end
+      raw_config = self.raw_config
 
       config = {}
 
@@ -56,7 +61,7 @@ module Bricks
           end
           config[brick] = opts unless errors
         else
-          if opts == true
+          if opts == true || brick == 'zena' # zena always ON
             config[brick] = {}
           end
         end

data/lib/log_recorder/lib/log_recorder.rb

@@ -88,9 +88,9 @@ class LogRecorder
     puts parse_date("10/Oct/2000:13:55:36 -0100")
     puts parse_path("GET /apache_pb.gif HTTP/1.0")
     puts get_site_id("test.host").inspect
-    puts find_zip_by_path("projects/cleanWater")
+    puts find_zip_by_path("projects-list/Clean-Water-project")
     insert_combined_record('213.3.85.165 - - [29/Feb/2008:11:34:22 +0100] "GET /en/image133_tiny.jpg HTTP/1.1" 200 4039 "http://zenadmin.org/en" "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; fr) AppleWebKit/419.3 (KHTML, like Gecko) Safari/419.3"')
-    insert_combined_record('213.3.85.165 - - [29/Feb/2008:11:38:09 +0100] "GET /fr/projects/cleanWater.html HTTP/1.1" 200 4760 "http://zenadmin.org/en" "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; fr) AppleWebKit/419.3 (KHTML, like Gecko) Safari/419.3"')
+    insert_combined_record('213.3.85.165 - - [29/Feb/2008:11:38:09 +0100] "GET /fr/projects-list/Clean-Water-project.html HTTP/1.1" 200 4760 "http://zenadmin.org/en" "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; fr) AppleWebKit/419.3 (KHTML, like Gecko) Safari/419.3"')
   end
   private
     def get_site_id(vhost_name)

data/lib/tasks/zena.rake

@@ -3,7 +3,7 @@ require 'fileutils'
 
 # We need to make sure the RAILS_ENV is set before brick activation or the wrong bricks will
 # be loaded.
-RAILS_ENV = 'test' if ARGV.join(' ') =~ /zena:test/
+RAILS_ENV = 'test' if ARGV.join(' ') =~ /zena:(test|build_fixtures)/
 
 require File.join(File.dirname(__FILE__), '..', 'zena', 'info') # to have Zena::ROOT
 require File.join(File.dirname(__FILE__), '..', 'bricks') # to have Bricks
@@ -46,7 +46,7 @@ def copy_assets(from, to)
   from = File.expand_path(from)
   to = File.expand_path(to)
   return if from == to
-  ['config/mongrel_upload_progress.conf', 'lib/upload_progress_server.rb', 'config/deploy.rb', 'config/bricks.yml', 'db/migrate/*.rb', 'public/**/*'].each do |base_path|
+  ['config/mongrel_upload_progress.conf', 'lib/upload_progress_server.rb', 'config/deploy.rb', 'config/bricks.yml', 'public/**/*'].each do |base_path|
     if base_path =~ /\*/
       Dir["#{from}/#{base_path}"].each do |path|
         path = path[(from.length + 1)..-1]
@@ -155,7 +155,7 @@ 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)
     end
   end
@@ -250,22 +250,17 @@ namespace :zena do
     if ENV['VERSION'] || ENV['BRICK']
       ENV['BRICK']    ||= 'zena'
       # migrate specific bricks only
-      if ENV['BRICK'] == 'zena'
-        # migrate 'db/migrate'
-        Zena::Migrator.migrate("#{Zena::ROOT}/db/migrate", ENV["BRICK"], ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+      mig_path = Bricks.migrations_for(ENV['BRICK'])
+      if File.exist?(mig_path) && File.directory?(mig_path)
+        Zena::Migrator.migrate(mig_path, ENV["BRICK"], ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
       else
-        mig_path = Bricks.migrations_for(ENV['BRICK'])
-        if File.exist?(mig_path) && File.directory?(mig_path)
-          Zena::Migrator.migrate(mig_path, ENV["BRICK"], ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-        else
-          puts "Could not find migrations for brick '#{ENV['BRICK']}' ('#{mig_path}' not found)."
-        end
+        puts "Could not find migrations for brick '#{ENV['BRICK']}' ('#{mig_path}' not found)."
       end
     else
       # migrate all to latest
-      paths  = {'zena' => "#{RAILS_ROOT}/db/migrate"}
-      bricks = ['zena']
-
+      # Always start with zena migrations
+      paths  = {'zena' => Bricks.migrations_for('zena')}
+      bricks = %w{zena}
       Bricks.foreach_brick do |brick_name|
         migration_path = Bricks.migrations_for(brick_name)
         next unless File.exist?(migration_path) && File.directory?(migration_path)
@@ -273,6 +268,10 @@ namespace :zena do
         bricks << brick_name
       end
 
+      # Always end with app migrations
+      bricks += %w{_app}
+      paths['_app'] = "#{RAILS_ROOT}/db/migrate"
+
       bricks.each do |brick_name, path|
         Zena::Migrator.migrate(paths[brick_name], brick_name, nil)
       end
@@ -354,6 +353,17 @@ namespace :zena do
     end
   end
 
+  desc 'Rebuild fullpath for all sites (without SiteWorker)'
+  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)
+      site.rebuild_fullpath
+    end
+  end
+
   Rake::RDocTask.new do |rdoc|
        files = ['README', 'doc/README_FOR_APP', 'CREDITS', 'MIT-LICENSE', 'app/**/*.rb',
                 'lib/**/*.rb']