acts_as_archive 0.2.1 → 0.2.2

data/Rakefile

@@ -1,2 +1,9 @@
 require "#{File.dirname(__FILE__)}/require"
-Require.rakefile!
+Require.rakefile!
+
+desc "Generate gemspec"
+task :gemspec do
+  File.open("#{Rake.original_dir}/acts_as_archive.gemspec", 'w') do |f|
+    f.write(Require.gemspec.to_ruby)
+  end
+end

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

@@ -2,33 +2,39 @@ module ActsAsArchive
   module Base
     module Adapters
       module PostgreSQL
-        
+
         private
 
         def archive_table_indexed_columns
+          # This query comes courtesy of cope360:
+          # http://stackoverflow.com/questions/2204058/show-which-columns-an-index-is-on-in-postgresql/2213199#2213199
           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
+select
+    t.relname as table_name,
+    i.relname as index_name,
+    a.attname as column_name
+from
+    pg_class t,
+    pg_class i,
+    pg_index ix,
+    pg_attribute a
+where
+    t.oid = ix.indrelid
+    and i.oid = ix.indexrelid
+    and a.attrelid = t.oid
+    and a.attnum = ANY(ix.indkey)
+    and t.relkind = 'r'
+    and t.relname = 'archived_#{table_name}'
+order by
+    t.relname,
+    i.relname
+SQL
 
-          # HACK: reverse engineer the column name
-          indexes.map do |index|
-            index.split("_on_").last
+          indexes = connection.select_all(index_query).collect do |r|
+            r["column_name"]
           end
         end
       end
     end
   end
-end
+end

data/lib/acts_as_archive/base/destroy.rb

@@ -47,6 +47,7 @@ module ActsAsArchive
           unless new_record?
             self.class.copy_to_archive("#{self.class.primary_key} = #{id}")
           end
+          @destroyed = true
           freeze
         end
 

data/lib/acts_as_archive/base/table.rb

@@ -6,7 +6,7 @@ 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')
@@ -63,6 +63,43 @@ module ActsAsArchive
             end
           end
         end
+
+        private
+
+        def archive_table_indexed_columns
+          case connection.class.to_s
+          when "ActiveRecord::ConnectionAdapters::MysqlAdapter"
+            index_query = "SHOW INDEX FROM archived_#{table_name}"
+            indexes = connection.select_all(index_query).collect do |r|
+              r["Column_name"]
+            end
+          when "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter"
+            #postgresql is...slightly...more complicated
+            index_query = <<EOS
+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
+EOS
+            indexes = connection.select_all(index_query).collect do |r|
+              r["index_name"]
+            end
+
+            # HACK: reverse engineer the column name
+            # This sucks, but acts_as_archive only adds indexes on single columns anyway so it should work OK
+            # and getting the columns indexed is INCREDIBLY complicated in PostgreSQL.
+            indexes.map do |index|
+              index.split("_on_").last
+            end
+          else
+            raise "Unsupported Database"
+          end
+        end
       end
 
       module InstanceMethods

data/require.rb

@@ -17,7 +17,7 @@ Require 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.1'
+    version '0.2.2'
   end
   
   lib do

data/spec/acts_as_archive/base/destroy_spec.rb

@@ -93,6 +93,11 @@ describe ActsAsArchive::Base::Destroy do
           article_match?(original, copy)
         end
       end
+      
+      it "should mark the object as destroyed" do
+        @articles[3].send(d)
+        @articles[3].destroyed?.should == true
+      end
     end
   end
 end

data/spec/acts_as_archive/base/table_spec.rb

@@ -1,69 +1,69 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe ActsAsArchive::Base::Table do
-  
+
   before(:all) do
     establish_test_db
     Article.create_archive_table
   end
-  
+
   describe 'create_archive_table' do
-    
+
     before(:all) do
       @article_columns = connection.columns("articles").collect(&:name)
       @archive_columns = connection.columns("archived_articles").collect(&:name)
     end
-    
+
     it "should create an archive table" do
       connection.table_exists?("archived_articles").should == true
     end
-    
+
     it "should create an archive table with the same structure as the original table" do
       @article_columns.each do |col|
         @archive_columns.include?(col).should == true
       end
     end
-    
+
     it "should add a deleted_at column to the archive table" do
       (@archive_columns - @article_columns).should == [ 'deleted_at' ]
     end
   end
-  
+
   describe 'create_archive_indexes' do
-    
+
     before(:all) do
       Article.create_archive_indexes
     end
-    
+
     it "should create archive indexes" do
-      indexes.should == [ "id", "deleted_at" ]
+      indexes.to_set.should == [ "id", "deleted_at" ].to_set
     end
-    
+
     it "should destroy archive indexes" do
       Article.class_eval { acts_as_archive }
       Article.create_archive_indexes
       indexes.should == []
     end
   end
-  
+
   describe 'migrate_from_acts_as_paranoid' do
-    
+
     before(:all) do
       connection.add_column(:articles, :deleted_at, :datetime)
       Article.reset_column_information
     end
-    
+
     before(:each) do
       connection.execute("DELETE FROM #{Article::Archive.table_name}")
     end
-    
+
     it "should move deleted records to the archive" do
       create_records(Article, :deleted_at => Time.now.utc)
       Article.migrate_from_acts_as_paranoid
       Article.count.should == 0
       Article::Archive.count.should == 5
     end
-    
+
     it "should not move non-deleted records to the archive" do
       create_records
       Article.migrate_from_acts_as_paranoid
@@ -71,4 +71,4 @@ describe ActsAsArchive::Base::Table do
       Article::Archive.count.should == 0
     end
   end
-end
+end

data/spec/db/config/database.postgresql.yml

@@ -0,0 +1,6 @@
+test:
+  adapter: postgresql
+  database: acts_as_archive
+  username: postgres
+  password: 
+  host: localhost

data/spec/spec_helper.rb

@@ -4,6 +4,10 @@ Require.spec_helper!
 Spec::Runner.configure do |config|
 end
 
+def db_type
+  ENV['DB_TYPE'] ? ENV['DB_TYPE'] : 'mysql'
+end
+
 def article_match?(original, copy)
   copy.id.should == original.id
   copy.title.should == original.title
@@ -49,7 +53,7 @@ end
 def establish_test_db
   # Establish connection
   unless ActiveRecord::Base.connected?
-    config = YAML::load(File.open("#{SPEC}/db/config/database.yml"))
+    config = YAML::load(File.open("#{SPEC}/db/config/database.#{db_type}.yml"))
     ActiveRecord::Base.configurations = config
     ActiveRecord::Base.establish_connection(config['test'])
   end
@@ -80,4 +84,4 @@ def migrate_up(directory='migrate')
   ActiveRecord::Migrator.migrate("#{SPEC}/db/#{directory}")
   @new_article_columns = columns("articles")
   @new_archive_columns = columns("archived_articles")
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_archive
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -08:00
+date: 2010-02-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ files:
 - lib/acts_as_archive/migration.rb
 - lib/acts_as_archive.rb
 - MIT-LICENSE
+- pkg/acts_as_archive-0.2.1.gem
 - rails/init.rb
 - Rakefile
 - README.markdown
@@ -51,7 +52,8 @@ files:
 - spec/acts_as_archive/base/table_spec.rb
 - spec/acts_as_archive/base_spec.rb
 - spec/acts_as_archive/migration_spec.rb
-- spec/db/config/database.yml
+- spec/db/config/database.mysql.yml
+- spec/db/config/database.postgresql.yml
 - spec/db/migrate/001_add_to_articles.rb
 - spec/db/migrate_2/001_add_to_articles.rb
 - spec/db/models/article.rb