acts_as_archival 1.3.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 57fc429ad5b01bdcf06307addddfbfbcaa6d9c28
-  data.tar.gz: cd104110c549dd3e187c7e0095e22b1c4ba59fda
+SHA256:
+  metadata.gz: ebfd9690765e2b7676db8c90e2459ccccf3ff2ef9f6b94898fafa565cfdc708a
+  data.tar.gz: 303ee5fb63bd23c6bc35ef69b23eab80c455acd75632e3ca41a03b378fb3a471
 SHA512:
-  metadata.gz: 67046bb797b64b2b7de8079f4b95a1c55e1a07d92614711a775ff372931997f156139ad6aa920d7bd2398d9376c5f06834c25a4404dd524728eb0602c659ee7b
-  data.tar.gz: 24cf648a878a16eba6b089bf60504f2609386cd4a39735e6e163e6ffe48d70a50830005fb4ac58a303f87ae73854c3b608cab6dd8669e1bafd340ab95b555e4d
+  metadata.gz: d559c3b334d403418304225720db0b4cc78517bc4fd7fd43d6e3cb0bae8704c7f7e05288202658bec3d1622395e76583d538dca5ba942fbb4108a77060e19988
+  data.tar.gz: 1e64b71d7f09a82d38e68abb807c36a70f7ce6fe577ec45047a1f1cfb6cf466280634fae78acfb4c83f9b81a9a801a68c79095cd2f5102dc7e28ab9cf6eb1716

data/.gitignore

@@ -4,7 +4,8 @@
 bin
 vendor/bundle
 *.gem
-*emfile.lock
+gemfiles/*.lock
 pkg/*
 .DS_Store
 *.sqlite3
+.idea/

data/.rubocop.yml

@@ -4,6 +4,25 @@ AllCops:
   Exclude:
     - vendor/**/*
     - gemfiles/**/*
+  MinimumTargetRubyVersion: 2.7.3
+  NewCops: enable
+  SuggestExtensions: false
+
+
+################
+# Layout Rules #
+################
+Layout/EmptyLinesAroundClassBody:
+  EnforcedStyle: empty_lines_except_namespace
+
+Layout/EmptyLinesAroundModuleBody:
+  EnforcedStyle: empty_lines_except_namespace
+
+Layout/LineLength:
+  Max: 140
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: space
 
 
 ################
@@ -17,9 +36,6 @@ Metrics/BlockLength:
 Metrics/AbcSize:
   Max: 25
 
-Metrics/LineLength:
-  Max: 140
-
 Metrics/MethodLength:
   Max: 10
   CountComments: false
@@ -43,39 +59,14 @@ Style/Documentation:
 Style/DoubleNegation:
   Enabled: false
 
-Style/EmptyLinesAroundClassBody:
-  EnforcedStyle: empty_lines_except_namespace
-
-Style/EmptyLinesAroundModuleBody:
-  EnforcedStyle: empty_lines_except_namespace
-
 Style/FrozenStringLiteralComment:
   EnforcedStyle: never
 
 Style/HashSyntax:
   EnforcedStyle: ruby19
 
-# TODO: replace the [] below with default once a new version of
-#       rubocop comes out, since there is a PR for it:
-#       https://github.com/bbatsov/rubocop/pull/4038
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%':  '{}'
-    '%i': '[]'
-    '%I': '[]'
-    '%q': '{}'
-    '%Q': '{}'
-    '%r': '{}'
-    '%s': '[]'
-    '%w': '[]'
-    '%W': '[]'
-    '%x': '[]'
-
 Style/RaiseArgs:
   EnforcedStyle: compact
 
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: space
-
 Style/StringLiterals:
   EnforcedStyle: double_quotes

data/.rubocop_todo.yml

@@ -1,7 +1,98 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-03-19 11:19:20 -0400 using RuboCop version 0.47.1.
+# on 2020-04-28 17:17:25 +0200 using RuboCop version 0.82.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'acts_as_archival.gemspec'
+    - 'test/scope_test.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
+Layout/SpaceAroundOperators:
+  Exclude:
+    - 'test/deep_nesting_test.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/ScriptPermission:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Lint/SendWithMixinArgument:
+  Exclude:
+    - 'init.rb'
+    - 'lib/acts_as_archival.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: lowercase, uppercase
+Naming/HeredocDelimiterCase:
+  Exclude:
+    - 'lib/expected_behavior/acts_as_archival.rb'
+
+# Offense count: 3
+# Configuration parameters: ForbiddenDelimiters.
+# ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+Naming/HeredocDelimiterNaming:
+  Exclude:
+    - 'acts_as_archival.gemspec'
+    - 'lib/expected_behavior/acts_as_archival.rb'
+
+# Offense count: 12
+# Configuration parameters: EnforcedStyle, AllowModifiersOnSymbols.
+# SupportedStyles: inline, group
+Style/AccessModifierDeclarations:
+  Exclude:
+    - 'lib/expected_behavior/acts_as_archival.rb'
+    - 'test/fixtures/callback_archival_4.rb'
+    - 'test/fixtures/callback_archival_5.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/Encoding:
+  Exclude:
+    - 'acts_as_archival.gemspec'
+    - 'test/scope_test.rb'
+
+# Offense count: 1
+Style/EvalWithLocation:
+  Exclude:
+    - 'lib/expected_behavior/acts_as_archival.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
+  Exclude:
+    - 'acts_as_archival.gemspec'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'test/test_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, explicit
+Style/RescueStandardError:
+  Exclude:
+    - 'lib/expected_behavior/acts_as_archival.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: MinSize.
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: brackets

data/.travis.yml

@@ -1,32 +1,23 @@
 language: ruby
-sudo: false
-dist: trusty
 cache: bundler
-script: "bundle exec rake"
 
 rvm:
-  - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
 
 gemfile:
-  - gemfiles/rails_4.1.gemfile
-  - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
 
 before_install:
   - gem update --system
-  - gem update bundler
-  - gem cleanup bundler
 
 matrix:
   fast_finish: true
   exclude:
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_5.1.gemfile
-    - rvm: 2.4.0
-      gemfile: gemfiles/rails_4.1.gemfile
+    - gemfile: gemfiles/rails_6.0.gemfile
+      rvm: 2.4

data/Appraisals

@@ -1,15 +1,7 @@
-appraise "rails-4.1" do
-  gem "rails", "~> 4.1.0"
+appraise "rails-6.1" do
+  gem "rails", "~> 6.1"
 end
 
-appraise "rails-4.2" do
-  gem "rails", "~> 4.2.0"
-end
-
-appraise "rails-5.0" do
-  gem "rails", "~> 5.0.0"
-end
-
-appraise "rails-5.1" do
-  gem "rails", "~> 5.1.0"
+appraise "rails-7.0" do
+  gem "rails", "~> 7.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # CHANGELOG
 
+## 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
+* **BREAKING CHANGE** Drop support for Rails 5.1
+* **BREAKING CHANGE** Removed deprecated methods
+* Fix Rails 6 deprecation warnings
+* Add offical support for Rails 6.1
+
+## 1.4.0 - July 10, 2019
+* **BREAKING CHANGE** drop support for rails 4.1
+* **BREAKING CHANGE** drop support for Ruby <2.4
+* **BUGFIX** polymorphic associations that are archived/unarchived can be acted on safely if they share the same ID.
+* add support officially for rails 5.2
+* sqlite upgrades for various rails
+* new methods `#archive_all!` and `#unarchive_all` that can be called off scopes
+
+
 ## 1.3.0 - October 21, 2017
 * deprecate `#archive` and `#unarchive` in favor of `#archive!` and `#unarchive!` [#36](https://github.com/expectedbehavior/acts_as_archival/pull/36)
 

data/Gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: .
+  specs:
+    acts_as_archival (2.1.0)
+      activerecord (>= 6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    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)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    assertions-eb (1.7.3)
+    ast (2.4.2)
+    concurrent-ruby (1.1.10)
+    database_cleaner (1.8.4)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.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)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rr (1.2.1)
+    rubocop (1.30.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      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, < 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 (2.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  acts_as_archival!
+  appraisal
+  assertions-eb
+  database_cleaner
+  rake
+  rr
+  rubocop (~> 1.30.1)
+  sqlite3
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -79,6 +79,25 @@ r.archived_at                    # => nil
 r.archived?                      # => false
 ```
 
+### Relations
+
+```ruby
+Hole.create!
+Hole.create!
+Hole.create!
+
+holes = Hole.all
+
+# All records in the relation will be archived with the same archive_number.
+# Dependent/Destroy relationships will be archived, and callbacks will still be honored.
+holes.archive_all!              # => [array of Hole records in the relation]
+
+holes.first.archive_number      # => "b56876de48a5dcfe71b2c13eec15e4a2"
+holes.last.archive_number       # => "b56876de48a5dcfe71b2c13eec15e4a2"
+
+holes.unarchive_all!            # => [array of Hole records in the relation]
+```
+
 ### Scopes
 
 ``` ruby
@@ -95,9 +114,7 @@ Hole.unarchived.size             # => 0
 ``` ruby
 h = Hole.create                  #
 h.archival?                   # => true
-h.is_archival?                # => true # deprecated
 Hole.archival?                # => true
-Hole.is_archival?             # => true # deprecated
 ```
 
 ### Options
@@ -144,8 +161,8 @@ end
 
 #### Halting the callback chain
 
-* Rails 4.1/4.2 - the callback method should return a `false`/`nil` value.
-* Rails 5x - the callback should `throw(:abort)`/`raise(:abort)`.
+* Rails 4.2 - the callback method should return a `false`/`nil` value.
+* Rails 5.x - the callback should `throw(:abort)`/`raise(:abort)`.
 
 ## Caveats
 
@@ -190,6 +207,8 @@ ActsAsParanoid and PermanentRecords were both inspirations for this:
 * Anthony Panozzo
 * Aaron Milam
 * Anton Rieder
+* Josh Menden
+* Sergey Gnuskov
 
 Thanks!
 

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",
@@ -14,40 +15,48 @@ Gem::Specification.new do |gem|
                      "Dave Woodward",
                      "Miles Sterrett",
                      "James Hill",
-                     "Maarten Claes"]
+                     "Maarten Claes",
+                     "Anthony Panozzo",
+                     "Aaron Milam",
+                     "Anton Rieder",
+                     "Josh Menden",
+                     "Sergey Gnuskov"]
   gem.email       = ["joel@expectedbehavior.com",
                      "matt@expectedbehavior.com",
                      "jason@expectedbehavior.com",
                      "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.7.3"
 
-  gem.add_dependency "activerecord", ">= 4.1"
+  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", "~> 1.30.1"
   gem.add_development_dependency "sqlite3"
-  gem.add_development_dependency "rubocop", "~> 0.47.1"
 
-  gem.description = <<-END
-*Atomic archiving/unarchiving for ActiveRecord-based apps*
+  gem.description =
+    <<~END
+      *Atomic archiving/unarchiving for ActiveRecord-based apps*
 
-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 restore records
-atomically (or archive them, for that matter).
+      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 restore records
+      atomically (or archive them, for that matter).
 
-Because the archive and unarchive methods are in transactions, and every
-archival record involved gets the same archive number upon archiving, you can
-easily restore or remove an entire set of records without having to worry about
-partial deletion or restoration.
+      Because the archive and unarchive methods are in transactions, and every
+      archival record involved gets the same archive number upon archiving, you can
+      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
-don't because we actually want to be able to destroy records.
-END
+      Additionally, other plugins generally screw with how destroy/delete work. We
+      don't because we actually want to be able to destroy records.
+    END
 end

data/gemfiles/{rails_4.1.gemfile → rails_6.1.gemfile}

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

data/gemfiles/{rails_4.2.gemfile → rails_7.0.gemfile}

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

data/lib/acts_as_archival/version.rb

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

data/lib/acts_as_archival.rb

@@ -15,3 +15,5 @@ else
   ActiveRecord::Base.send :include, ExpectedBehavior::ActsAsArchival
   ActiveRecord::Base.send :include, ExpectedBehavior::ActsAsArchivalActiveRecordMethods
 end
+
+ActiveRecord::Relation.send :include, ExpectedBehavior::ActsAsArchivalActiveRecordMethods::ARRelationMethods

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
 
@@ -37,7 +37,7 @@ module ExpectedBehavior
       end
 
       private def setup_scopes
-        scope :archived, -> { where.not(archived_at: nil, archive_number: nil) }
+        scope :archived, -> { where.not(archived_at: nil).where.not(archive_number: nil) }
         scope :unarchived, -> { where(archived_at: nil, archive_number: nil) }
         scope :archived_from_archive_number, (lambda do |head_archive_number|
           where(["archived_at IS NOT NULL AND archive_number = ?", head_archive_number])
@@ -53,11 +53,7 @@ module ExpectedBehavior
       end
 
       private def setup_activerecord_callbacks(callbackable_actions)
-        if ActiveSupport::VERSION::MAJOR >= 5
-          define_callbacks(*[callbackable_actions].flatten)
-        elsif ActiveSupport::VERSION::MAJOR >= 4
-          define_callbacks(*[callbackable_actions, { terminator: ->(_, result) { result == false } }].flatten)
-        end
+        define_callbacks(*[callbackable_actions].flatten)
       end
 
       private def define_callback_dsl_methods(callbackable_actions)
@@ -70,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)
@@ -77,6 +74,7 @@ module ExpectedBehavior
             end
           end
         end_callbacks
+        # rubocop:enable Style/DocumentDynamicEvalDefinition
         # rubocop:enable Security/Eval
       end
 
@@ -104,14 +102,6 @@ module ExpectedBehavior
         !!(archived_at? && archive_number)
       end
 
-      def archive(head_archive_number = nil)
-        ActiveSupport::Deprecation.warn <<-EOS.strip_heredoc.gsub(/\s+/, " ")
-          '.archive' is deprecated and will be removed in future versions of acts_as_archival.
-          Please use '.archive!' instead.
-        EOS
-        archive!(head_archive_number)
-      end
-
       def archive!(head_archive_number = nil)
         execute_archival_action(:archive) do
           unless archived?
@@ -124,14 +114,6 @@ module ExpectedBehavior
         end
       end
 
-      def unarchive(head_archive_number = nil)
-        ActiveSupport::Deprecation.warn <<-EOS.strip_heredoc.gsub(/\s+/, " ")
-          '.unarchive' is deprecated and will be removed in future versions of acts_as_archival.
-          Please use '.unarchive!' instead.
-        EOS
-        unarchive!(head_archive_number)
-      end
-
       def unarchive!(head_archive_number = nil)
         execute_archival_action(:unarchive) do
           if archived?
@@ -152,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/lib/expected_behavior/acts_as_archival_active_record_methods.rb

@@ -12,13 +12,6 @@ module ExpectedBehavior
         included_modules.include?(ExpectedBehavior::ActsAsArchival::InstanceMethods)
       end
 
-      # rubocop:disable Style/PredicateName
-      def is_archival?
-        ActiveSupport::Deprecation.warn(".is_archival? is deprecated in favor of .archival?")
-        archival?
-      end
-      # rubocop:enable Style/PredicateName
-
     end
 
     module ARInstanceMethods
@@ -27,12 +20,24 @@ module ExpectedBehavior
         self.class.archival?
       end
 
-      # rubocop:disable Style/PredicateName
-      def is_archival?
-        ActiveSupport::Deprecation.warn("#is_archival? is deprecated in favor of #archival?")
-        archival?
+    end
+
+    module ARRelationMethods
+
+      def archive_all!
+        error_message = "The #{klass} must implement 'act_on_archivals' in order to call `archive_all!`"
+        raise NotImplementedError.new(error_message) unless archival?
+
+        head_archive_number = Digest::MD5.hexdigest("#{klass}#{Time.now.utc.to_i}")
+        each { |record| record.archive!(head_archive_number) }.tap { reset }
+      end
+
+      def unarchive_all!
+        error_message = "The #{klass} must implement 'act_on_archivals' in order to call `unarchive_all!`"
+        raise NotImplementedError.new(error_message) unless archival?
+
+        each(&:unarchive!).tap { reset }
       end
-      # rubocop:enable Style/PredicateName
 
     end
 

data/lib/expected_behavior/association_operation/base.rb

@@ -36,7 +36,11 @@ module ExpectedBehavior
 
         def act_on_association(association)
           key = association.respond_to?(:foreign_key) ? association.foreign_key : association.primary_key_name
-          scope = association.klass.where(key => model.id)
+          scope_conditions = { key => model.id }
+          # polymorphic associations need a type so we don't accidentally act on multiple associated objects
+          # that have the same ID
+          scope_conditions[association.type] = model.class.base_class.name if association.type
+          scope = association.klass.where(scope_conditions)
           act_on_archivals(scope)
         end
 

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/another_polys_holder.rb

@@ -0,0 +1,11 @@
+# name           - string
+# archival_id    - integer
+# archive_number - string
+# archived_at    - datetime
+class AnotherPolysHolder < ActiveRecord::Base
+
+  acts_as_archival
+
+  has_many :polys, dependent: :destroy, as: :archiveable
+
+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/polymorphic_test.rb

@@ -11,6 +11,15 @@ class PolymorphicTest < ActiveSupport::TestCase
     assert poly.reload.archived?
   end
 
+  test "does not archive polymorphic association of different item with same id" do
+    archival = Archival.create!
+    another_polys_holder = AnotherPolysHolder.create!(id: archival.id)
+    poly = another_polys_holder.polys.create!
+    archival.archive!
+
+    assert_not poly.reload.archived?
+  end
+
   test "unarchive item with polymorphic association" do
     archive_attributes = {
       archive_number: "test",
@@ -24,4 +33,18 @@ class PolymorphicTest < ActiveSupport::TestCase
     assert_not poly.reload.archived?
   end
 
+  test "does not unarchive polymorphic association of different item with same id" do
+    archive_attributes = {
+      archive_number: "test",
+      archived_at: Time.now
+    }
+
+    archival = Archival.create!(archive_attributes)
+    another_polys_holder = AnotherPolysHolder.create!(archive_attributes.merge(id: archival.id))
+    poly = another_polys_holder.polys.create!(archive_attributes)
+    archival.unarchive!
+
+    assert poly.reload.archived?
+  end
+
 end

data/test/relations_test.rb

@@ -0,0 +1,63 @@
+require_relative "test_helper"
+
+class RelationsTest < ActiveSupport::TestCase
+
+  test "archive_all! archives all records in an AR Association" do
+    3.times { Archival.create! }
+
+    archivals = Archival.all
+    archivals.archive_all!
+    assert archivals.first.archived?
+    assert archivals.last.archived?
+  end
+
+  test "archive_all! archives all records with the same archival number" do
+    3.times { Archival.create! }
+
+    archivals = Archival.all
+    archivals.archive_all!
+    assert_equal archivals.first.archive_number, archivals.last.archive_number
+  end
+
+  test "archive_all! archives children records" do
+    3.times do
+      parent = Archival.create!
+      2.times do
+        parent.archivals.create!
+      end
+    end
+
+    parents = Archival.all
+    parents.archive_all!
+
+    assert parents.first.archivals.first.archived?
+    assert parents.first.archivals.last.archived?
+  end
+
+  test "unarchive_all! unarchives all records in an AR Assocation" do
+    3.times { Archival.create! }
+
+    archivals = Archival.all
+    archivals.archive_all!
+    archivals.unarchive_all!
+    assert_not archivals.first.archived?
+    assert_not archivals.last.archived?
+  end
+
+  test "unarchive_all! unarchives children records" do
+    3.times do
+      parent = Archival.create!
+      2.times do
+        parent.archivals.create!
+      end
+    end
+
+    parents = Archival.all
+    parents.archive_all!
+    parents.unarchive_all!
+
+    assert_not parents.first.archivals.first.archived?
+    assert_not parents.first.archivals.last.archived?
+  end
+
+end

data/test/responds_test.rb

@@ -12,20 +12,4 @@ class RespondsTest < ActiveSupport::TestCase
     assert_not Plain.new.archival?
   end
 
-  ### Deprecation Zone ###
-
-  test "archival class responds correctly to 'is_archival?'" do
-    ActiveSupport::Deprecation.silence do
-      assert     Archival.is_archival?
-      assert_not Plain.is_archival?
-    end
-  end
-
-  test "archival object responds correctly to 'is_archival?'" do
-    ActiveSupport::Deprecation.silence do
-      assert     Archival.new.is_archival?
-      assert_not Plain.new.is_archival?
-    end
-  end
-
 end

data/test/schema.rb

@@ -1,4 +1,11 @@
 ActiveRecord::Schema.define(version: 1) do
+  create_table :another_polys_holders, 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 :archivals, force: true do |t|
     t.column :name, :string
     t.column :archival_id, :integer
@@ -69,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

@@ -1,3 +1,4 @@
+# coding: utf-8
 require_relative "test_helper"
 
 class ScopeTest < ActiveSupport::TestCase
@@ -50,16 +51,12 @@ class ScopeTest < ActiveSupport::TestCase
   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 = "SELECT \"legacy\".* FROM \"legacy\"#{spaces}" \
-        'WHERE ("legacy"."archived_at" IS NOT NULL) AND ("legacy"."archive_number" IS NOT NULL)'
-    unarchived_sql = "SELECT \"legacy\".* FROM \"legacy\"#{spaces}" \
-        'WHERE "legacy"."archived_at" IS NULL AND "legacy"."archive_number" IS NULL'
+    archived_sql =
+      "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'
     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,13 +43,14 @@ 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)
 end
 
 BASE_FIXTURE_CLASSES = [
+  :another_polys_holder,
   :archival,
   :archival_kid,
   :archival_grandkid,
@@ -60,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
@@ -78,14 +72,9 @@ def require_test_classes
     inflect.irregular "poly", "polys"
   end
 
-  fixtures = if ActiveRecord::VERSION::MAJOR >= 4
-               RAILS_5_FIXTURE_CLASSES + BASE_FIXTURE_CLASSES
-             else
-               RAILS_4_FIXTURE_CLASSES + BASE_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: 1.3.0
+  version: 2.1.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: 2017-10-21 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -103,33 +108,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.30.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: '0'
 description: |
   *Atomic archiving/unarchiving for ActiveRecord-based apps*
 
@@ -142,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
@@ -160,14 +165,13 @@ files:
 - 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.1.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - init.rb
 - lib/acts_as_archival.rb
 - lib/acts_as_archival/version.rb
@@ -184,14 +188,14 @@ files:
 - 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/callback_archival.rb
 - test/fixtures/exploder.rb
 - test/fixtures/independent_archival.rb
 - test/fixtures/missing_archive_number.rb
@@ -201,6 +205,7 @@ files:
 - 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
@@ -208,9 +213,11 @@ files:
 - test/through_association_test.rb
 - test/transaction_test.rb
 homepage: http://github.com/expectedbehavior/acts_as_archival
-licenses: []
-metadata: {}
-post_install_message: 
+licenses:
+- MIT
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,46 +225,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.3
 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.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/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/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.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.0.0"
-
-gemspec :path => "../"

data/gemfiles/rails_5.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.1.0"
-
-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