gravis-acts_as_archive 0.2.6 → 0.2.7

data/lib/acts_as_archive/base.rb

@@ -14,7 +14,7 @@ module ActsAsArchive
           end
           
           def self.archive_indexes
-            #{Array(options[:indexes]).map{|index| index.is_a?(Array) ? index.map(&:to_s) : index.to_s}.inspect}
+            #{Array(options[:indexes]).map{|index| index.is_a?(Array) ? index.map(&:to_sym) : index.to_sym}.inspect}
           end
           
           class Archive < ActiveRecord::Base

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

@@ -12,9 +12,9 @@ module ActsAsArchive
           current_index = 0
           indexes.each do |index|
             if index['Seq_in_index'] != '1'
-              final_indexes[current_index-1] = Array(final_indexes[current_index-1]).flatten.concat(Array(index['Column_name']))
+              final_indexes[current_index-1] = Array(final_indexes[current_index-1]).flatten.concat(Array(index['Column_name']).to_sym)
             else
-              final_indexes[current_index] = index['Column_name']
+              final_indexes[current_index] = index['Column_name'].to_sym
               current_index += 1
             end
           end

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

@@ -34,7 +34,7 @@ order by
 SQL
 
           indexes = connection.select_all(index_query).collect do |r|
-            r["column_names"].split(", ").size > 1 ? r["column_names"].split(", ") : r["column_names"]
+            r["column_names"].split(", ").size > 1 ? r["column_names"].split(", ").map(&:to_sym) : r["column_names"].to_sym
           end
         end
       end

data/lib/acts_as_archive/base/table.rb

@@ -43,18 +43,10 @@ module ActsAsArchive
             indexes = archive_table_indexed_columns
 
             (archive_indexes - indexes).each do |index|
-              begin
-                connection.add_index("archived_#{table_name}", index)
-              rescue ActiveRecord::StatementInvalid => e
-                Rails.logger.warn "Can't add index : #{index.inspect} on #{table_name} (#{e.to_s})"
-              end
+              connection.add_index("archived_#{table_name}", index, :name => index_name_for(table_name, index))  if table_has_columns(index)
             end
             (indexes - archive_indexes).each do |index|
-              begin 
-                connection.remove_index("archived_#{table_name}", index)
-              rescue ActiveRecord::StatementInvalid => e
-                Rails.logger.warn "Can't remove index : #{index.inspect} on #{table_name} (#{e.to_s})"
-              end
+              connection.remove_index("archived_#{table_name}", index) if table_has_columns(index)
             end
           end
         end
@@ -74,21 +66,13 @@ module ActsAsArchive
 
         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"
-            index_query = "SELECT indexname FROM pg_indexes WHERE tablename = '#{table_name}'"
-            indexes = connection.select_all(index_query).collect do |r|
-              r["indexname"].split("_on_").last.split("_and_")
-            end
-          else
-            raise "Unsupported Database"
-          end
+        def table_has_columns(columns)
+          self::Archive.reset_column_information
+          !Array(columns).select {|current_column| self::Archive.column_names.include?(current_column.to_s)}.empty?
+        end
+
+        def index_name_for(table_name, index)
+          "index_by_#{Array(index).join("_and_")}".to_sym if "index_archived_#{table_name}_on_#{Array(index).join("_and_")}".length > 63
         end
       end
 

data/require.rb

@@ -17,7 +17,7 @@ Require do
     name 'gravis-acts_as_archive'
     homepage "http://github.com/gravis/#{name}"
     summary "Don't delete your records, move them to a different table"
-    version '0.2.6'
+    version '0.2.9'
   end
   
   lib do

data/spec/acts_as_archive/base/table_spec.rb

@@ -36,13 +36,13 @@ describe ActsAsArchive::Base::Table do
     end
 
     it "should create archive indexes" do
-      indexes.to_set.should == [ "id", ["subject_id", "subject_type"], "deleted_at", "column_that_does_not_exist_yet" ].to_set
+      indexes.to_set.should == [ :id, [:subject_id, :subject_type], :deleted_at, :column_that_does_not_exist_yet ].to_set
     end
 
     it "should destroy archive indexes" do
       Article.class_eval { acts_as_archive }
       Article.create_archive_indexes
-      indexes.should == ["column_that_does_not_exist_yet"]
+      indexes.should == [:column_that_does_not_exist_yet]
     end
   end
 

data/spec/acts_as_archive/base_spec.rb

@@ -14,7 +14,7 @@ describe ActsAsArchive::Base do
     
     it "should add self.archive_indexes to the model" do
       Article.respond_to?(:archive_indexes).should == true
-      Article.archive_indexes.should == [ 'id', ['subject_id','subject_type'], 'deleted_at' ]
+      Article.archive_indexes.should == [ :id, [ :subject_id, :subject_type ], :deleted_at ]
     end
     
     it "should add Archive class to the model" do

data/spec/spec_helper.rb

@@ -80,7 +80,7 @@ def establish_test_db
 end
 
 def indexes
-  Article.send(:archive_table_indexed_columns).concat(['column_that_does_not_exist_yet'])
+  Article.send(:archive_table_indexed_columns).concat([:column_that_does_not_exist_yet])
 end
 
 def migrate_up(directory='migrate')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gravis-acts_as_archive
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Winton Welsh
@@ -16,7 +16,7 @@ bindir: bin
 cert_chain: []
 
 date: 2010-05-31 00:00:00 +02:00
-default_executable: 
+default_executable: acts_as_archive
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: require