acts_as_archival 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0453a0ad7518b6953ccc8fd43220c553177f41af9adf664c17ffc79b863ea08b
-  data.tar.gz: 71ae456902253a456381a61b6db990c3406e55c388c0d4cf61997015820b00ba
+  metadata.gz: 1f9de47af7c26b8d78744f6f150523da886cc3e72f3adfdf2c43489f92dd29d7
+  data.tar.gz: eb8710dc7dd90dfb876b83e61f9d08ac01003d734950f9554abd24d91e428875
 SHA512:
-  metadata.gz: 913f3ba460d1bf0d214f9a1971fae666ab381d28f2177b07f93d6be7dc5d96ea3e9b2446de382292cbe1f861b13c0e7e1ace5dbe2b1787232eef2dde52848431
-  data.tar.gz: 928fb526a60d9c8c244c61a062095ba456be6124a20f6cc34240ec15dee6423229ac6ee179380d33ff946e84a97f98e9fc962b89bc90b84c0007f41e4cb9797e
+  metadata.gz: e16b3e95c07251f5f5c1dcd2b960e76ffc3f41241c7601b9cb7923e1f89bbc3c4aa21be46ad2b55ebce502933a3d6171ed1a57874857001a653db984822d8176
+  data.tar.gz: 9b818f82e6072dde8e0f7e1a621dd7593b918cb696738a0b1750b2357ab732250e18ae5d008813f3b8dc8204447df0f37e98561532343105c89682cd46a9a3c8

data/.gitignore

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

data/.rubocop.yml

@@ -4,6 +4,24 @@ AllCops:
   Exclude:
     - vendor/**/*
     - gemfiles/**/*
+  TargetRubyVersion: 2.4
+  NewCops: enable
+
+
+################
+# 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 +35,6 @@ Metrics/BlockLength:
 Metrics/AbcSize:
   Max: 25
 
-Metrics/LineLength:
-  Max: 140
-
 Metrics/MethodLength:
   Max: 10
   CountComments: false
@@ -43,39 +58,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,35 +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.5.1
+  - 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
-    - rvm: 2.5.1
-      gemfile: gemfiles/rails_4.1.gemfile
+    - gemfile: gemfiles/rails_6.0.gemfile
+      rvm: 2.4

data/Appraisals

@@ -1,19 +1,12 @@
-appraise "rails-4.2" do
-  gem "rails", "~> 4.2.0"
-  gem "sqlite3", "~> 1.3.13"
+appraise "rails-5.2" do
+  gem "rails", "~> 5.2.0"
+  gem "sqlite3", "~> 1.4.1"
 end
 
-appraise "rails-5.0" do
-  gem "rails", "~> 5.0.0"
-  gem "sqlite3", "~> 1.3.13"
+appraise "rails-6.0" do
+  gem "rails", "~> 6.0.0"
 end
 
-appraise "rails-5.1" do
-  gem "rails", "~> 5.1.0"
-  gem "sqlite3", "~> 1.4.1"
-end
-
-appraise "rails-5.2" do
-  gem "rails", "~> 5.2.0"
-  gem "sqlite3", "~> 1.4.1"
+appraise "rails-6.1" do
+  gem "rails", "~> 6.1"
 end

data/CHANGELOG.md

@@ -1,7 +1,17 @@
 # CHANGELOG
 
+## 2.0.0 – (UNRELEASED)
+
+* **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

data/Gemfile.lock

@@ -0,0 +1,70 @@
+PATH
+  remote: .
+  specs:
+    acts_as_archival (2.0.0)
+      activerecord (>= 5.0)
+
+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)
+      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)
+    database_cleaner (1.8.4)
+    i18n (1.8.10)
+      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)
+    rake (13.0.1)
+    rexml (3.2.4)
+    rr (1.2.1)
+    rubocop (0.82.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    ruby-progressbar (1.10.1)
+    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)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  acts_as_archival!
+  appraisal
+  assertions-eb
+  database_cleaner
+  rake
+  rr
+  rubocop (~> 0.82.0)
+  sqlite3
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -114,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

data/acts_as_archival.gemspec

@@ -29,30 +29,32 @@ Gem::Specification.new do |gem|
   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.add_dependency "activerecord", ">= 4.1"
+  gem.add_dependency "activerecord", ">= 5.0"
 
   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.47.1"
+  gem.add_development_dependency "rubocop", "~> 0.82.0"
   gem.add_development_dependency "sqlite3"
 
-  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_5.1.gemfile → rails_6.0.gemfile}

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

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

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
-gem "sqlite3", "~> 1.3.13"
+gem "rails", "~> 6.1"
 
 gemspec path: "../"

data/lib/acts_as_archival/version.rb

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

data/lib/expected_behavior/acts_as_archival.rb

@@ -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)
@@ -104,14 +100,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 +112,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?

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,13 +20,6 @@ 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
-      # rubocop:enable Style/PredicateName
-
     end
 
     module ARRelationMethods

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_archival
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Joel Meador
@@ -18,10 +18,10 @@ authors:
 - Anton Rieder
 - Josh Menden
 - Sergey Gnuskov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -113,14 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: 0.82.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: 0.82.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -147,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
@@ -165,14 +165,14 @@ files:
 - Appraisals
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - acts_as_archival.gemspec
-- 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
+- gemfiles/rails_6.1.gemfile
 - init.rb
 - lib/acts_as_archival.rb
 - lib/acts_as_archival/version.rb
@@ -217,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
@@ -225,15 +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: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Atomic archiving/unarchiving for ActiveRecord-based apps
 test_files:

data/gemfiles/rails_5.0.gemfile

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