wagn 1.13.0 → 1.14.0.pre1

data/db/migrate/20140822073704_create_new_revision_tables.rb

@@ -0,0 +1,43 @@
+# -*- encoding : utf-8 -*-
+class CreateNewRevisionTables < ActiveRecord::Migration
+
+  def up
+    add_column :cards, :db_content, :text
+    
+    create_table :card_acts do |t|
+      t.integer  :card_id
+      t.integer  :actor_id
+      t.datetime :acted_at
+      t.string   :ip_address
+    end
+    
+    create_table :card_actions do |t|
+      t.integer :card_id
+      t.integer :card_act_id
+      t.integer :super_action_id
+      t.integer :action_type
+      t.boolean :draft
+    end
+    
+    create_table :card_changes do |t|
+      t.integer :card_action_id
+      t.integer :field
+      t.text    :value 
+    end
+    
+    add_index :card_acts, :card_id, :name=>'card_id_index'
+    add_index :card_acts, :actor_id, :name=>'actor_id_index'
+    add_index :card_actions, :card_id, :name=>'card_id_index'
+    add_index :card_actions, :card_act_id, :name=>'card_act_id_index'
+    add_index :card_changes, :card_action_id, :name=>'card_action_id_index'
+    #add_index :card_actions, [:card_id, :draft], :name=>'card_id_and_draft_index'
+    #add_index :card_changes, [:card_action_id, :field], :name=>'card_action_id_and_field_index'
+  end
+
+  def down
+    remove_column :cards, :db_content
+    drop_table :card_acts
+    drop_table :card_actions
+    drop_table :card_changes
+  end
+end

data/db/migrate/20141001105348_move_revisions_to_actions.rb

@@ -0,0 +1,62 @@
+class MoveRevisionsToActions < ActiveRecord::Migration
+  class TmpRevision < ActiveRecord::Base
+    belongs_to :tmp_card, :foreign_key=>:card_id
+    self.table_name = 'card_revisions'
+    def self.delete_cardless
+      TmpRevision.where( TmpCard.where( :id=>arel_table[:card_id] ).exists.not ).delete_all
+    end
+  end
+  class TmpAct < ActiveRecord::Base
+    self.table_name = 'card_acts'
+  end
+  class TmpAction < ActiveRecord::Base
+    self.table_name = 'card_actions'
+  end
+  class TmpChange < ActiveRecord::Base
+    self.table_name = 'card_changes'
+  end
+  class TmpCard < ActiveRecord::Base
+    belongs_to :tmp_revision, :foreign_key=>:current_revision_id
+    has_many :tmp_actions, :foreign_key=>:card_id
+    self.table_name = 'cards'
+  end
+  
+  def up
+    TmpRevision.delete_cardless
+    
+    conn = TmpRevision.connection
+    created = Set.new
+
+    TmpRevision.find_each do |rev|
+      TmpAct.create({:id=>rev.id, :card_id=>rev.card_id, :actor_id=>rev.creator_id, :acted_at=>rev.created_at}, :without_protection=>true)      
+      if created.include? rev.card_id
+        TmpAction.connection.execute "INSERT INTO card_actions (id, card_id, card_act_id, action_type) VALUES 
+                                                               ('#{rev.id}', '#{rev.card_id}', '#{rev.id}', 1)"
+        TmpChange.connection.execute "INSERT INTO card_changes (card_action_id, field, value) VALUES 
+                                                               ('#{rev.id}', 2, #{conn.quote(rev.content)})"
+      else
+        TmpAction.connection.execute "INSERT INTO card_actions (id, card_id, card_act_id, action_type) VALUES 
+                                                              ('#{rev.id}', '#{rev.card_id}', '#{rev.id}', 0)"
+        
+        if tmp_card = rev.tmp_card
+          TmpChange.connection.execute "INSERT INTO card_changes (card_action_id, field, value) VALUES 
+              ('#{rev.id}', 0, #{conn.quote tmp_card.name}), 
+              ('#{rev.id}', 1, '#{tmp_card.type_id}'),
+              ('#{rev.id}', 2, #{conn.quote(rev.content)}),
+              ('#{rev.id}', 3, #{tmp_card.trash})"
+        end
+        created.add rev.card_id
+      end
+    end 
+
+    TmpCard.find_each do |card|
+      card.update_column(:db_content,card.tmp_revision.content) if card.tmp_revision
+    end
+
+    #drop_table :card_revisions
+    #remove_column :cards, :current_revision
+  end
+
+  def down
+  end
+end

data/db/migrate_cards/20130411191151_renaming_for_menu.rb

@@ -1,51 +1,48 @@
 # -*- encoding : utf-8 -*-
 
-class RenamingForMenu < ActiveRecord::Migration
-  include Wagn::MigrationHelper
+class RenamingForMenu < Wagn::Migration
   def up
-    contentedly do
-      renames = {
-        '*content'    => '*structure',
-        '*edit help'  => '*help',
-        '*links'      => '*links to',
-        '*inclusions' => '*includes',
-        '*linkers'    => '*linked to by',
-        '*includers'  => '*included by',
-        '*plus cards' => '*children',
-        '*plus parts' => '*mates',
-        '*editing'    => '*edited',
-      }
-      renames.each do |oldname, newname|
-        puts "updating: #{oldname}"
-        c = Card[oldname]
-        c.update_referencers = true
-        c.name = newname
-        c.save!
-      end
-      
-      codenames = %w{
-        by_name
-        by_update
-        by_create
-        refers_to
-        links_to
-        includes
-        referred_to_by
-        linked_to_by
-        included_by
-        children
-        mates
-        editors
-        discussion
-        created
-        edited
-      }
-      codenames.each do |codename|
-        name = codename =~ /^by|disc/ ? codename : '*' + codename
-        c = Card[name]
-        c.codename = codename
-        c.save!
-      end
+    renames = {
+      '*content'    => '*structure',
+      '*edit help'  => '*help',
+      '*links'      => '*links to',
+      '*inclusions' => '*includes',
+      '*linkers'    => '*linked to by',
+      '*includers'  => '*included by',
+      '*plus cards' => '*children',
+      '*plus parts' => '*mates',
+      '*editing'    => '*edited',
+    }
+    renames.each do |oldname, newname|
+      puts "updating: #{oldname}"
+      c = Card[oldname]
+      c.update_referencers = true
+      c.name = newname
+      c.save!
+    end
+    
+    codenames = %w{
+      by_name
+      by_update
+      by_create
+      refers_to
+      links_to
+      includes
+      referred_to_by
+      linked_to_by
+      included_by
+      children
+      mates
+      editors
+      discussion
+      created
+      edited
+    }
+    codenames.each do |codename|
+      name = codename =~ /^by|disc/ ? codename : '*' + codename
+      c = Card[name]
+      c.codename = codename
+      c.save!
     end
   end
 

data/db/migrate_cards/20130411211600_delete_old_related_tab_cards.rb

@@ -1,21 +1,18 @@
 # -*- encoding : utf-8 -*-
 
-class DeleteOldRelatedTabCards < ActiveRecord::Migration
-  include Wagn::MigrationHelper
+class DeleteOldRelatedTabCards < Wagn::Migration
   def up
-    contentedly do
-      [
-        '*related',
-        '*incoming',
-        '*outgoing',
-        '*community',
-        '*plusses',
-        'watcher instructions for related tab'
-      ].each do |name|
-        c = Card[name]
-        c.codename = nil
-        c.delete!
-      end      
-    end
+    [
+      '*related',
+      '*incoming',
+      '*outgoing',
+      '*community',
+      '*plusses',
+      'watcher instructions for related tab'
+    ].each do |name|
+      c = Card[name]
+      c.codename = nil
+      c.delete!
+    end      
   end
 end

data/db/migrate_cards/20130419215612_import_help_text.rb

@@ -1,16 +1,13 @@
 # -*- encoding : utf-8 -*-
 
-class ImportHelpText < ActiveRecord::Migration
-  include Wagn::MigrationHelper
+class ImportHelpText < Wagn::Migration
   def up
-    contentedly do
-      json = File.read( File.join Wagn.gem_root, 'db/migrate_cards/data/1.11_help_text.json' )
-      data = JSON.parse json
-      data.each do |atom|
-        c = atom['card']
-        Card.merge c['name'], { :type=>c['type'], :content=>atom['views'][0]['parts'] }, :pristine=>true
-      end      
-    end
+    json = File.read( File.join Wagn.gem_root, 'db/migrate_cards/data/1.11_help_text.json' )
+    data = JSON.parse json
+    data.each do |atom|
+      c = atom['card']
+      Card.merge c['name'], { :type=>c['type'], :content=>atom['views'][0]['parts'] }, :pristine=>true
+    end      
   end
 
 end

data/db/migrate_cards/20130823192433_add_style_cards.rb

@@ -1,90 +1,86 @@
 # -*- encoding : utf-8 -*-
 
-class AddStyleCards < ActiveRecord::Migration
-  include Wagn::MigrationHelper
+class AddStyleCards < Wagn::Migration
   def up
-    contentedly do
-      # TAKE "CSS" CODENAME FROM OLD *CSS CARD
-      old_css = Card[:css]
-      old_css.update_attributes :codename=>nil  #old *css card no longer needs this codename
-      
+    # TAKE "CSS" CODENAME FROM OLD *CSS CARD
+    old_css = Card[:css]
+    old_css.update_attributes :codename=>nil  #old *css card no longer needs this codename
+    
 
-      # CREATE CSS AND SCSS TYPES
-      # following avoids name conflicts (create statements do not).  need better api to support this?
-      css_attributes = { :codename=>:css, :type_id=>Card::CardtypeID }
-      new_css = Card.fetch 'CSS', :new=>css_attributes
-      new_css.update_attributes(css_attributes) unless new_css.new_card?
-      new_css.save!
-      
-      old_css.update_attributes :type_id=>new_css.id
-      
-      Card.create! :name=>'SCSS', :codename=>:scss, :type_id=>Card::CardtypeID
-      
-      
-      skin_attributes = { :codename=>:skin, :type_id=>Card::CardtypeID }
-      skin_card = Card.fetch 'Skin', :new=>skin_attributes
-      skin_card.update_attributes( skin_attributes ) unless skin_card.new_card?
-      skin_card.save!
-      
-      
-      # PERMISSIONS FOR CSS AND SCSS TYPES
-      
-      ['CSS', 'SCSS', 'Skin'].each do |type|
-        [ :create, :update, :delete].each do |action|
-          Card.create! :name=>"#{type}+#{Card[:type].name}+#{Card[action].name}",
-            :content=>"[[#{Card[:administrator].name}]]"
-        end
+    # CREATE CSS AND SCSS TYPES
+    # following avoids name conflicts (create statements do not).  need better api to support this?
+    css_attributes = { :codename=>:css, :type_id=>Card::CardtypeID }
+    new_css = Card.fetch 'CSS', :new=>css_attributes
+    new_css.update_attributes(css_attributes) unless new_css.new_card?
+    new_css.save!
+    
+    old_css.update_attributes :type_id=>new_css.id
+    
+    Card.create! :name=>'SCSS', :codename=>:scss, :type_id=>Card::CardtypeID
+    
+    
+    skin_attributes = { :codename=>:skin, :type_id=>Card::CardtypeID }
+    skin_card = Card.fetch 'Skin', :new=>skin_attributes
+    skin_card.update_attributes( skin_attributes ) unless skin_card.new_card?
+    skin_card.save!
+    
+    
+    # PERMISSIONS FOR CSS AND SCSS TYPES
+    
+    ['CSS', 'SCSS', 'Skin'].each do |type|
+      [ :create, :update, :delete].each do |action|
+        Card.create! :name=>"#{type}+#{Card[:type].name}+#{Card[action].name}",
+          :content=>"[[#{Card[:administrator].name}]]"
       end
-      
-      Card.create! :name=>'*style', :codename=>:style, :type_id=>Card::SettingID
-      style_set = "*style+#{Card[:right].name}"
-      Card.create! :name=>"#{style_set}+#{Card[:default].name}", :type_id=>Card::PointerID
-      Card.create! :name=>"#{style_set}+#{Card[:read].name}",    :content=>"[[#{Card[:anyone].name}]]"
-      Card.create! :name=>"#{style_set}+#{Card[:options].name}", :content=>%({"type":"Skin"}), :type=>Card::SearchTypeID
-      Card.create! :name=>"#{style_set}+#{Card[:input].name}",   :content=>'select'
-      Card.create! :name=>"#{style_set}+#{Card[:help].name}",    :content=>
-        %{Skin (collection of stylesheets) for card's page. [[http://wagn.org/skins|more]]}
-      
-      # IMPORT STYLESHEETS
-      
-      simple_styles, classic_styles = [], []
-      %w{
-        jquery-ui-smoothness.css functional.scss standard.scss right_sidebar.scss common.scss classic_cards.scss traditional.scss
-      }.each_with_index do |sheet, index|
-        name, type = sheet.split '.'
-        name.gsub! '_', ' '
-        index < 5 ? simple_styles << name : classic_styles << name
-        Card.create! :name=>"style: #{name}", :type=>type, :codename=>"style_#{name.to_name.key}"
-      end
-            
-      # CREATE SKINS
-      
-      Card.create! :name=>"simple skin", :type=>'Skin', :content=>
-        simple_styles.map { |s| "[[style: #{s}]]" } * "\n"
-      Card.create! :name=>"classic skin", :type=>'Skin', :content=>
-        "[[simple skin]]\n" + ( classic_styles.map { |s| "[[style: #{s}]]" }.join"\n" )
-      
-      # CREATE DEFAULT STYLE RULE
-      # (this auto-generates cached file)
-      
-      default_skin = if old_css.content =~ /\S/
-        name = 'customized classic skin'
-        Card.create! :name=>name, :type=>'Skin', :content=>"[[classic skin]]\n[[*css]]"
-        name
-      else
-        old_css.delete!
-        'classic skin'
-      end
-      
-      Wagn::Cache.reset_global
-      begin
-        Card.create! :name=>"#{Card[:all].name}+*style", :content=>"[[#{default_skin}]]"
-      rescue
-        if default_skin =~ /customized/
-          Card["#{Card[:all].name}+*style"].update_attributes :content=>"[[classic skin]]"
-        end
+    end
+    
+    Card.create! :name=>'*style', :codename=>:style, :type_id=>Card::SettingID
+    style_set = "*style+#{Card[:right].name}"
+    Card.create! :name=>"#{style_set}+#{Card[:default].name}", :type_id=>Card::PointerID
+    Card.create! :name=>"#{style_set}+#{Card[:read].name}",    :content=>"[[#{Card[:anyone].name}]]"
+    Card.create! :name=>"#{style_set}+#{Card[:options].name}", :content=>%({"type":"Skin"}), :type=>Card::SearchTypeID
+    Card.create! :name=>"#{style_set}+#{Card[:input].name}",   :content=>'select'
+    Card.create! :name=>"#{style_set}+#{Card[:help].name}",    :content=>
+      %{Skin (collection of stylesheets) for card's page. [[http://wagn.org/skins|more]]}
+    
+    # IMPORT STYLESHEETS
+    
+    simple_styles, classic_styles = [], []
+    %w{
+      jquery-ui-smoothness.css functional.scss standard.scss right_sidebar.scss common.scss classic_cards.scss traditional.scss
+    }.each_with_index do |sheet, index|
+      name, type = sheet.split '.'
+      name.gsub! '_', ' '
+      index < 5 ? simple_styles << name : classic_styles << name
+      Card.create! :name=>"style: #{name}", :type=>type, :codename=>"style_#{name.to_name.key}"
+    end
+          
+    # CREATE SKINS
+    
+    Card.create! :name=>"simple skin", :type=>'Skin', :content=>
+      simple_styles.map { |s| "[[style: #{s}]]" } * "\n"
+    Card.create! :name=>"classic skin", :type=>'Skin', :content=>
+      "[[simple skin]]\n" + ( classic_styles.map { |s| "[[style: #{s}]]" }.join"\n" )
+    
+    # CREATE DEFAULT STYLE RULE
+    # (this auto-generates cached file)
+    
+    default_skin = if old_css.content =~ /\S/
+      name = 'customized classic skin'
+      Card.create! :name=>name, :type=>'Skin', :content=>"[[classic skin]]\n[[*css]]"
+      name
+    else
+      old_css.delete!
+      'classic skin'
+    end
+    
+    Wagn::Cache.reset_global
+    begin
+      Card.create! :name=>"#{Card[:all].name}+*style", :content=>"[[#{default_skin}]]"
+    rescue
+      if default_skin =~ /customized/
+        Card["#{Card[:all].name}+*style"].update_attributes :content=>"[[classic skin]]"
       end
-      
     end
   end
 

data/db/migrate_cards/20130910183318_move_styles_to_content.rb

@@ -1,13 +1,10 @@
 # -*- encoding : utf-8 -*-
 
-class MoveStylesToContent < ActiveRecord::Migration
-  include Wagn::MigrationHelper
+class MoveStylesToContent < Wagn::Migration
   def up
-    contentedly do
-      dir = "#{Wagn.gem_root}/db/migrate_cards/data/1.12_stylesheets"
-      %w{ right_sidebar common classic_cards traditional }.each do |sheetname|
-        Card["style: #{sheetname}"].update_attributes! :codename=>nil, :content=>File.read("#{dir}/#{sheetname}.scss")
-      end
+    dir = "#{Wagn.gem_root}/db/migrate_cards/data/1.12_stylesheets"
+    %w{ right_sidebar common classic_cards traditional }.each do |sheetname|
+      Card["style: #{sheetname}"].update_attributes! :codename=>nil, :content=>File.read("#{dir}/#{sheetname}.scss")
     end
   end
 

data/db/migrate_cards/20130920214038_jsonize_tinymce.rb

@@ -1,18 +1,15 @@
 # -*- encoding : utf-8 -*-
 
-class JsonizeTinymce < ActiveRecord::Migration
-  include Wagn::MigrationHelper
+class JsonizeTinymce < Wagn::Migration
   def up
-    contentedly do
-      card = Card[:tiny_mce]
-      cleaned_rows = card.content.strip.split( /\s*\,\s+/ ).map do |row|
-        key, val = row.split /\s*\:\s*/
-        val.gsub! /\"\s*\+\s*\"/, ''
-        val.gsub! "'", '"'
-        %("#{key}":#{val})
-      end
-      card.content = %({\n#{ cleaned_rows.join ",\n" }\n})
-      card.save!
+    card = Card[:tiny_mce]
+    cleaned_rows = card.content.strip.split( /\s*\,\s+/ ).map do |row|
+      key, val = row.split /\s*\:\s*/
+      val.gsub! /\"\s*\+\s*\"/, ''
+      val.gsub! "'", '"'
+      %("#{key}":#{val})
     end
+    card.content = %({\n#{ cleaned_rows.join ",\n" }\n})
+    card.save!
   end
 end