acts_as_archival 1.1.1 → 2.0.0

data/test/scope_test.rb

@@ -1,6 +1,8 @@
+# coding: utf-8
 require_relative "test_helper"
 
 class ScopeTest < ActiveSupport::TestCase
+
   test "simple unarchived scope" do
     Archival.create!
     Archival.create!
@@ -9,15 +11,15 @@ class ScopeTest < ActiveSupport::TestCase
   end
 
   test "simple archived scope" do
-    Archival.create!.archive
-    Archival.create!.archive
+    Archival.create!.archive!
+    Archival.create!.archive!
 
     assert_equal 2, Archival.archived.count
   end
 
   test "mixed scopes" do
     Archival.create!
-    Archival.create!.archive
+    Archival.create!.archive!
 
     assert_equal 1, Archival.archived.count
     assert_equal 1, Archival.unarchived.count
@@ -25,8 +27,8 @@ class ScopeTest < ActiveSupport::TestCase
 
   test "simple archived_from_archive_number" do
     archive_number = "TEST-IT"
-    Archival.create!.archive(archive_number)
-    Archival.create!.archive(archive_number)
+    Archival.create!.archive!(archive_number)
+    Archival.create!.archive!(archive_number)
 
     assert_equal 2, Archival.archived_from_archive_number(archive_number).count
   end
@@ -34,39 +36,41 @@ class ScopeTest < ActiveSupport::TestCase
   test "negative archived_from_archive_number" do
     archive_number = "TEST-IT"
     bogus_number = "BROKE-IT"
-    Archival.create!.archive(archive_number)
-    Archival.create!.archive(archive_number)
+    Archival.create!.archive!(archive_number)
+    Archival.create!.archive!(archive_number)
 
     assert_equal 0, Archival.archived_from_archive_number(bogus_number).count
   end
 
   test "mixed archived_from_archive_number" do
     archive_number = "TEST-IT"
-    Archival.create!.archive(archive_number)
-    Archival.create!.archive
+    Archival.create!.archive!(archive_number)
+    Archival.create!.archive!
 
     assert_equal 1, Archival.archived_from_archive_number(archive_number).count
   end
 
   test "table_name is set to 'legacy'" do
-    # ActiveRecord 4.2 changed the output by one space (╯°□°）╯︵ ┻━┻
-    spaces = if (ActiveRecord.version <=> Gem::Version.new("4.2.0")) >= 0
-               " "
-             else
-               "  "
-             end
-    archived_sql = %Q{SELECT "legacy".* FROM "legacy"#{spaces}WHERE ("legacy"."archived_at" IS NOT NULL) AND ("legacy"."archive_number" IS NOT NULL)}
-    unarchived_sql = %Q{SELECT "legacy".* FROM "legacy"#{spaces}WHERE "legacy"."archived_at" IS NULL AND "legacy"."archive_number" IS NULL}
+    archived_sql =
+      if ActiveRecord.version >= Gem::Version.new("5.2.0")
+        "SELECT \"legacy\".* FROM \"legacy\" " \
+        'WHERE "legacy"."archived_at" IS NOT NULL AND "legacy"."archive_number" IS NOT NULL'
+      else
+        "SELECT \"legacy\".* FROM \"legacy\" " \
+        'WHERE ("legacy"."archived_at" IS NOT NULL) AND ("legacy"."archive_number" IS NOT NULL)'
+      end
+    unarchived_sql = "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")
-    bob = Archival.create!(:name => "Bob")
-    bob.archive
+    Archival.create!(name: "Robert")
+    Archival.create!(name: "Bobby")
+    Archival.create!(name: "Sue")
+    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
@@ -80,9 +84,10 @@ class ScopeTest < ActiveSupport::TestCase
     parent.archivals.create!
     parent.archivals.create!
     child = parent.archivals.create!
-    child.archive
+    child.archive!
     assert_equal 3, parent.archivals.count
     assert_equal 1, parent.archivals.archived.count
     assert_equal 2, parent.archivals.unarchived.count
   end
+
 end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib")
 require "bundler/setup"
 require "minitest/autorun"
+require "minitest/pride"
 
 require "active_record"
 require "assertions"
@@ -13,8 +14,7 @@ if ActiveSupport::TestCase.respond_to?(:test_order=)
 end
 
 def prepare_for_tests
-  setup_logging# if ENV["LOGGING_ENABLED"]
-  setup_active_record
+  setup_logging
   setup_database_cleaner
   create_test_tables
   require_test_classes
@@ -26,11 +26,6 @@ def setup_logging
   ActiveRecord::Base.logger = Logger.new(logfile)
 end
 
-def setup_active_record
-  dbconfig_file = File.dirname(__FILE__) + "/database.yml"
-  $dbconfig = YAML.load(File.read(dbconfig_file))
-end
-
 def setup_database_cleaner
   DatabaseCleaner.strategy = :truncation
   ActiveSupport::TestCase.send(:setup) do
@@ -38,48 +33,60 @@ def setup_database_cleaner
   end
 end
 
+def sqlite_config
+  {
+    adapter: "sqlite3",
+    database: "aaa_test.sqlite3",
+    pool: 5,
+    timeout: 5000
+  }
+end
+
 def create_test_tables
   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
+  puts "** Loading schema for SQLite"
+  ActiveRecord::Base.establish_connection(sqlite_config)
+  load(schema_file) if File.exist?(schema_file)
 end
 
+BASE_FIXTURE_CLASSES = [
+  :another_polys_holder,
+  :archival,
+  :archival_kid,
+  :archival_grandkid,
+  :archival_table_name,
+  :exploder,
+  :independent_archival,
+  :missing_archived_at,
+  :missing_archive_number,
+  :plain,
+  :poly,
+  :readonly_when_archived
+].freeze
+
+RAILS_4_FIXTURE_CLASSES = [
+  :callback_archival_4
+].freeze
+
+RAILS_5_FIXTURE_CLASSES = [
+  :application_record,
+  :application_record_row,
+  :callback_archival_5
+].freeze
+
 def require_test_classes
   ActiveSupport::Inflector.inflections do |inflect|
     inflect.irregular "poly", "polys"
   end
 
-  fixtures = []
-  $require_application_record = ActiveRecord.version >= Gem::Version.new("4.99.99")
-  if $require_application_record
-    fixtures += [:application_record, :application_record_row, :callback_archival_5]
-  else
-    fixtures += [:callback_archival_4]
-  end
+  fixtures = if ActiveRecord::VERSION::MAJOR >= 4
+               RAILS_5_FIXTURE_CLASSES
+             else
+               RAILS_4_FIXTURE_CLASSES
+             end
 
-  fixtures += [
-    :archival,
-    :archival_kid,
-    :archival_grandkid,
-    :archival_table_name,
-    :exploder,
-    :independent_archival,
-    :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
-  fixtures.each {|test_class_file| require_relative "fixtures/#{test_class_file}"}
+  fixtures += BASE_FIXTURE_CLASSES
+  fixtures.each { |test_class_file| require_relative "fixtures/#{test_class_file}" }
 end
 
 prepare_for_tests

data/test/through_association_test.rb

@@ -1,18 +1,19 @@
 require_relative "test_helper"
 
 class ThroughAssociationTest < ActiveSupport::TestCase
+
   test "archive a through associated object whose 'bridge' is archival" do
     archival = Archival.create!
     bridge   = archival.archival_kids.create!
     through  = bridge.archival_grandkids.create!
-    archival.archive
+    archival.archive!
 
     assert archival.reload.archived?
     assert bridge.reload.archived?
     assert through.reload.archived?
   end
 
-  # TODO Make something like this pass
+  # TODO: Make something like this pass
   # test "archive a through associated object whose 'bridge' is not archival" do
   #   archival = Archival.create!
   #   bridge   = archival.independent_archival_kids.create!
@@ -22,4 +23,5 @@ class ThroughAssociationTest < ActiveSupport::TestCase
   #   assert archival.reload.archived?
   #   assert through.reload.archived?
   # end
+
 end

data/test/transaction_test.rb

@@ -3,80 +3,29 @@ require "rr"
 
 class TransactionTest < ActiveSupport::TestCase
 
-  test "sqlite archiving is transactional" do
+  test "archiving is transactional" do
     archival = Archival.create!
     exploder = archival.exploders.create!
     any_instance_of(Exploder) do |canary|
-      stub(canary).archive { raise "Rollback Imminent" }
+      stub(canary).archive! { raise "Rollback Imminent" }
     end
-    archival.archive
+    archival.archive!
 
     assert_not archival.archived?, "If this failed, you might be trying to test on a system that doesn't support nested transactions"
     assert_not exploder.reload.archived?
   end
 
-  test "sqlite unarchiving is transactional" do
+  test "unarchiving is transactional" do
     archival = Archival.create!
     exploder = archival.exploders.create!
     any_instance_of(Exploder) do |canary|
-      stub(canary).unarchive { raise "Rollback Imminent" }
+      stub(canary).unarchive! { raise "Rollback Imminent" }
     end
-    archival.archive
-    archival.unarchive
+    archival.archive!
+    archival.unarchive!
 
     assert archival.reload.archived?
     assert exploder.reload.archived?
   end
 
-  test "mysql archiving is transactional" do
-    archival = MysqlArchival.create!
-    exploder = archival.exploders.create!
-    any_instance_of(MysqlExploder) do |canary|
-      stub(canary).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 |canary|
-      stub(canary).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 |canary|
-      stub(canary).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 |canary|
-      stub(canary).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: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Joel Meador
@@ -13,10 +13,15 @@ authors:
 - Miles Sterrett
 - James Hill
 - Maarten Claes
-autorequire: 
+- Anthony Panozzo
+- Aaron Milam
+- Anton Rieder
+- Josh Menden
+- Sergey Gnuskov
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -75,21 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -103,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -117,19 +108,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rr
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.82.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.82.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +147,7 @@ description: |
   easily restore or remove an entire set of records without having to worry about
   partial deletion or restoration.
 
-  Additionally, other plugins generally screw with how destroy/delete work.  We
+  Additionally, other plugins generally screw with how destroy/delete work. We
   don't because we actually want to be able to destroy records.
 email:
 - joel@expectedbehavior.com
@@ -168,16 +159,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - acts_as_archival.gemspec
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.2.gemfile
-- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - init.rb
 - lib/acts_as_archival.rb
 - lib/acts_as_archival/version.rb
@@ -186,7 +181,6 @@ files:
 - lib/expected_behavior/association_operation/archive.rb
 - lib/expected_behavior/association_operation/base.rb
 - lib/expected_behavior/association_operation/unarchive.rb
-- script/db_setup
 - script/setup
 - test/ambiguous_table_test.rb
 - test/application_record_test.rb
@@ -194,8 +188,8 @@ files:
 - test/basic_test.rb
 - test/callbacks_test.rb
 - test/column_test.rb
-- test/database.yml
 - test/deep_nesting_test.rb
+- test/fixtures/another_polys_holder.rb
 - test/fixtures/application_record.rb
 - test/fixtures/application_record_row.rb
 - test/fixtures/archival.rb
@@ -206,19 +200,14 @@ files:
 - test/fixtures/callback_archival_5.rb
 - test/fixtures/exploder.rb
 - test/fixtures/independent_archival.rb
-- 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
-- test/mass_attribute_test.rb
 - test/polymorphic_test.rb
 - test/readonly_when_archived_test.rb
+- test/relations_test.rb
 - test/responds_test.rb
 - test/schema.rb
 - test/scope_test.rb
@@ -228,7 +217,7 @@ files:
 homepage: http://github.com/expectedbehavior/acts_as_archival
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -236,16 +225,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Atomic archiving/unarchiving for ActiveRecord-based apps
 test_files:
@@ -255,8 +243,8 @@ test_files:
 - test/basic_test.rb
 - test/callbacks_test.rb
 - test/column_test.rb
-- test/database.yml
 - test/deep_nesting_test.rb
+- test/fixtures/another_polys_holder.rb
 - test/fixtures/application_record.rb
 - test/fixtures/application_record_row.rb
 - test/fixtures/archival.rb
@@ -267,19 +255,14 @@ test_files:
 - test/fixtures/callback_archival_5.rb
 - test/fixtures/exploder.rb
 - test/fixtures/independent_archival.rb
-- 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
-- test/mass_attribute_test.rb
 - test/polymorphic_test.rb
 - test/readonly_when_archived_test.rb
+- test/relations_test.rb
 - test/responds_test.rb
 - test/schema.rb
 - test/scope_test.rb

data/gemfiles/rails_4.1.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.1.0"
-gem "mysql2", ">= 0.3.13", "< 0.4"
-
-gemspec :path => "../"

data/script/db_setup

@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby
-require "bundler/setup"
-require "yaml"
-
-STDOUT.sync = true
-
-DB_CONFIG = YAML.load(File.read(File.join(File.dirname(__FILE__), "..", "test", "database.yml")))
-
-def execute_mysql(statement, password = nil)
-  password_option = if password.to_s.size > 0
-    "-p'#{password}'"
-  end
-  command = %Q{echo '#{statement}' | mysql -u root #{password_option}}
-  puts command
-  system(command)
-end
-
-def execute_postgres(statement)
-  command = %Q{echo "#{statement}" | psql postgres}
-  puts command
-  system(command)
-end
-
-def setup_mysql
-  mysql_root_password = nil
-  if !execute_mysql("SHOW DATABASES;", mysql_root_password)
-    loop do
-      print "MySQL root password to setup '#{DB_CONFIG["mysql"]["database"]}': "
-      mysql_root_password = gets.chomp
-      if execute_mysql("SHOW DATABASES;", mysql_root_password)
-        break
-      end
-    end
-  end
-
-  config = DB_CONFIG["mysql"]
-  execute_mysql("DROP DATABASE IF EXISTS #{config["database"]};", mysql_root_password)
-  execute_mysql("CREATE DATABASE #{config["database"]};", mysql_root_password)
-  execute_mysql(%Q{GRANT ALL ON `#{config["database"]}`.* TO `#{config["username"]}` IDENTIFIED BY "#{config["password"]}";}, mysql_root_password)
-end
-
-def setup_postgres
-  config = DB_CONFIG["pg"]
-  execute_postgres(%Q{DROP DATABASE IF EXISTS #{config["database"]};})
-  execute_postgres(%Q{DROP ROLE IF EXISTS #{config["username"]};})
-  execute_postgres(%Q{CREATE ROLE #{config["username"]} WITH PASSWORD '#{config["password"]}' LOGIN;})
-  execute_postgres(%Q{CREATE DATABASE #{config["database"]} WITH OWNER #{config["username"]};})
-end
-
-setup_mysql
-setup_postgres

data/test/database.yml

@@ -1,26 +0,0 @@
-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/fixtures/mass_attribute_protected.rb

@@ -1,7 +0,0 @@
-# name           - string
-# archive_number - string
-# archived_at    - datetime
-class MassAttributeProtected < ActiveRecord::Base
-  acts_as_archival
-  attr_accessible :name
-end

data/test/fixtures/mysql_archival.rb

@@ -1,10 +0,0 @@
-# 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