acts_as_archival 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f9de47af7c26b8d78744f6f150523da886cc3e72f3adfdf2c43489f92dd29d7
-  data.tar.gz: eb8710dc7dd90dfb876b83e61f9d08ac01003d734950f9554abd24d91e428875
+  metadata.gz: ebfd9690765e2b7676db8c90e2459ccccf3ff2ef9f6b94898fafa565cfdc708a
+  data.tar.gz: 303ee5fb63bd23c6bc35ef69b23eab80c455acd75632e3ca41a03b378fb3a471
 SHA512:
-  metadata.gz: e16b3e95c07251f5f5c1dcd2b960e76ffc3f41241c7601b9cb7923e1f89bbc3c4aa21be46ad2b55ebce502933a3d6171ed1a57874857001a653db984822d8176
-  data.tar.gz: 9b818f82e6072dde8e0f7e1a621dd7593b918cb696738a0b1750b2357ab732250e18ae5d008813f3b8dc8204447df0f37e98561532343105c89682cd46a9a3c8
+  metadata.gz: d559c3b334d403418304225720db0b4cc78517bc4fd7fd43d6e3cb0bae8704c7f7e05288202658bec3d1622395e76583d538dca5ba942fbb4108a77060e19988
+  data.tar.gz: 1e64b71d7f09a82d38e68abb807c36a70f7ce6fe577ec45047a1f1cfb6cf466280634fae78acfb4c83f9b81a9a801a68c79095cd2f5102dc7e28ab9cf6eb1716

data/.gitignore

@@ -8,3 +8,4 @@ gemfiles/*.lock
 pkg/*
 .DS_Store
 *.sqlite3
+.idea/

data/.rubocop.yml

@@ -4,8 +4,9 @@ AllCops:
   Exclude:
     - vendor/**/*
     - gemfiles/**/*
-  TargetRubyVersion: 2.4
+  MinimumTargetRubyVersion: 2.7.3
   NewCops: enable
+  SuggestExtensions: false
 
 
 ################

data/Appraisals

@@ -1,12 +1,7 @@
-appraise "rails-5.2" do
-  gem "rails", "~> 5.2.0"
-  gem "sqlite3", "~> 1.4.1"
-end
-
-appraise "rails-6.0" do
-  gem "rails", "~> 6.0.0"
-end
-
 appraise "rails-6.1" do
   gem "rails", "~> 6.1"
 end
+
+appraise "rails-7.0" do
+  gem "rails", "~> 7.0"
+end

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # CHANGELOG
 
-## 2.0.0 – (UNRELEASED)
+## 2.1.0
+* **BREAKING CHANGE** Drop support for Rails 5.2 and 6.0 (6.1 support remains)
+* Add support for Rails 7
+* Fix deprecation warnings
+* Need Ruby >=2.7 for Rails 7 support
+
+## 2.0.0
 
 * **BREAKING CHANGE** Drop support for Rails 4.2
 * **BREAKING CHANGE** Drop support for Rails 5.0

data/Gemfile.lock

@@ -1,57 +1,58 @@
 PATH
   remote: .
   specs:
-    acts_as_archival (2.0.0)
-      activerecord (>= 5.0)
+    acts_as_archival (2.1.0)
+      activerecord (>= 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activesupport (6.1.4.1)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     assertions-eb (1.7.3)
-    ast (2.4.0)
-    concurrent-ruby (1.1.9)
+    ast (2.4.2)
+    concurrent-ruby (1.1.10)
     database_cleaner (1.8.4)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    minitest (5.14.4)
-    parallel (1.19.1)
-    parser (2.7.1.1)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
+    minitest (5.16.1)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
     rake (13.0.1)
-    rexml (3.2.4)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
     rr (1.2.1)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      rexml
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
     sqlite3 (1.4.2)
     thor (1.0.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -63,7 +64,7 @@ DEPENDENCIES
   database_cleaner
   rake
   rr
-  rubocop (~> 0.82.0)
+  rubocop (~> 1.30.1)
   sqlite3
 
 BUNDLED WITH

data/acts_as_archival.gemspec

@@ -5,6 +5,7 @@ require "acts_as_archival/version"
 Gem::Specification.new do |gem|
   gem.name        = "acts_as_archival"
   gem.summary     = "Atomic archiving/unarchiving for ActiveRecord-based apps"
+  gem.licenses    = ['MIT']
   gem.version     = ActsAsArchival::VERSION
   gem.authors     = ["Joel Meador",
                      "Michael Kuehl",
@@ -26,19 +27,20 @@ Gem::Specification.new do |gem|
                      "nathan@expectedbehavior.com"]
   gem.homepage    = "http://github.com/expectedbehavior/acts_as_archival"
 
+  gem.metadata["rubygems_mfa_required"] = "true"
+
   gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = ["lib"]
-  gem.required_ruby_version = ">= 2.4"
+  gem.required_ruby_version = ">= 2.7.3"
 
-  gem.add_dependency "activerecord", ">= 5.0"
+  gem.add_dependency "activerecord", ">= 6.1"
 
   gem.add_development_dependency "appraisal"
   gem.add_development_dependency "assertions-eb"
   gem.add_development_dependency "database_cleaner"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rr"
-  gem.add_development_dependency "rubocop", "~> 0.82.0"
+  gem.add_development_dependency "rubocop", "~> 1.30.1"
   gem.add_development_dependency "sqlite3"
 
   gem.description =

data/gemfiles/{rails_6.0.gemfile → rails_7.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 7.0"
 
 gemspec path: "../"

data/lib/acts_as_archival/version.rb

@@ -1,5 +1,5 @@
 module ActsAsArchival
 
-  VERSION = "2.0.0".freeze
+  VERSION = "2.1.0".freeze
 
 end

data/lib/expected_behavior/acts_as_archival.rb

@@ -3,13 +3,13 @@ module ExpectedBehavior
 
     require "digest/md5"
 
-    unless defined?(MissingArchivalColumnError) == "constant" && MissingArchivalColumnError.class == Class
+    unless defined?(MissingArchivalColumnError) == "constant" && MissingArchivalColumnError.instance_of?(Class)
       MissingArchivalColumnError = Class.new(ActiveRecord::ActiveRecordError)
     end
-    unless defined?(CouldNotArchiveError) == "constant" && CouldNotArchiveError.class == Class
+    unless defined?(CouldNotArchiveError) == "constant" && CouldNotArchiveError.instance_of?(Class)
       CouldNotArchiveError = Class.new(ActiveRecord::ActiveRecordError)
     end
-    unless defined?(CouldNotUnarchiveError) == "constant" && CouldNotUnarchiveError.class == Class
+    unless defined?(CouldNotUnarchiveError) == "constant" && CouldNotUnarchiveError.instance_of?(Class)
       CouldNotUnarchiveError = Class.new(ActiveRecord::ActiveRecordError)
     end
 
@@ -66,6 +66,7 @@ module ExpectedBehavior
 
       private def define_callback_dsl_method(callbackable_type, action)
         # rubocop:disable Security/Eval
+        # rubocop:disable Style/DocumentDynamicEvalDefinition
         eval <<-end_callbacks
           unless defined?(#{callbackable_type}_#{action})
             def #{callbackable_type}_#{action}(*args, &blk)
@@ -73,6 +74,7 @@ module ExpectedBehavior
             end
           end
         end_callbacks
+        # rubocop:enable Style/DocumentDynamicEvalDefinition
         # rubocop:enable Security/Eval
       end
 
@@ -132,16 +134,15 @@ module ExpectedBehavior
         AssociationOperation::Unarchive.new(self, head_archive_number).execute
       end
 
-      private def execute_archival_action(action)
+      private def execute_archival_action(action, &block)
+        result = false
         self.class.transaction do
-          begin
-            success = run_callbacks(action) { yield }
-            return !!success
-          rescue => e
-            handle_archival_action_exception(e)
-          end
+          result = !!run_callbacks(action, &block)
+        rescue => e
+          handle_archival_action_exception(e)
         end
-        false
+
+        result
       end
 
       private def handle_archival_action_exception(exception)

data/test/callbacks_test.rb

@@ -2,40 +2,21 @@ require_relative "test_helper"
 
 class CallbacksTest < ActiveSupport::TestCase
 
-  if defined?(ApplicationRecord)
-    test "can set a value as part of archiving" do
-      archival = CallbackArchival5.create
-      archival.set_this_value = "a test string"
-      assert_nil archival.settable_field
-      archival.archive!
-      assert_equal "a test string", archival.reload.settable_field
-    end
-
-    test "can be halted" do
-      archival = CallbackArchival5.create
-      archival.set_this_value = "a test string"
-      archival.pass_callback = false
-      assert_nil archival.settable_field
-      archival.archive!
-      assert_nil archival.reload.settable_field
-    end
-  else
-    test "can set a value as part of archiving" do
-      archival = CallbackArchival4.create
-      archival.set_this_value = "a test string"
-      assert_nil archival.settable_field
-      archival.archive!
-      assert_equal "a test string", archival.reload.settable_field
-    end
+  test "can set a value as part of archiving" do
+    archival = CallbackArchival.create
+    archival.set_this_value = "a test string"
+    assert_nil archival.settable_field
+    archival.archive!
+    assert_equal "a test string", archival.reload.settable_field
+  end
 
-    test "can be halted" do
-      archival = CallbackArchival4.create
-      archival.set_this_value = "a test string"
-      archival.pass_callback = false
-      assert_nil archival.settable_field
-      archival.archive!
-      assert_nil archival.reload.settable_field
-    end
+  test "can be halted" do
+    archival = CallbackArchival.create
+    archival.set_this_value = "a test string"
+    archival.pass_callback = false
+    assert_nil archival.settable_field
+    archival.archive!
+    assert_nil archival.reload.settable_field
   end
 
 end

data/test/fixtures/{callback_archival_4.rb → callback_archival.rb}

@@ -1,4 +1,4 @@
-class CallbackArchival4 < ActiveRecord::Base
+class CallbackArchival < ApplicationRecord
 
   acts_as_archival
 
@@ -8,12 +8,15 @@ class CallbackArchival4 < ActiveRecord::Base
   before_archive :set_value,
                  :conditional_callback_passer
 
-  private def set_value
+  private
+
+  def set_value
     self.settable_field = set_this_value
   end
 
-  private def conditional_callback_passer
-    pass_callback || pass_callback.nil?
+  def conditional_callback_passer
+    # we want to throw only for the value false
+    throw(:abort) unless pass_callback || pass_callback.nil?
   end
 
 end

data/test/schema.rb

@@ -76,13 +76,7 @@ ActiveRecord::Schema.define(version: 1) do
     t.column :archived_at, :datetime
   end
 
-  create_table :callback_archival4s, force: true do |t|
-    t.column :settable_field, :string
-    t.column :archive_number, :string
-    t.column :archived_at, :datetime
-  end
-
-  create_table :callback_archival5s, force: true do |t|
+  create_table :callback_archivals, force: true do |t|
     t.column :settable_field, :string
     t.column :archive_number, :string
     t.column :archived_at, :datetime

data/test/scope_test.rb

@@ -52,15 +52,11 @@ class ScopeTest < ActiveSupport::TestCase
 
   test "table_name is set to 'legacy'" do
     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
+      "SELECT \"legacy\".* FROM \"legacy\" " \
+      'WHERE "legacy"."archived_at" IS NOT NULL AND "legacy"."archive_number" IS NOT NULL'
+
     unarchived_sql = "SELECT \"legacy\".* FROM \"legacy\" " \
-        'WHERE "legacy"."archived_at" IS NULL AND "legacy"."archive_number" IS NULL'
+                     '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

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib")
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
 require "bundler/setup"
 require "minitest/autorun"
 require "minitest/pride"
@@ -22,7 +22,7 @@ end
 
 def setup_logging
   require "logger"
-  logfile = File.dirname(__FILE__) + "/debug.log"
+  logfile = "#{File.dirname(__FILE__)}/debug.log"
   ActiveRecord::Base.logger = Logger.new(logfile)
 end
 
@@ -43,7 +43,7 @@ def sqlite_config
 end
 
 def create_test_tables
-  schema_file = File.dirname(__FILE__) + "/schema.rb"
+  schema_file = "#{File.dirname(__FILE__)}/schema.rb"
   puts "** Loading schema for SQLite"
   ActiveRecord::Base.establish_connection(sqlite_config)
   load(schema_file) if File.exist?(schema_file)
@@ -61,17 +61,10 @@ BASE_FIXTURE_CLASSES = [
   :missing_archive_number,
   :plain,
   :poly,
-  :readonly_when_archived
-].freeze
-
-RAILS_4_FIXTURE_CLASSES = [
-  :callback_archival_4
-].freeze
-
-RAILS_5_FIXTURE_CLASSES = [
+  :readonly_when_archived,
   :application_record,
   :application_record_row,
-  :callback_archival_5
+  :callback_archival
 ].freeze
 
 def require_test_classes
@@ -79,14 +72,9 @@ def require_test_classes
     inflect.irregular "poly", "polys"
   end
 
-  fixtures = if ActiveRecord::VERSION::MAJOR >= 4
-               RAILS_5_FIXTURE_CLASSES
-             else
-               RAILS_4_FIXTURE_CLASSES
-             end
-
-  fixtures += BASE_FIXTURE_CLASSES
-  fixtures.each { |test_class_file| require_relative "fixtures/#{test_class_file}" }
+  BASE_FIXTURE_CLASSES.each do |test_class_file|
+    require_relative "fixtures/#{test_class_file}"
+  end
 end
 
 prepare_for_tests

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_archival
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Joel Meador
@@ -21,7 +21,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -113,14 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 1.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 1.30.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -170,9 +170,8 @@ files:
 - README.md
 - Rakefile
 - acts_as_archival.gemspec
-- gemfiles/rails_5.2.gemfile
-- gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - init.rb
 - lib/acts_as_archival.rb
 - lib/acts_as_archival/version.rb
@@ -196,8 +195,7 @@ files:
 - test/fixtures/archival_grandkid.rb
 - test/fixtures/archival_kid.rb
 - test/fixtures/archival_table_name.rb
-- test/fixtures/callback_archival_4.rb
-- test/fixtures/callback_archival_5.rb
+- test/fixtures/callback_archival.rb
 - test/fixtures/exploder.rb
 - test/fixtures/independent_archival.rb
 - test/fixtures/missing_archive_number.rb
@@ -215,8 +213,10 @@ files:
 - test/through_association_test.rb
 - test/transaction_test.rb
 homepage: http://github.com/expectedbehavior/acts_as_archival
-licenses: []
-metadata: {}
+licenses:
+- MIT
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -225,47 +225,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: 2.7.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Atomic archiving/unarchiving for ActiveRecord-based apps
-test_files:
-- test/ambiguous_table_test.rb
-- test/application_record_test.rb
-- test/associations_test.rb
-- test/basic_test.rb
-- test/callbacks_test.rb
-- test/column_test.rb
-- 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
-- test/fixtures/archival_grandkid.rb
-- test/fixtures/archival_kid.rb
-- test/fixtures/archival_table_name.rb
-- test/fixtures/callback_archival_4.rb
-- test/fixtures/callback_archival_5.rb
-- test/fixtures/exploder.rb
-- test/fixtures/independent_archival.rb
-- test/fixtures/missing_archive_number.rb
-- test/fixtures/missing_archived_at.rb
-- test/fixtures/plain.rb
-- test/fixtures/poly.rb
-- test/fixtures/readonly_when_archived.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
-- test/test_helper.rb
-- test/through_association_test.rb
-- test/transaction_test.rb
+test_files: []

data/gemfiles/rails_5.2.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.2.0"
-gem "sqlite3", "~> 1.4.1"
-
-gemspec path: "../"

data/test/fixtures/callback_archival_5.rb

@@ -1,23 +0,0 @@
-# necessary for ApplicationRecord
-if defined?(ApplicationRecord)
-  class CallbackArchival5 < ApplicationRecord
-
-    acts_as_archival
-
-    attr_accessor :set_this_value,
-                  :pass_callback
-
-    before_archive :set_value,
-                   :conditional_callback_passer
-
-    private def set_value
-      self.settable_field = set_this_value
-    end
-
-    private def conditional_callback_passer
-      # we want to throw only for the value false
-      throw(:abort) unless pass_callback || pass_callback.nil?
-    end
-
-  end
-end