zena 1.0.0.rc2 → 1.0.0.rc3

data/bricks/zena/zena/migrate/03_zerox1_data.rb

@@ -0,0 +1,380 @@
+require 'fileutils'
+# ============================================ contact_contents
+# migrate content to properties
+class ContactContent < ActiveRecord::Base
+  TRANSLATE_KEYS = {
+    'name' => 'last_name',
+    'zip'  => 'postal_code',
+    'city' => 'locality',
+  }
+  def migrate(version)
+    %w{first_name name address zip city telephone mobile email birthday country}.each do |key|
+      value = self[key]
+      next if value.blank?
+      version.prop[TRANSLATE_KEYS[key] || key] = value
+    end
+  end
+end
+
+# ============================================ document_contents
+# migrate page ref to attachments
+class AttachmentMig < Versions::SharedAttachment
+  set_table_name :attachments
+
+  def filepath(format=nil)
+    "#{SITES_ROOT}#{$site.data_path}/full/#{super()}"
+  end
+end
+
+class VClassMig < ActiveRecord::Base
+  set_table_name :roles
+end
+
+class UploadedFile < File
+  attr_accessor :original_filename
+end
+
+# migrate content to properties
+class DocumentContent < ActiveRecord::Base
+  TRANSLATE_KEYS = {
+    'exif_json' => 'exif'
+  }
+
+  # Disable type column
+  def self.inheritance_column
+    nil
+  end
+
+  def migrate_attachment(version)
+    if !self.attachment_id
+      # old path
+      digest = Digest::SHA1.hexdigest(self[:id].to_s)
+      # make sure name is not corrupted
+      fname = name.gsub(/[^a-zA-Z\-_0-9]/,'')
+
+      if File.exist?("#{SITES_ROOT}#{$site.data_path}/full") && !File.exist?("#{SITES_ROOT}#{$site.data_path}/full_old")
+        FileUtils.mv("#{SITES_ROOT}#{$site.data_path}/full","#{SITES_ROOT}#{$site.data_path}/full_old")
+      end
+      old_path = "#{SITES_ROOT}#{$site.data_path}/full_old/#{digest[0..0]}/#{digest[1..1]}/#{digest[2..2]}/#{fname}"
+
+      atta = AttachmentMig.new
+      atta['user_id'] = version.user_id
+      atta['site_id'] = version.site_id
+      if type != 'TextDocumentContent'
+        if File.exist?(old_path)
+          file = UploadedFile.new(old_path)
+          file.original_filename = fname
+          atta.file = file
+          atta.save
+          self.attachment_id = atta.id
+        else
+          puts "Missing attachment file for node_id #{version.node_id} (#{version.idx_text_high}): changed to Node"
+          NodeMig.connection.execute "UPDATE nodes SET kpath = 'N', type = 'Node' WHERE id = #{version.node_id}"
+        end
+      end
+      self.save
+    end
+    version.attachment_id = self.attachment_id
+  end
+
+  def migrate(version)
+    exif = self['exif_json']
+    if !exif.blank?
+      version.prop['exif'] = ExifData.json_create('data' => exif)
+    end
+    %w{size content_type ext width height}.each do |key|
+      value = self[key]
+      next if value.blank?
+      version.prop[TRANSLATE_KEYS[key] || key] = value
+    end
+    migrate_attachment(version)
+  end
+end
+
+# ============================================ dyn_attributes
+class DynAttribute < ActiveRecord::Base
+  set_table_name :dyn_attributes
+
+  def migrate(version)
+    version.prop[key] = value
+  end
+end
+
+# ============================================ site_attributes
+class SiteAttribute < ActiveRecord::Base
+  set_table_name :site_attributes
+
+  def migrate(site)
+    site.prop[key] = value
+  end
+end
+
+# ============================================ template_contents
+# migrate content to properties
+# rebuild index ==> should recreate idx_templates content
+class TemplateContent < ActiveRecord::Base
+  TRANSLATE_KEYS = {
+    'klass' => 'target_klass'
+  }
+  def migrate(version)
+    version['skin_id'] = version.node[:section_id]
+
+    %w{format tkpath mode klass}.each do |key|
+      value = self[key]
+      next if value.blank?
+      version.prop[TRANSLATE_KEYS[key] || key] = value
+    end
+  end
+end
+
+# ============================================ versions
+class VersionMig < ActiveRecord::Base
+  set_table_name :versions
+  belongs_to :node, :class_name => 'NodeMig', :foreign_key => 'node_id'
+  has_one :template_content, :foreign_key => 'node_id', :primary_key => 'node_id'
+
+  include Property
+  # Should be the same serialization as in Version and Site
+  include Property::Serialization::JSON
+
+  def contact_content
+    @contact_content ||= ContactContent.find(:first,
+      :conditions => ['version_id = ?', content_id || id]
+    )
+  end
+
+  def document_content
+    @document_content ||= DocumentContent.find(:first,
+      :conditions => ['version_id = ?', content_id || id]
+    )
+  end
+
+  def migrate!
+    migrate_base
+    migrate_contact
+    migrate_document
+    migrate_template
+    migrate_dyn_attributes
+    # Allow any property
+    class << self.prop
+      def validate
+        # do nothing
+        true
+      end
+    end
+
+    if !save
+      puts "Could not save version #{id} (#{idx_text_high}):"
+      errors.each_error do |er,msg|
+        puts "  [#{er}] #{msg}"
+      end
+    end
+  end
+
+  def migrate_base
+    # migrate content to version properties
+    prop['custom_a'] = node.custom_a unless node.custom_a.nil?
+    prop['custom_b'] = node.custom_b unless node.custom_b.nil?
+    prop['title']   = idx_text_high
+    prop['summary'] = idx_text_medium
+    prop['text']    = idx_text_low
+    prop['ext']     = 'zafu' if node.kpath =~ /\ANDTT/
+  end
+
+  def migrate_contact
+    if contact_content
+      contact_content.migrate(self)
+    end
+  end
+
+  def migrate_document
+    if document_content
+      document_content.migrate(self)
+    end
+  end
+
+  def migrate_template
+    if template_content
+      template_content.migrate(self)
+    end
+  end
+
+  def migrate_dyn_attributes
+    DynAttribute.find(:all, :conditions => ["owner_id = ?", self.id]).each do |dyn|
+      dyn.migrate(self)
+    end
+  end
+end
+
+class NodeMig < ActiveRecord::Base
+  set_table_name :nodes
+  has_many :versions, :class_name => 'VersionMig', :foreign_key => 'node_id'
+
+  # Disable type column
+  def self.inheritance_column
+    nil
+  end
+end
+
+# === dyn_attributes
+
+class SiteMig < ActiveRecord::Base
+  CHUNK_SIZE = 200
+  has_many :site_attributes, :class_name => 'SiteAttribute', :foreign_key => 'owner_id'
+
+  include Property
+
+  set_table_name :sites
+
+  def data_path
+    "/#{self[:host]}/data"
+  end
+
+  def migrate!
+    # needed by DocumentContent
+    $site = self
+
+    # Allow any property
+    class << self.prop
+      def validate
+        # do nothing
+        true
+      end
+    end
+
+    migrate_nodes
+    migrate_site
+    if !save
+      puts "Could not save site #{id} (#{host}):"
+      errors.each_error do |er,msg|
+        puts "  [#{er}] #{msg}"
+      end
+    end
+  end
+
+  def migrate_nodes
+    node_count = NodeMig.count(:conditions =>['site_id = ?', id])
+    puts "========================================== Start data migration to 1.0 for #{host} (#{node_count} nodes)"
+    puts "========== creating virtual classes (Contact, Reference)"
+    # Create Contact + Reference virtual classes
+    ref_class = VClassMig.create(
+      :name       => 'Reference',
+      :kpath      => 'NR',
+      :real_class => 'Node',
+      :create_group_id => public_group_id,
+      :site_id    => id
+    )
+    contact_class = VClassMig.create(
+      :name       => 'Contact',
+      :kpath      => 'NRC',
+      :real_class => 'Node',
+      :create_group_id => public_group_id,
+      :site_id    => id
+    )
+    # Update nodes depending on Contact + Reference classes
+    execute "UPDATE nodes SET vclass_id = #{ref_class.id} WHERE type = 'Reference' AND vclass_id IS NULL AND site_id = #{id}"
+    execute "UPDATE nodes SET vclass_id = #{contact_class.id} WHERE type = 'Contact' AND vclass_id IS NULL AND site_id = #{id}"
+    execute "UPDATE nodes SET type = 'Node' WHERE (type = 'Reference' or type = 'Contact') AND site_id = #{id}"
+
+    page  = 0
+    while true do
+      nodes = NodeMig.find(:all,
+        :conditions => ['site_id = ?', id],
+        :limit  => CHUNK_SIZE,
+        :offset => page * CHUNK_SIZE,
+        :order  => 'id ASC'
+      )
+      break if nodes == []
+      puts "========== migrating nodes #{(page * CHUNK_SIZE) + 1} to #{[((page+1) * CHUNK_SIZE), node_count].min}"
+      nodes.each do |n|
+        n.versions.each do |v|
+          v.migrate!
+        end
+      end
+      page += 1
+    end
+
+    # ============================================ nodes
+    # 1. Set skin_id from skin name
+    NodeMig.find(:all,
+      :conditions => ['site_id = ? AND type = ?', id, 'Skin']
+    ).each do |skin|
+      execute "UPDATE nodes SET skin_id = #{skin.id} WHERE skin = '#{skin.name}' and site_id = #{id}"
+    end
+
+    # 2. Set _id from name
+    execute "UPDATE nodes SET _id = name WHERE site_id = #{id}"
+
+    # 3. move custom_a, custom_b to idx_integer1, idx_integer2
+    execute "UPDATE nodes SET idx_integer1 = custom_a, idx_integer2 = custom_b"
+  end
+
+  def migrate_site
+    # ============================================ site_attributes
+    # migrate to properties
+    site_attributes.each do |attribute|
+      attribute.migrate(self)
+    end
+  end
+
+  private
+    def execute(*args)
+      self.class.connection.execute(*args)
+    end
+end
+
+
+# This migration should be run in the 1.0 branch *AFTER* the migration
+# to Zerox1Schema.
+class Zerox1Data < ActiveRecord::Migration
+  extend Zena::Acts::Secure
+  def self.up
+    if connection.tables.include?('contact_contents') && ContactContent.first
+      # Need to migrate data
+      if $Zerox1SchemaRunning
+        raise "\n\n=> This is not an error !\n=> Please continue migrations (restart is needed before migrating data)\n=> rake zena:migrate\n\n"
+      end
+    else
+      # Nothing to be done here
+      puts "=>  No legacy data to migrate."
+      return
+    end
+
+    # Prepare
+    add_column :document_contents, :attachment_id, :integer unless DocumentContent.column_names.include?('attachment_id')
+
+    DocumentContent.reset_column_information
+
+    execute "UPDATE roles SET real_class = 'Node' WHERE real_class = 'Reference' OR real_class = 'Contact'"
+
+    sites = SiteMig.all
+    sites.each do |site|
+      site.migrate!
+    end
+
+    # ============================================ roles
+    # make properties from dyn_keys list ?
+
+    execute "UPDATE roles SET type = 'VirtualClass'"
+
+    native_key = 'icon'
+    prop_key   = 'icon'
+    VClassMig.all.each do |rec|
+      value = rec[native_key]
+      next if value.blank?
+      prop  = rec.prop
+      prop[prop_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
+
+    puts %q{
+======== Migration succeded.
+***********************************************************************************
+****************** You need to rebuild vhash, fullpath and index now! *************
+
+=> rake zena:rebuild_vhash WORKER=false && rake zena:rebuild_fullpath WORKER=false && rake zena:rebuild_index WORKER=false
+
+***********************************************************************************
+}
+  end
+end

data/bricks/zena/zena/migrate/20110315161158_add_reverse_scope_to_roles.rb

@@ -0,0 +1,9 @@
+class AddReverseScopeToRoles < ActiveRecord::Migration
+  def self.up
+    add_column :roles, :idx_reverse_scope, :string
+  end
+
+  def self.down
+    remove_column :roles, :idx_reverse_scope
+  end
+end

data/config/database_example.yml

@@ -1,5 +1,5 @@
 # Enter database configuration information here (rename this file "database.yml").
-# You do not need to do any of this if you use capistraon (see config/deploy.rg).
+# You do not need to do any of this if you use capistrano (see config/deploy.rg).
 # MySQL
 login: &dev_login
   adapter: mysql

data/config/environment.rb

@@ -1,5 +1,5 @@
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/config/gems.yml

@@ -1,23 +1,24 @@
 hpricot:
-gettext:        '>= 1.93.0'
+gettext:        '= 2.1.0'
 ruby-recaptcha: '= 1.0.0'
 syntax:         '= 1.0.0'
-tzinfo:         '>= 0.3.12'
+tzinfo:         '= 0.3.26'
 uuidtools:      '= 2.0.0'
-rails:          '= 2.3.8'
-json:           '>= 1.1.9'
+rails:          '= 2.3.11'
+json:           '= 1.5.1'
 authlogic:      '= 2.1.3'
 fast_gettext:   '~> 0.4.16'
 will_paginate:  '~> 2.3.12'
-differ:         '>= 0.1.1'
+differ:         '= 0.1.2'
 shoulda:        '= 2.10.3'
+httparty:       '= 0.6.1'
 
-querybuilder:   '>= 0.9.5'
-yamltest:       '>= 0.7.0'
-rubyless:       '>= 0.8.2'
-property:       '>= 2.1.2'
-versions:       '>= 0.3.1'
-zafu:           '>= 0.7.6'
+querybuilder:   '= 1.0.0'
+yamltest:       '= 0.7.0'
+rubyless:       '= 0.8.2'
+property:       '= 2.1.2'
+versions:       '= 0.3.1'
+zafu:           '= 0.7.9'
 
 jeweler:
 
@@ -28,19 +29,21 @@ RedCloth:
 rmagick:
   optional:     yes
   lib:          'RMagick'
-  version:      '>= 2.10.0'
+  version:      '= 2.13.1'
 
 thinking-sphinx:
   optional:     yes
   brick:        sphinx
   lib:          'thinking_sphinx'
-  version:      '>= 1.3.14'
+  version:      '= 1.3.14'
+
+# needs riddle 1.0.10
 
 ts-delayed-delta:
   optional:     yes
   brick:        sphinx
   lib:          'thinking_sphinx/deltas/delayed_delta'
-  version:      '>= 1.0.2'
+  version:      '= 1.0.2'
 
 delayed_job:
   optional:     yes

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

@@ -1 +1,8 @@
-<r:include template='Project'/>
+<r:include template='Node'>
+  <r:with part='context'/>
+  <r:with part='content' class='project'>
+    <r:include template='Node' part='related'/>
+    <r:zazen attr='text' live='true'/>
+    <r:include template='notes'/>
+  </r:with>
+</r:include>

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

@@ -20,6 +20,7 @@ td { padding:5px; }
 <body do='void' name='body'>
     <div id='login_form'>
       <p class='welcome' do='link'><r:t>Login for</r:t> <b do='title'/></p>
+      <r:flash_messages/>
       <form action="/session" method="post">    <table>
           <tr>
             <td><label for='user_login' do='trans'>User name:</label></td>

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

@@ -15,8 +15,7 @@
 <body>
   <div id='loader'><img src='/images/ajax-loader.gif'/> <r:trans text='uploading'/></div>
 
-  <div id='messages'>
-  </div>
+  <r:flash_messages/>
 
 <r:content_for_layout/>
 

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

@@ -6,13 +6,13 @@
 
     <ul id='search_results' do='search_results'>
       <li class='result_entry' do='each'>
-        <p class='result_image' do='Document'>
+        <p class='result_image' do='Document?'>
           <r:link format='data' do='img' alt_src='icon' mode='pv'/>
           <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='short_path'/></p>
-        <r:summary/>
+        <r:zazen attr='summary'/>
         <div class='clear'></div>
       </li>
       <r:else>

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

@@ -7,7 +7,7 @@
   <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
   <r:void name='stylesheets'>
     <r:stylesheets media='all'/>
-    <link href="style.css" rel="Stylesheet" type="text/css"/>
+    <link href="img/style.css" rel="Stylesheet" type="text/css"/>
   </r:void>
 
   <r:javascripts/>
@@ -18,10 +18,10 @@
   <div id='top' do='root' do='link'/>
   <div id='header'>
     <div id='login' do='login_link'/>
-    <div id='visitor' do='visitor_link'/>
+    <div id='visitor'><r:visitor_link/> <r:if test='can_edit?' do='link' mode='admin' do='t'>btn_edit</r:if></div>
     <div id='search' do='search_box' type='search'/>
     <ol id='menu' do='root' do='pages'>
-      <li do='each' on_if_node='ancestor' do='link'/>
+      <li do='each' on_if='is_ancestor?(main)' do='link'/>
     </ol>
   </div>
   <div id='container'>
@@ -34,8 +34,8 @@
           <li class='inline_form' do='form'>
             <ol>
               <li><r:select name='klass' root_class='Page'/></li>
-              <li><input type='text' name='title' value=''/></li>
-              <li class='validate'><input type="submit" value='#{trans("validate")'/></li>
+              <li><r:input type='text' name='title' value=''/></li>
+              <li class='validate'><r:input type="submit" value='#{trans("validate")'/></li>
             </ol>
           </li>
         </ol>
@@ -64,8 +64,8 @@
             <li do='add' before='self'/>
             <li class='inline_form' do='form'>
               <p class='node_klass'>  <r:select name='klass' root_class='Page'/></p>
-              <p class='node_title'><input type='text' name='title' value=''/></p>
-              <p class='btn_validate'><input type="submit" value='#{trans("validate")}'/></p>
+              <p class='node_title'><r:input type='text' name='title' value=''/></p>
+              <p class='btn_validate'><r:input type="submit" value='#{trans("validate")}'/></p>
             </li>
           </ol>
         </r:pages>
@@ -75,8 +75,8 @@
             <li do='add' before='self'/>
             <li class='inline_form' do='form'>
               <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>
+              <p class='node_title'><r:input type='text' name='title' value=''/></p>
+              <p class='btn_validate'><r:input type="submit" value='#{trans("validate")}'/></p>
             </li>
           </ol>
         </r:nodes>

data/db/init/base/skins/default/img/translations.yml

@@ -0,0 +1,11 @@
+translations:
+  add_object: "<img src='/images/add.png' title='add a new object'/> add object"
+  upload_document: "<img src='/images/add.png' title='upload a new document'/> upload document"
+  view_live: "view live <img src='/images/bullet_go.png'/>"
+  page: page
+  records: records
+  root_node: root node
+  not_found: not found
+  crop: crop
+  no_parent: no parent
+  admin_interface: admin interface

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

@@ -1,17 +1,15 @@
-<div id='notes' do='notes' in='project' limit='10' order='log_at DESC'>
+<div id='notes' do='posts' in='project' limit='10' order='date desc'>
   <ul class='note_list'>
-    <li do='add' after='self'/>
+    <li do='add' after='self' klass='Post'/>
     <li class='inline_form' do='form'>
-      <form>
-        <p class='node_title'><input type='text' name='title' size='25'/></p>
-        <p class='node_klass'>  <r:select name='klass' root_class='Note' selected='Post'/></p>
-        <p class='node_log_at'> <input type='date_box' name='log_at'/> </p>
-        <p class='validate'>    <input type="submit" value='#{trans("validate")}'/></p>
-      </form>
+      <p class='node_title'><r:input type='text' name='title' size='25'/></p>
+      <p class='node_klass'>  <r:select name='klass' root_class='Note' selected='Post'/></p>
+      <p class='node_date'> <r:input type='date_box' name='date'/> </p>
+      <p class='validate'>     <r:input type="submit" value='#{trans("validate")}'/></p>
     </li>
     <li class='note' do='each' live='true'>
       <div class='header'>
-        <p class='log_at' do='show' date='log_at' tformat='full_date'>04.10</p>
+        <p class='log_at' do='show' attr='date' tformat='full_date'>04.10</p>
         <h2 class='title' do='title' actions='all'/>
         <div class='summary' do='zazen(summary)' live='true'/>
       </div>

data/doc/zafu_changes.yml

@@ -27,3 +27,15 @@ CHANGESET2:
         new: "<r:anchor do='link'/>"
 
 
+show_path: "<ul id='path' do='ancestors'><li do='each' do='link'/></ul>"
+start_node: "start"
+# [v_title]: "title"
+v_title: "title"
+"<r:if kind_of='Section'": "<r:Section?>"
+"<r:text/>": "mat"
+"on_if_node='ancestor'": "on_if='is_ancestor?(main)'"
+"<div do='admin_links'/>": "<ol class='admin_links' do='admin_links'>
+    <li do='each' do='show'><a href='#'>do this</a></li>
+  </ol>"
+"set_class='li_s[v_status]'": "class='li_s#{v.status}'"
+"<meta name='keywords' do='void' set_content='[d_keywords]'/>": "<meta name='keywords' content='#{keywords}'/>"