zena 1.0.0.beta3 → 1.0.0.rc1

data/config/bricks.yml

@@ -1,13 +1,23 @@
 test:
-  tags:     ON
-  captcha:  ON
-  sphinx:   OFF
-  worker:   OFF
+  # Integration testing does not use 'port' settings so we must use 80...
+  asset_port:  80
+  tags:        ON
+  captcha:     ON
+  sphinx:      OFF
+  worker:      OFF
 
 development:
+  asset_port: 7999
+  mongrel:   ON
+  passenger: OFF
+  pdf:
+    switch: ON
+    engine: prince
+
   math:
     switch: ON
     live:   ON
+
   tags:     ON
   captcha:  ON
   sphinx:
@@ -21,9 +31,16 @@ development:
     switch:  OFF
     activate_if:
       gem: 'delayed_job'
-  data2pdf: ON
 
 production:
+  # Port used only to provide assets during custom rendering (pdf).
+  # We need this to avoid deadlocks.
+  asset_port: 7999
+  mongrel:   ON
+  passenger: OFF
+  pdf:
+    switch: ON
+    engine: prince
   math:
     switch: ON
     live:   ON
@@ -40,4 +57,3 @@ production:
     switch:  OFF
     activate_if:
       gem: 'delayed_job'
-  data2pdf: ON

data/config/gems.yml

@@ -10,14 +10,14 @@ authlogic:      '= 2.1.3'
 fast_gettext:   '~> 0.4.16'
 will_paginate:  '~> 2.3.12'
 differ:         '>= 0.1.1'
-shoulda:        '>= 2.10.2'
+shoulda:        '= 2.10.3'
 
-querybuilder:   '>= 0.9.0'
+querybuilder:   '>= 0.9.5'
 yamltest:       '>= 0.7.0'
-rubyless:       '>= 0.7.0'
-property:       '>= 1.1.0'
+rubyless:       '>= 0.8.2'
+property:       '>= 2.1.2'
 versions:       '>= 0.3.1'
-zafu:           '>= 0.7.1'
+zafu:           '>= 0.7.6'
 
 jeweler:
 
@@ -45,4 +45,6 @@ ts-delayed-delta:
 delayed_job:
   optional:     yes
   brick:        worker
-  version:      '>= 1.8.4'
+  # 2.0.3 does not work.
+  # TODO: fix.
+  version:      '= 1.8.4'

data/db/20100628074512_zena0x_to1x.rb

@@ -85,7 +85,12 @@ class Site
           elsif node.kind_of?(Template)
             prop['ext'] = 'zafu'
             prop['content_type'] = 'text/zafu'
-
+            if doc = version.content(TemplateContent)
+              prop['target_klass'] = doc.klass
+              prop['format']       = doc.format
+              prop['mode']         = doc.mode
+              prop['tkpath']       = doc.tkpath
+            end
           elsif node.kind_of?(TextDocument)
             doc = version.content(DocumentContent)
             transfer_document_attributes(version, doc, prop)

data/db/fix/024_correct_vclass_kpath.rb

@@ -0,0 +1,11 @@
+class CorrectVclassKpath < ActiveRecord::Migration
+  def self.up
+    klasses = VirtualClass.find(:all)
+    klasses.each do |vclass|
+      Node.connection.execute "UPDATE nodes SET kpath = #{Node.connection.quote(vclass.kpath)} WHERE vclass_id = #{vclass[:id]}"
+    end
+  end
+
+  def self.down
+  end
+end

data/db/fix/025_move_tag_into_vclass.rb

@@ -0,0 +1,13 @@
+class MoveTagIntoVclass < ActiveRecord::Migration
+  def self.up
+    # create a new virtual class for each site and assign all tags to this class.
+    Site.find(:all).each do |site|
+      VirtualClass.connection.execute("INSERT INTO virtual_classes (name,kpath,real_class,icon,allowed_attributes,create_group_id,site_id) VALUES ('Tag','NPT','Page',NULL,NULL,#{site[:site_group_id]},#{site[:id]})")
+      vclass = VirtualClass.find(:first, :conditions=>["site_id = ? AND kpath = 'NPT'",site[:id]])
+      Node.connection.execute "UPDATE nodes SET vclass_id = #{vclass[:id]} WHERE kpath = 'NPT'"
+    end
+  end
+
+  def self.down
+  end
+end

data/db/{migrate → fix}/047_change_default_link_id_to_zero.rb

@@ -2,9 +2,7 @@
 # make sure there exists a link with NULL content and id == -1 (used in queries using query order sorting)
 class ChangeDefaultLinkIdToZero < ActiveRecord::Migration
   def self.up
-    if !$migrating_new_site
-      Link.connection.execute "UPDATE #{Link.table_name} SET id = 0 WHERE id = -1"
-    end
+    Link.connection.execute "UPDATE #{Link.table_name} SET id = 0 WHERE id = -1"
     Zena::Db.insert_dummy_ids
   end
 

data/db/{migrate → fix}/20091013100351_rename_publish_group_to_drive_group.rb

@@ -1,8 +1,6 @@
 class RenamePublishGroupToDriveGroup < ActiveRecord::Migration
   def self.up
-    if Node.column_names.include?('dgroup_id')
-      remove_column :nodes, :dgroup_id  # old stuff
-    end
+    remove_column :nodes, :dgroup_id  # old stuff
     rename_column :nodes, :pgroup_id, :dgroup_id
   end
 

data/db/{migrate → fix}/20091124161608_rebuild_fullpath.rb

@@ -1,6 +1,5 @@
 class RebuildFullpath < ActiveRecord::Migration
   def self.up
-
     # Reset column information (used when running all migrations at once)
     [User, Node, Version, Site, Group].each do |klass|
       klass.reset_column_information

data/db/{migrate → fix}/20100526090140_renamed_contact_model_to_base_contact.rb

@@ -1,9 +1,7 @@
 class RenamedContactModelToBaseContact < ActiveRecord::Migration
   def self.up
-    unless $migrating_new_site
-      execute "UPDATE nodes SET type = 'BaseContact' WHERE type = 'Contact'"
-      execute "UPDATE roles SET real_class = 'BaseContact' WHERE real_class = 'Contact'"
-    end
+    execute "UPDATE nodes SET type = 'BaseContact' WHERE type = 'Contact'"
+    execute "UPDATE roles SET real_class = 'BaseContact' WHERE real_class = 'Contact'"
   end
 
   def self.down

data/db/{migrate → fix/old_migrations}/001_create_base.rb

@@ -1,4 +1,3 @@
-$migrating_new_site = true
 class CreateBase < ActiveRecord::Migration
   def self.up
     create_table("users", :options => Zena::Db.table_options) do |t|

data/db/fix/old_migrations/010_create_template_content.rb

@@ -0,0 +1,17 @@
+class CreateTemplateContent < ActiveRecord::Migration
+  def self.up
+    create_table(:template_contents, :options => Zena::Db.table_options) do |t|
+      t.column :site_id, :integer
+      t.column :node_id, :integer
+      t.column :skin_name, :string
+      t.column :format, :string
+      t.column :tkpath, :string
+      t.column :klass, :string
+      t.column :mode, :string
+    end
+  end
+
+  def self.down
+    drop_table :template_contents
+  end
+end

data/db/fix/old_migrations/20100923154807_remove_base_contact.rb

@@ -0,0 +1,84 @@
+class RemoveBaseContact < ActiveRecord::Migration
+  extend Zena::Acts::Secure
+  TRANSFER_KEYS = %w{first_name name email}
+
+  def self.up
+    add_column :sites, :usr_prototype_id, :integer
+    rename_column :users, :contact_id, :node_id
+
+    # 0. make sure there is no 'Contact' and 'Reference' roles defined.
+    execute "update roles set name='Contact2' where name = 'Contact'"
+    execute "update roles set name='Reference2' where name = 'Reference'"
+
+    # Removed class now resolved as vclass
+    execute "update nodes set type='Node' where type='Reference' or type='BaseContact'"
+    
+    # 1. create a new virtual class 'Contact' with kpath 'NRC'
+    Site.all.each do |site|
+      visitor = Thread.current[:visitor] = User.find(:first, :conditions => ["status = ? AND site_id = ?", User::Status[:admin], site.id])
+      
+      # Fake roles_updated_at= in site in case we migrate with new VirtualClass caching.
+      VirtualClass
+      unless visitor.site.respond_to?(:roles_updated_at=)
+        VirtualClass.class_eval do
+          def self.expire_cache!
+            # ignore
+          end
+          
+          def idx_scope
+            nil
+          end
+        end
+      end
+      
+      ref = secure(VirtualClass) do
+        VirtualClass.create(:superclass => 'Node', :name => 'Reference', :create_group_id => site.public_group_id)
+      end
+
+      if ref.new_record?
+        puts "Could not create 'Reference' virtual class in #{site.host} !"
+      else
+        execute "UPDATE nodes SET vclass_id = #{ref.id} WHERE kpath = 'NR' AND site_id = #{site.id}"
+        contact_class = secure(VirtualClass) do
+          VirtualClass.create(:superclass => 'Reference', :name => 'Contact', :create_group_id => site.public_group_id)
+        end
+        if contact_class.new_record?
+          puts "Could not create 'Contact' virtual class in #{site.host} !"
+        else
+          execute "UPDATE nodes SET vclass_id = #{contact_class.id} WHERE kpath = 'NRC' AND site_id = #{site.id}"
+        end
+      end
+
+      # Add first_name, name and email to Contact vclass
+      TRANSFER_KEYS.each do |key|
+        Column.create(:role_id => contact_class.id, :ptype => 'string', :name => key)
+      end
+
+      # Move first_name, name, email from User to Contact
+      User.find(:all, :conditions => ["site_id = ?", site.id]).each do |user|
+        if node = user.node
+          node.update_attributes(Hash[*(TRANSFER_KEYS.map {|k| [k, user[k]]}).flatten])
+        end
+      end
+    end
+
+    TRANSFER_KEYS.each do |key|
+      remove_column :users, key
+    end
+
+    execute "UPDATE sites SET usr_prototype_id = anon_id"
+  end
+
+  def self.down
+    # Does not rollback content in TRANSFER_KEYS
+    TRANSFER_KEYS.each do |key|
+      add_column :users, key, :string
+    end
+    remove_column :sites, :usr_prototype_id
+    rename_column :users, :node_id, :contact_id
+    contact_ids = VirtualClass.find(:all, :conditions => "type = 'VirtualClass' AND kpath = 'NRC'").map(&:id)
+    execute "DELETE FROM columns WHERE role_id IN (#{contact_ids.join(',')})"
+    execute "DELETE FROM roles WHERE type = 'VirtualClass' AND (kpath = 'NR' OR kpath = 'NRC')"
+    execute "UPDATE nodes SET vclass_id = NULL WHERE kpath = 'NR' OR kpath = 'NRC'"
+  end
+end