acts_as_archive 0.2.0 → 0.2.1

data/README.markdown

@@ -29,22 +29,23 @@ class Article < ActiveRecord::Base
 end
 </pre>
 
-<a name="run_acts_as_archive"></a>
+<a name="create_archive_tables"></a>
 
-Run acts\_as\_archive
+Create archive tables
 ---------------------
 
+Add this line to a migration:
+
 <pre>
-cd your_rails_app
-acts_as_archive Article
+ActsAsArchive.update Article, Comment
 </pre>
 
-Run this command every time you add <code>acts\_as\_archive</code> to a new model.
-
-This command creates your archive tables (<code>archived_articles</code> as per the example).
+Replace <code>Article, Comment</code> with your own models that use <code>acts_as_archive</code>.
 
 Archive tables mirror your table's structure, but with an additional <code>deleted_at</code> column.
 
+There is an [alternate way to create archive tables](http://wiki.github.com/winton/acts_as_archive/alternatives-to-migrations) if you don't like migrations.
+
 That's it!
 ----------
 
@@ -57,6 +58,8 @@ What if my schema changes?
 
 New migrations are automatically applied to the archive table.
 
+No action is necessary on your part.
+
 Query the archive
 -----------------
 
@@ -78,9 +81,9 @@ Article.restore_all([ 'id = ?', 1 ])
 Auto-migrate from acts\_as\_paranoid
 ------------------------------------
 
-If you previously used <code>acts\_as\_paranoid</code>, the <code>acts\_as\_archive</code>
-command will automatically move your deleted records to the archive table
-(see <a href="#run_acts_as_archive">_Run acts\_as\_archive_</a>).
+If you previously used <code>acts\_as\_paranoid</code>, the <code>ActsAsArchive.update</code>
+call will automatically move your deleted records to the archive table
+(see <a href="#create_archive_tables">_Create archive tables_</a>).
 
 Original <code>deleted_at</code> values are preserved.
 
@@ -97,5 +100,5 @@ class Article < ActiveRecord::Base
 end
 </pre>
 
-Run the <code>acts\_as\_archive</code> command upon adding new indexes
-(see <a href="#run_acts_as_archive">_Run acts\_as\_archive_</a>).
+Call <code>ActsAsArchive.update</code> upon adding new indexes
+(see <a href="#create_archive_tables">_Create archive tables_</a>).

data/lib/acts_as_archive/base/adapters/mysql.rb

@@ -0,0 +1,17 @@
+module ActsAsArchive
+  module Base
+    module Adapters
+      module MySQL
+        
+        private
+
+        def archive_table_indexed_columns
+          index_query = "SHOW INDEX FROM archived_#{table_name}"
+          indexes = connection.select_all(index_query).collect do |r|
+            r["Column_name"]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_archive/base/adapters/postgresql.rb

@@ -0,0 +1,34 @@
+module ActsAsArchive
+  module Base
+    module Adapters
+      module PostgreSQL
+        
+        private
+
+        def archive_table_indexed_columns
+          index_query = <<-SQL
+            SELECT c2.relname as index_name
+            FROM pg_catalog.pg_class c,
+              pg_catalog.pg_class c2,
+              pg_catalog.pg_index i
+            WHERE c.oid = (SELECT c.oid
+              FROM pg_catalog.pg_class c
+              WHERE c.relname ~ '^(archived_#{table_name})$')
+            AND c.oid = i.indrelid
+            AND i.indexrelid = c2.oid
+          SQL
+          
+          index_query.gsub!(/\s+/, ' ').strip!
+          indexes = connection.select_all(index_query).collect do |r|
+            r["index_name"]
+          end
+
+          # HACK: reverse engineer the column name
+          indexes.map do |index|
+            index.split("_on_").last
+          end
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_archive/base/table.rb

@@ -6,20 +6,28 @@ module ActsAsArchive
         unless base.included_modules.include?(InstanceMethods)
           base.send :extend, ClassMethods
           base.send :include, InstanceMethods
+          
+          if base.connection.class.to_s.include?('Mysql')
+            base.send :extend, ActsAsArchive::Base::Adapters::MySQL
+          elsif base.connection.class.to_s.include?('PostgreSQL')
+            base.send :extend, ActsAsArchive::Base::Adapters::PostgreSQL
+          else
+            raise 'acts_as_archive does not support this database adapter'
+          end
         end
       end
 
       module ClassMethods
-        
+
         def archive_table_exists?
           connection.table_exists?("archived_#{table_name}")
         end
-        
+
         def create_archive_table
           if table_exists? && !archive_table_exists?
             connection.execute(%{
               CREATE TABLE archived_#{table_name}
-              ENGINE=InnoDB
+                #{"ENGINE=InnoDB" if connection.class.to_s.include?('Mysql')}
                 AS SELECT * from #{table_name}
                 WHERE false;
             })
@@ -29,13 +37,11 @@ module ActsAsArchive
             end
           end
         end
-        
+
         def create_archive_indexes
           if archive_table_exists?
-            indexes = "SHOW INDEX FROM archived_#{table_name}"
-            indexes = connection.select_all(indexes).collect do |r|
-              r["Column_name"]
-            end
+            indexes = archive_table_indexed_columns
+
             (archive_indexes - indexes).each do |index|
               connection.add_index("archived_#{table_name}", index)
             end
@@ -44,7 +50,8 @@ module ActsAsArchive
             end
           end
         end
-        
+
+
         def migrate_from_acts_as_paranoid
           if column_names.include?('deleted_at')
             if table_exists? && archive_table_exists?

data/lib/acts_as_archive.rb

@@ -6,10 +6,13 @@ module ActsAsArchive
   def self.update(*models)
     models.each do |klass|
       if klass.respond_to?(:acts_as_archive?) && klass.acts_as_archive?
-        klass.create_archive_table
-        klass.migrate_from_acts_as_paranoid
-        klass.create_archive_indexes
-        puts 'Success!'
+        time = Benchmark.measure do
+          klass.create_archive_table
+          klass.migrate_from_acts_as_paranoid
+          klass.create_archive_indexes
+        end
+        $stdout.puts "-- ActsAsArchive.update(#{models.join(', ')})"
+        $stdout.puts "   -> #{"%.4fs" % time.real}"
       end
     end
   end

data/require.rb

@@ -2,9 +2,9 @@ require 'rubygems'
 gem 'require'
 require 'require'
 
-Require File.dirname(__FILE__) do
+Require do
   gem(:activerecord) { require 'active_record' }
-  gem :require, '=0.1.8'
+  gem :require, '=0.2.1'
   gem(:rake, '=0.8.7') { require 'rake' }
   gem :rspec, '=1.3.0'
   
@@ -17,11 +17,13 @@ Require File.dirname(__FILE__) do
     name 'acts_as_archive'
     homepage "http://github.com/winton/#{name}"
     summary "Don't delete your records, move them to a different table"
-    version '0.2.0'
+    version '0.2.1'
   end
   
   lib do
     require "lib/acts_as_archive/base"
+    require "lib/acts_as_archive/base/adapters/mysql"
+    require "lib/acts_as_archive/base/adapters/postgresql"
     require "lib/acts_as_archive/base/destroy"
     require "lib/acts_as_archive/base/restore"
     require "lib/acts_as_archive/base/table"

data/spec/spec_helper.rb

@@ -39,7 +39,7 @@ def create_records(klass=Article, values={})
       end
     end
     connection.execute(%{
-      INSERT INTO #{table} (#{cols.collect { |c| "`#{c}`" }.join(', ')})
+      INSERT INTO #{table} (#{cols.collect { |c| "#{c}" }.join(', ')})
         VALUES (#{vals.join(', ')})
     })
     klass.find(x)
@@ -71,10 +71,7 @@ def establish_test_db
 end
 
 def indexes
-  query = "SHOW INDEX FROM archived_#{Article.table_name}"
-  connection.select_all(query).collect do |r|
-    r["Column_name"]
-  end
+  Article.send(:archive_table_indexed_columns)
 end
 
 def migrate_up(directory='migrate')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_archive
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -08:00
+date: 2010-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.8
+        version: 0.2.1
     version: 
 description: 
 email: mail@wintoni.us
@@ -33,6 +33,8 @@ extra_rdoc_files:
 files: 
 - bin/acts_as_archive
 - init.rb
+- lib/acts_as_archive/base/adapters/mysql.rb
+- lib/acts_as_archive/base/adapters/postgresql.rb
 - lib/acts_as_archive/base/destroy.rb
 - lib/acts_as_archive/base/restore.rb
 - lib/acts_as_archive/base/table.rb