acts_as_archival 0.5.3 → 0.6.0

data/.gitignore

@@ -3,9 +3,8 @@
 .bundle
 bin
 vendor/bundle
-test/aaa_test_app/vendor/bundle
-*.bkp
 *.gem
 Gemfile.lock
 pkg/*
 .DS_Store
+*.sqlite3

data/CHANGELOG.md

@@ -1,12 +1,18 @@
 # Changes!
 
+## 0.6.0
+* **BREAKING CHANGE** (possibly): Some refactoring to modern gem module idioms instead of old school plugins
+* Officially support PostgreSQL
+* Switch default testing to use sqlite, mysql, and postgres instead of just mysql
+* Major upgrades to test suite
+
 ## 0.5.3
 * Major refactoring of archiving/unarchiving logic into nice command classes instead of big ball of ARec voodoo. Thanks, Marten Claes!
 
 ## 0.5.2
+* **BREAKING CHANGE** (possibly): removed the scope constants, so if you were using them, you should stop
+* **BUGFIX** fix scoping combinations with relations for Rails 4
 * More changes to support Rails 4
-* fix scoping combinations with relations for Rails 4
-* BREAKING CHANGE (possibly): removed the scope constants, so if you were using them, you should stop
 
 ## 0.5.1
 * update to use .table_name for archived scope

data/Gemfile.lock

@@ -7,28 +7,35 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+    activerecord (4.1.0)
+      activemodel (= 4.1.0)
+      activesupport (= 4.1.0)
+      arel (~> 5.0.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.0)
     assertions-eb (1.7.3)
-    builder (3.0.4)
-    database_cleaner (1.0.1)
-    highline (1.6.19)
-    i18n (0.6.1)
-    multi_json (1.7.3)
-    mysql2 (0.3.11)
-    rake (10.0.4)
-    rr (1.0.5)
-    tzinfo (0.3.37)
+    builder (3.2.2)
+    database_cleaner (1.2.0)
+    highline (1.6.21)
+    i18n (0.6.9)
+    json (1.8.1)
+    minitest (5.3.2)
+    mysql2 (0.3.15)
+    pg (0.17.1)
+    rake (10.2.2)
+    rr (1.1.2)
+    sqlite3 (1.3.9)
+    thread_safe (0.3.3)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -39,5 +46,7 @@ DEPENDENCIES
   database_cleaner
   highline
   mysql2
+  pg
   rake
   rr
+  sqlite3

data/README.md

@@ -3,7 +3,7 @@
 Atomically archive object trees in your activerecord models.
 
 We had the problem that acts_as_paranoid and similar plugins/gems
-always work on a record by record basis and made it very difficult to
+always work on a record-by-record basis and made it very difficult to
 restore records atomically (or archive them, for that matter).
 
 Because the archive and unarchive methods are in transactions, and
@@ -16,60 +16,97 @@ Additionally, other plugins generally screw with how
 to destroy records.
 
 ## Install
-Rails 3.2 and up
 
-`gem install acts_as_archival`
-
-or in your Gemfile
+Gemfile:
 
 `gem "acts_as_archival"`
 
-Rails 3.0x:
-
-`rails plugin install http://github.com/expectedbehavior/acts_as_archival.git -r rails3.0x`
-
-Rails 2:
-
-`script/plugin install http://github.com/expectedbehavior/acts_as_archival.git -r rails2`
+Any models you want to be archival should have the columns `archive_number` (String) and `archived_at` (DateTime).
 
-Any models you want to be archival should have the columns
-`archive_number`(String) and `archived_at` (DateTime).
+i.e. `rails g migration AddAAAToPost archive_number archived_at:datetime`
 
-i.e. `script/generate migration AddAAAToPost archive_number:string archived_at:datetime`
+Any dependent-destroy AAA model associated to an AAA model will be archived with its parent.
 
-Any dependent-destroy objects connected to an AAA model will be
-archived with its parent.
+_If you're stuck on Rails 3.0x/2, check out the available branches._
 
 ## Example
 
 ``` ruby
 class Hole < ActiveRecord::Base
   acts_as_archival
-  has_many :moles, :dependent => :destroy
+  has_many :rats, :dependent => :destroy
 end
 
-class Mole < ActiveRecord::Base
+class Rat < ActiveRecord::Base
   acts_as_archival
 end
 ```
 
+### Simple interactions & scopes
+
+``` ruby
+h = Hole.create                  #
+h.archived?                      # => false
+h.archive                        # => true
+h.archived?                      # => "b56876de48a5dcfe71b2c13eec15e4a2"
+h.archive_number                 # => "b56876de48a5dcfe71b2c13eec15e4a2"
+h.archived_at                    # => Thu, 01 Jan 2012 01:49:21 -0400
+h.unarchive                      # => true
+h.archived?                      # => false
+h.archive_number                 # => nil
+h.archived_at                    # => nil
+```
+
+### Associations
+
+``` ruby
+h = Hole.create                  #
+r = h.rats.create                #
+h.archive                        # => true
+h.archive_number                 # => "b56876de48a5dcfe71b2c13eec15e4a2"
+r.archive_number                 # => "b56876de48a5dcfe71b2c13eec15e4a2"
+r.archived?                      # => "b56876de48a5dcfe71b2c13eec15e4a2"
+h.unarchive                      # => true
+h.archive_number                 # => nil
+r.archive_number                 # => nil
+r.archived?                      # => false
+```
+
+### Scopes
+
 ``` ruby
->> Hole.archived.size               # => 0
->> Hole.is_archival?                # => true
->> h = Hole.create
->> Hole.unarchived.size             # => 1
->> h.is_archival?                   # => true
->> h.archived?                      # => false
->> h.muskrats.create
->> h.archive                        # archive hole and muskrat
->> h.archive_number                 # => 8c9f03f9d....
->> h.muskrats.first.archive_number  # => 8c9f03f9d....
->> h.archived?                      # => 8c9f03f9d....
->> Hole.archived.size               # => 1
->> Hole.unarchived.size             # => 0
->> h.unarchive
->> Hole.archived.size               # => 0
->> Hole.unarchived.size             # => 1
+h = Hole.create
+Hole.archived.size               # => 0
+Hole.unarchived.size             # => 1
+h.archive
+Hole.archived.size               # => 1
+Hole.unarchived.size             # => 0
+```
+
+### Utility methods
+
+``` ruby
+h = Hole.create                  #
+h.is_archival?                   # => true
+Hole.is_archival?                # => true
+```
+
+### Options
+
+When defining an AAA model, it is is possible to make it unmodifiable
+when it is archived by passing `:readonly_when_archived => true` to the
+`acts_as_archival` call in your model.
+
+``` ruby
+class CantTouchThis < ActiveRecord::Base
+  acts_as_archival :readonly_when_archived => true
+end
+
+record = CantTouchThis.create(:foo => "bar")
+record.archive                               # => true
+record.foo = "I want this to work"
+record.save                                  # => false
+record.errors.full_messages.first            # => "Cannot modify an archived record."
 ```
 
 ## Caveats
@@ -77,33 +114,32 @@ end
 1. This will only work on associations that are dependent destroy. It
 should be trival to change that or make it optional.
 1. It will only work for Rails 2.2 and up, because we are using
-`named_scope`/`scope`. You can check out permanent records for a way
+`named_scope`/`scope`. You can check out [permanent records](http://github.com/fastestforward/permanent_records) for a way
 to conditionally add the functionality to older Rails installations.
-1. This will only work (well) on databases with transactions (mysql,
-postgres, etc.).
+1. If you would like to work on this, you will need to setup sqlite, postgres, and mysql on your development machine. Alternately, you can disable specific dev dependencies in the gemspec and test_helper and ask for help.
 
 ## Testing
 
-Because this plugin makes use of transactions we're testing it on
-MySQL instead of the more convenient sqlite. Running the tests should
-be as easy as:
+Because this plugin makes use of transactions we're testing it (mostly) on sqlite. Running the tests should be as easy as:
 
 ```  bash
-bundle
-test/script/db_setup    # makes the databases with the correct permissions (for mySQL)
+bundle                               # if this fails you might need to install/configure some databases
+test/script/db_setup                 # makes the databases with the correct permissions (for mySQL)
+createuser -D -A -P archival_tester  # makes user for PostgreSQL; answer the password prompt with "perspicacious"
+createdb -O archival_tester aaa_test # makes db for PostgreSQL and sets owner to our test user
 rake
 ```
 
 ## Help Wanted
 
-It would be cool if someone could check if this thing works on
-postgres and if not, submit a patch / let us know about it!
+We'd love to have your help making this better! If you have ideas for features this should implement or you think the code sucks, let us know. And PRs are greatly appreciated. :+1:
 
 ## Thanks
 
 ActsAsParanoid and PermanentRecords were both inspirations for this:
-http://github.com/technoweenie/acts_as_paranoid
-http://github.com/fastestforward/permanent_records
+
+* http://github.com/technoweenie/acts_as_paranoid
+* http://github.com/fastestforward/permanent_records
 
 ## Contributors
 

data/acts_as_archival.gemspec

@@ -32,6 +32,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "assertions-eb"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "mysql2"
+  gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency "pg"
   gem.add_development_dependency "highline"
   gem.add_development_dependency "rr"
   gem.add_development_dependency "database_cleaner"

data/lib/acts_as_archival/version.rb

@@ -1,3 +1,3 @@
 module ActsAsArchival
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

data/test/ambiguous_table_test.rb

@@ -1,12 +1,14 @@
 require_relative "test_helper"
 
 class AmbiguousTableTest < ActiveSupport::TestCase
-  # test against the problem fixed in http://github.com/DarkTatka/acts_as_archival/commit/63d0a2532a15d7a6ab41d081e1591108a5ea9b37
   test "no ambiguous table problem" do
     archival = Archival.create!
     child = archival.archivals.create!
     child.archive
 
+    # this is a bug fix for a problem wherein table names weren't being
+    # namespaced, so if a table joined against itself, incorrect SQL was
+    # generated
     assert_equal 1, Archival.unarchived.joins(:archivals).count
   end
 end

data/test/associations_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class ActsAsArchivalTest < ActiveSupport::TestCase
+class AssociationsTest < ActiveSupport::TestCase
   test "archive archives 'has_' associated archival objects that are dependent destroy" do
     archival = Archival.create!
     child = archival.archivals.create!

data/test/basic_test.rb

@@ -3,33 +3,35 @@ require_relative "test_helper"
 class BasicTest < ActiveSupport::TestCase
   test "archive archives the record" do
     archival = Archival.create!
-
     archival.archive
-    assert archival.archived?
+    assert archival.reload.archived?
   end
 
   test "unarchive unarchives archival records" do
     archival = Archival.create!(:archived_at => Time.now, :archive_number => 1)
     archival.unarchive
+    assert_not archival.reload.archived?
+  end
 
-    assert_not archival.archived?
+  test "archive returns true on success" do
+    normal = Archival.create!
+    assert_equal true, normal.archive
   end
 
-  test "archive returns true on success, false on failure" do
-    archival = Archival.create!
+  test "archive returns false on failure" do
     readonly = Archival.create!
     readonly.readonly!
-
-    assert_equal true,  archival.archive
     assert_equal false, readonly.archive
   end
 
-  test "unarchive returns true on success, false on failure" do
-    archived = Archival.create!(:archived_at => Time.now, :archive_number => "1")
-    readonly = Archival.create!(:archived_at => Time.now, :archive_number => "2")
-    readonly.readonly!
+  test "unarchive returns true on success" do
+    normal = Archival.create!(:archived_at => Time.now, :archive_number => "1")
+    assert_equal true, normal.unarchive
+  end
 
-    assert_equal true,  archived.unarchive
+  test "unarchive returns false on failure" do
+    readonly = Archival.create!(:archived_at => Time.now, :archive_number => "1")
+    readonly.readonly!
     assert_equal false, readonly.unarchive
   end
 
@@ -47,7 +49,6 @@ class BasicTest < ActiveSupport::TestCase
   test "archive sets the archive number to the md5 hexdigest for the model and id that is archived" do
     archival = Archival.create!
     archival.archive
-
     expected_digest = Digest::MD5.hexdigest("#{archival.class.name}#{archival.id}")
     assert_equal expected_digest, archival.archive_number
   end
@@ -58,7 +59,6 @@ class BasicTest < ActiveSupport::TestCase
     initial_number = archived.archive_number
     archived.reload.archive
     second_number = archived.archive_number
-
     assert_equal initial_number, second_number
   end
 end

data/test/database.yml

@@ -1,8 +1,26 @@
-adapter: mysql2
-encoding: utf8
-reconnect: false
-database: aaa_test
-pool: 5
-username: archival_tester
-password: perspicacious
-socket: /tmp/mysql.sock
+sqlite:
+  adapter: sqlite3
+  database: aaa_test.sqlite3
+  pool: 5
+  timeout: 5000
+
+mysql:
+  adapter: mysql2
+  pool: 5
+  timeout: 5000
+  encoding: utf8
+  reconnect: false
+  database: aaa_test
+  username: archival_tester
+  password: perspicacious
+  socket: /tmp/mysql.sock
+
+pg:
+  adapter: postgresql
+  pool: 5
+  timeout: 5000
+  encoding: utf8
+  database: aaa_test
+  username: archival_tester
+  password: perspicacious
+  min_messages: WARNING

data/test/deep_nesting_test.rb

@@ -2,14 +2,15 @@ require_relative "test_helper"
 
 class DeepNestingTest < ActiveSupport::TestCase
   test "archiving deeply nested items" do
-    archival = Archival.create!
-    child = archival.archivals.create!
+    archival   = Archival.create!
+    child      = archival.archivals.create!
     grandchild = child.archivals.create!
     archival.archive
-
     assert archival.reload.archived?
     assert child.reload.archived?
     assert grandchild.reload.archived?
+    assert_equal archival.archive_number, child.archive_number
+    assert_equal archival.archive_number, grandchild.archive_number
   end
 
   test "unarchiving deeply nested items doesn't blow up" do
@@ -17,11 +18,10 @@ class DeepNestingTest < ActiveSupport::TestCase
       :archived_at => Time.now,
       :archive_number => "test"
     }
-    archival = Archival.create!(archival_attributes)
-    child = archival.archivals.create!(archival_attributes)
+    archival   = Archival.create!(archival_attributes)
+    child      = archival.archivals.create!(archival_attributes)
     grandchild = child.archivals.create!(archival_attributes)
     archival.unarchive
-
     assert_not archival.reload.archived?
     assert_not child.reload.archived?
     assert_not grandchild.reload.archived?

data/test/fixtures/archival_grandkid.rb

@@ -1,3 +1,6 @@
+# archival_kid_id - integer
+# archive_number  - string
+# archived_at     - datetime
 class ArchivalGrandkid < ActiveRecord::Base
   acts_as_archival
   belongs_to :archival_kid

data/test/fixtures/archival_kid.rb

@@ -1,3 +1,6 @@
+# archival_id     - integer
+# archive_number  - string
+# archived_at     - datetime
 class ArchivalKid < ActiveRecord::Base
   acts_as_archival
   belongs_to :archival

data/test/fixtures/exploder.rb

@@ -1,5 +1,7 @@
+# archival_id     - integer
+# archive_number  - string
+# archived_at     - datetime
 class Exploder < ActiveRecord::Base
   acts_as_archival
-
   belongs_to :archival
 end

data/test/fixtures/independent_archival.rb

@@ -4,6 +4,5 @@
 # archived_at    - datetime
 class IndependentArchival < ActiveRecord::Base
   acts_as_archival
-
   belongs_to :archival
 end

data/test/fixtures/mass_attribute_protected.rb

@@ -1,3 +1,6 @@
+# name           - string
+# archive_number - string
+# archived_at    - datetime
 class MassAttributeProtected < ActiveRecord::Base
   acts_as_archival
   attr_accessible :name

data/test/fixtures/missing_archive_number.rb

@@ -1,3 +1,5 @@
+# name           - string
+# archived_at    - datetime
 class MissingArchiveNumber < ActiveRecord::Base
   acts_as_archival
 end

data/test/fixtures/missing_archived_at.rb

@@ -1,3 +1,5 @@
+# name           - string
+# archive_number - string
 class MissingArchivedAt < ActiveRecord::Base
   acts_as_archival
 end

data/test/fixtures/mysql_archival.rb

@@ -0,0 +1,10 @@
+# name           - string
+# archival_id    - integer
+# archive_number - string
+# archived_at    - datetime
+class MysqlArchival < ActiveRecord::Base
+  establish_connection $dbconfig["mysql"]
+  self.table_name = "archivals"
+  acts_as_archival
+  has_many :exploders, :dependent => :destroy, :foreign_key => :archival_id, :class_name => "MysqlExploder"
+end

data/test/fixtures/mysql_exploder.rb

@@ -0,0 +1,9 @@
+# archival_id     - integer
+# archive_number  - string
+# archived_at     - datetime
+class MysqlExploder < ActiveRecord::Base
+  establish_connection $dbconfig["mysql"]
+  self.table_name = "exploders"
+  acts_as_archival
+  belongs_to :mysql_archival, :foreign_key => :archival_id
+end

data/test/fixtures/pg_archival.rb

@@ -0,0 +1,10 @@
+# name           - string
+# archival_id    - integer
+# archive_number - string
+# archived_at    - datetime
+class PgArchival < ActiveRecord::Base
+  establish_connection $dbconfig["pg"]
+  self.table_name = "archivals"
+  acts_as_archival
+  has_many :exploders, :dependent => :destroy, :foreign_key => :archival_id, :class_name => "PgExploder"
+end

data/test/fixtures/pg_exploder.rb

@@ -0,0 +1,9 @@
+# archival_id     - integer
+# archive_number  - string
+# archived_at     - datetime
+class PgExploder < ActiveRecord::Base
+  establish_connection $dbconfig["pg"]
+  self.table_name = "exploders"
+  acts_as_archival
+  belongs_to :pg_archival, :foreign_key => :archival_id
+end

data/test/fixtures/poly.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # archiveable_id   - integer
 # archiveable_type - string
 # archive_number   - string

data/test/fixtures/readonly_when_archived.rb

@@ -1,3 +1,6 @@
+# name           - string
+# archive_number - string
+# archived_at    - datetime
 class ReadonlyWhenArchived < ActiveRecord::Base
   acts_as_archival :readonly_when_archived => true
 end

data/test/schema.rb

@@ -1,5 +1,4 @@
 ActiveRecord::Schema.define(:version => 1) do
-
   create_table :archivals, :force => true do |t|
     t.column :name, :string
     t.column :archival_id, :integer
@@ -7,67 +6,69 @@ ActiveRecord::Schema.define(:version => 1) do
     t.column :archived_at, :datetime
   end
 
-  create_table :archival_kids, :force => true do |t|
+  create_table :exploders, :force => true do |t|
     t.column :archival_id, :integer
     t.column :archive_number, :string
     t.column :archived_at, :datetime
   end
 
-  create_table :archival_grandkids, :force => true do |t|
-    t.column :archival_kid_id, :integer
-    t.column :archive_number, :string
-    t.column :archived_at, :datetime
-  end
+  if "SQLite" == ActiveRecord::Base.connection.adapter_name
+    create_table :archival_kids, :force => true do |t|
+      t.column :archival_id, :integer
+      t.column :archive_number, :string
+      t.column :archived_at, :datetime
+    end
 
-  create_table :independent_archivals, :force => true do |t|
-    t.column :name, :string
-    t.column :archival_id, :integer
-    t.column :archive_number, :string
-    t.column :archived_at, :datetime
-  end
+    create_table :archival_grandkids, :force => true do |t|
+      t.column :archival_kid_id, :integer
+      t.column :archive_number, :string
+      t.column :archived_at, :datetime
+    end
 
-  create_table :exploders, :force => true do |t|
-    t.column :archival_id, :integer
-    t.column :archive_number, :string
-    t.column :archived_at, :datetime
-  end
+    create_table :independent_archivals, :force => true do |t|
+      t.column :name, :string
+      t.column :archival_id, :integer
+      t.column :archive_number, :string
+      t.column :archived_at, :datetime
+    end
 
-  create_table :plains, :force => true do |t|
-    t.column :name, :string
-    t.column :archival_id, :integer
-  end
+    create_table :plains, :force => true do |t|
+      t.column :name, :string
+      t.column :archival_id, :integer
+    end
 
-  create_table :mass_attribute_protecteds, :force => true do |t|
-    t.column :name, :string
-    t.column :archive_number, :string
-    t.column :archived_at, :datetime
-  end
+    create_table :mass_attribute_protecteds, :force => true do |t|
+      t.column :name, :string
+      t.column :archive_number, :string
+      t.column :archived_at, :datetime
+    end
 
-  create_table :readonly_when_archiveds, :force => true do |t|
-    t.column :name, :string
-    t.column :archive_number, :string
-    t.column :archived_at, :datetime
-  end
+    create_table :readonly_when_archiveds, :force => true do |t|
+      t.column :name, :string
+      t.column :archive_number, :string
+      t.column :archived_at, :datetime
+    end
 
-  create_table :missing_archived_ats, :force => true do |t|
-    t.column :name,   :string
-    t.column :archive_number, :string
-  end
+    create_table :missing_archived_ats, :force => true do |t|
+      t.column :name,   :string
+      t.column :archive_number, :string
+    end
 
-  create_table :missing_archive_numbers, :force => true do |t|
-    t.column :name,   :string
-    t.column :archived_at, :datetime
-  end
+    create_table :missing_archive_numbers, :force => true do |t|
+      t.column :name,   :string
+      t.column :archived_at, :datetime
+    end
 
-  create_table :polys, :force => true do |t|
-    t.references :archiveable, :polymorphic => true
-    t.column :archive_number, :string
-    t.column :archived_at, :datetime
-  end
+    create_table :polys, :force => true do |t|
+      t.references :archiveable, :polymorphic => true
+      t.column :archive_number, :string
+      t.column :archived_at, :datetime
+    end
 
-  create_table :legacy, :force => true do |t|
-    t.column :name, :string
-    t.column :archive_number, :string
-    t.column :archived_at, :datetime
+    create_table :legacy, :force => true do |t|
+      t.column :name, :string
+      t.column :archive_number, :string
+      t.column :archived_at, :datetime
+    end
   end
 end

data/test/scope_test.rb

@@ -49,15 +49,18 @@ class ScopeTest < ActiveSupport::TestCase
   end
 
   test "table_name is set to 'legacy'" do
-    assert_equal "SELECT `legacy`.* FROM `legacy`  WHERE (legacy.archived_at IS NOT NULL AND legacy.archive_number IS NOT NULL)", ArchivalTableName.archived.to_sql
-    assert_equal "SELECT `legacy`.* FROM `legacy`  WHERE `legacy`.`archived_at` IS NULL AND `legacy`.`archive_number` IS NULL", ArchivalTableName.unarchived.to_sql
+    archived_sql = %Q{SELECT "legacy".* FROM "legacy"  WHERE (legacy.archived_at IS NOT NULL AND legacy.archive_number IS NOT NULL)}
+    unarchived_sql = %Q{SELECT "legacy".* FROM "legacy"  WHERE "legacy"."archived_at" IS NULL AND "legacy"."archive_number" IS NULL}
+    assert_equal archived_sql, ArchivalTableName.archived.to_sql
+    assert_equal unarchived_sql, ArchivalTableName.unarchived.to_sql
   end
 
   test "combines with other scope properly" do
     Archival.create!(:name => "Robert")
     Archival.create!(:name => "Bobby")
     Archival.create!(:name => "Sue")
-    Archival.create!(:name => "Bob").archive
+    bob = Archival.create!(:name => "Bob")
+    bob.archive
     assert_equal 3, Archival.bobs.count
     assert_equal 3, Archival.unarchived.count
     assert_equal 2, Archival.bobs.unarchived.count
@@ -70,7 +73,8 @@ class ScopeTest < ActiveSupport::TestCase
     parent = Archival.create!
     parent.archivals.create!
     parent.archivals.create!
-    parent.archivals.create!.archive
+    child = parent.archivals.create!
+    child.archive
     assert_equal 3, parent.archivals.count
     assert_equal 1, parent.archivals.archived.count
     assert_equal 2, parent.archivals.unarchived.count

data/test/script/db_setup

@@ -5,7 +5,7 @@ require 'highline/import'
 
 def read_database_config
   database_file = File.join(File.dirname(__FILE__), "/../", "database.yml")
-  $DB_CONFIG = YAML.load(File.read(database_file))
+  $DB_CONFIG = YAML.load(File.read(database_file))["mysql"]
 end
 
 def get_root_password

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require "bundler/setup"
-require "test/unit"
+require "minitest/autorun"
 
 require "active_record"
 require "assertions"
@@ -9,7 +9,7 @@ require "database_cleaner"
 require "acts_as_archival"
 
 def prepare_for_tests
-  setup_logging if ENV["LOGGING_ENABLED"]
+  setup_logging# if ENV["LOGGING_ENABLED"]
   setup_active_record
   setup_database_cleaner
   create_test_tables
@@ -24,8 +24,7 @@ end
 
 def setup_active_record
   dbconfig_file = File.dirname(__FILE__) + "/database.yml"
-  dbconfig = YAML.load File.read(dbconfig_file)
-  ActiveRecord::Base.establish_connection(dbconfig)
+  $dbconfig = YAML.load(File.read(dbconfig_file))
 end
 
 def setup_database_cleaner
@@ -36,8 +35,12 @@ def setup_database_cleaner
 end
 
 def create_test_tables
-  schema_file   = File.dirname(__FILE__) + "/schema.rb"
-  load(schema_file) if File.exist?(schema_file)
+  schema_file = File.dirname(__FILE__) + "/schema.rb"
+  ["pg", "mysql", "sqlite"].each do |db|
+    puts "** Loading schema for #{db}"
+    ActiveRecord::Base.establish_connection($dbconfig[db])
+    load(schema_file) if File.exist?(schema_file)
+  end
 end
 
 def require_test_classes
@@ -54,8 +57,12 @@ def require_test_classes
    :plain,
    :missing_archived_at,
    :missing_archive_number,
+   :mysql_archival,
+   :mysql_exploder,
    :plain,
    :poly,
+   :pg_archival,
+   :pg_exploder,
    :readonly_when_archived]
   $require_mass_protection = ActiveModel.constants.include?(:MassAssignmentSecurity)
   fixtures << :mass_attribute_protected if $require_mass_protection

data/test/transaction_test.rb

@@ -4,7 +4,7 @@ require "rr"
 class TransactionTest < ActiveSupport::TestCase
   include RR::Adapters::TestUnit
 
-  test "archiving is transactional" do
+  test "sqlite archiving is transactional" do
     archival = Archival.create!
     exploder = archival.exploders.create!
     any_instance_of(Exploder) do |exploder|
@@ -16,7 +16,7 @@ class TransactionTest < ActiveSupport::TestCase
     assert_not exploder.reload.archived?
   end
 
-  test "unarchiving is transactional" do
+  test "sqlite unarchiving is transactional" do
     archival = Archival.create!
     exploder = archival.exploders.create!
     any_instance_of(Exploder) do |exploder|
@@ -29,4 +29,55 @@ class TransactionTest < ActiveSupport::TestCase
     assert exploder.reload.archived?
   end
 
+  test "mysql archiving is transactional" do
+    archival = MysqlArchival.create!
+    exploder = archival.exploders.create!
+    any_instance_of(MysqlExploder) do |exploder|
+      stub(exploder).unarchive { raise "Rollback Imminent" }
+    end
+    archival.archive
+    archival.unarchive
+
+    assert archival.reload.archived?
+    assert exploder.reload.archived?
+  end
+
+  test "mysql unarchiving is transactional" do
+    archival = MysqlArchival.create!
+    exploder = archival.exploders.create!
+    any_instance_of(MysqlExploder) do |exploder|
+      stub(exploder).unarchive { raise "Rollback Imminent" }
+    end
+    archival.archive
+    archival.unarchive
+
+    assert archival.reload.archived?
+    assert exploder.reload.archived?
+  end
+
+  test "postgres archiving is transactional" do
+    archival = MysqlArchival.create!
+    exploder = archival.exploders.create!
+    any_instance_of(MysqlExploder) do |exploder|
+      stub(exploder).unarchive { raise "Rollback Imminent" }
+    end
+    archival.archive
+    archival.unarchive
+
+    assert archival.reload.archived?
+    assert exploder.reload.archived?
+  end
+
+  test "postgres unarchiving is transactional" do
+    archival = MysqlArchival.create!
+    exploder = archival.exploders.create!
+    any_instance_of(MysqlExploder) do |exploder|
+      stub(exploder).unarchive { raise "Rollback Imminent" }
+    end
+    archival.archive
+    archival.unarchive
+
+    assert archival.reload.archived?
+    assert exploder.reload.archived?
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_archival
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -83,6 +83,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +199,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -198,6 +229,10 @@ files:
 - test/fixtures/mass_attribute_protected.rb
 - test/fixtures/missing_archive_number.rb
 - test/fixtures/missing_archived_at.rb
+- test/fixtures/mysql_archival.rb
+- test/fixtures/mysql_exploder.rb
+- test/fixtures/pg_archival.rb
+- test/fixtures/pg_exploder.rb
 - test/fixtures/plain.rb
 - test/fixtures/poly.rb
 - test/fixtures/readonly_when_archived.rb
@@ -251,6 +286,10 @@ test_files:
 - test/fixtures/mass_attribute_protected.rb
 - test/fixtures/missing_archive_number.rb
 - test/fixtures/missing_archived_at.rb
+- test/fixtures/mysql_archival.rb
+- test/fixtures/mysql_exploder.rb
+- test/fixtures/pg_archival.rb
+- test/fixtures/pg_exploder.rb
 - test/fixtures/plain.rb
 - test/fixtures/poly.rb
 - test/fixtures/readonly_when_archived.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm ruby-1.9.3-p125@aaa --create