acts_as_paranoid 0.8.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be004bb0de25cdda73697fa22c07d0a64e1d98c071506d4b0a608a3d3231e103
-  data.tar.gz: 9334fe5730d07f94d087f3e6f1d4803126224a4106cc378d9f6263fc15295d93
+  metadata.gz: c63f41e55a1e68fd2cc5c1353501bb390d5a1bd99cb11da1be628f63c8149134
+  data.tar.gz: cd25ddabafff9d4897867af108ae741edee9d1dabf8ef363843c8d3bc7ec2e39
 SHA512:
-  metadata.gz: c3e7ebd79d467118c9c91374088f3fe3a203ae6ca914fa036646fb77e7f4c1c9ba4e1c653dc2311ac1bd53bbf2517cb1a00ee06b32e0f09d6937bfb1ea8f6247
-  data.tar.gz: 99c7d3d41d9a94b26d2fed6ce5b01ea2fddfbc09bd958d9ca990a7b2d92c466a876e23011db5f7fda02b4efb9cd417b9a8dfe62a432757e788e7a89c898dbcd0
+  metadata.gz: ad61b7c2cd715b521dbd042d0fcb0ff331ddf635fa100166028092a05c2ff40cfd4633a60076723ba55bf5bb5d2b23f905ebb56597586445831054f1cb389b61
+  data.tar.gz: d272b64f33ccc60ac3ecba65bac5c12174c0446ef0dcfffd43e24e63e67b9796b3b6dde3dd756f9d204a09a260aa491422370674c695f5cb2ab7c8774b0e0175

data/CHANGELOG.md

@@ -2,16 +2,75 @@
 
 Notable changes to this project will be documented in this file.
 
+## 0.10.3
+
+* Fix CI Badge ([#350] by [tagliala])
+* Support Rails 8.0 ([#354] by [mvz])
+
+[tagliala]: https://github.com/tagliala
+[#350]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/350
+[#354]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/354
+
+## 0.10.2
+
+* Support Rails 7.2 ([#341] by [kalashnikovisme])
+
+[kalashnikovisme]: https://github.com/kalashnikovisme
+
+[#341]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/341
+
+## 0.10.1
+
+* Add changelog_uri to gemspec ([#332] by [fynsta])
+* Improve contribution instructions ([#338] by [mvz])
+* Make with_deleted work with paranoid join records ([#339] by [mvz])
+
+[fynsta]: https://github.com/fynsta
+
+[#332]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/332
+[#338]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/338
+[#339]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/339
+
+## 0.10.0
+
+* Support Ruby 3.0 through 3.3, dropping support for 2.7 ([#322] by [mvz])
+* Use correct sqlite3 versions in tests ([#329] by [fatkodima])
+* Do not load `ActiveRecord` too early ([#330] by [fatkodima])
+
+[fatkodima]: https://github.com/fatkodima
+
+[#322]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/322
+[#329]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/329
+[#330]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/330
+
+## 0.9.0
+
+* Support JRuby 9.4 ([#299] by [Matijs van Zuijlen][mvz])
+* Add support for Ruby 3.2 ([#300] by [Matijs van Zuijlen][mvz])
+* Drop support for Ruby 2.6 ([#301] by [Matijs van Zuijlen][mvz])
+* Support Rails 7.1 ([#312] and [#317] by [Matijs van Zuijlen][mvz])
+* Drop support for Rails 5.2 and 6.0 ([#315] by [Matijs van Zuijlen][mvz])
+
+[#299]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/299
+[#300]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/300
+[#301]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/301
+[#312]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/312
+[#315]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/315
+[#317]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/317
+
 ## 0.8.1
 
 * Officially support Ruby 3.1 ([#268], by [Matijs van Zuijlen][mvz])
-* Fix association building for `belongs_to` with `:with_deleted` option ([#277], by [Matijs van Zuijlen][mvz])
+* Fix association building for `belongs_to` with `:with_deleted` option
+  ([#277], by [Matijs van Zuijlen][mvz])
 
 ## 0.8.0
 
 * Do not set `paranoid_value` when destroying fully ([#238], by [Aymeric Le Dorze][aymeric-ledorze])
-* Make helper methods for dependent associations private ([#239], by [Matijs van Zuijlen][mvz])
-* Raise ActiveRecord::RecordNotDestroyed if destroy returns false ([#240], by [Hao Liu][leomayleomay])
+* Make helper methods for dependent associations private
+  ([#239], by [Matijs van Zuijlen][mvz])
+* Raise ActiveRecord::RecordNotDestroyed if destroy returns false
+  ([#240], by [Hao Liu][leomayleomay])
 * Make unscoping by `with_deleted` less blunt ([#241], by [Matijs van Zuijlen][mvz])
 * Drop support for Ruby 2.4 and 2.5 ([#243] and [#245] by [Matijs van Zuijlen][mvz])
 * Remove deprecated methods ([#244] by [Matijs van Zuijlen][mvz])
@@ -20,7 +79,7 @@ Notable changes to this project will be documented in this file.
 
 ## 0.7.3
 
-## Improvements
+### Improvements
 
 * Fix deletion time scopes ([#212] by [Matijs van Zuijlen][mvz])
 * Reload `has_one` associations after dependent recovery ([#214],
@@ -34,7 +93,7 @@ Notable changes to this project will be documented in this file.
 * Deprecate the undocumented `:recovery_value` setting. Calculate the correct
   value instead. ([#220], by [Matijs van Zuijlen][mvz])
 
-## Developer experience
+### Developer experience
 
 * Log ActiveRecord activity to a visible log during tests ([#218],
   by [Matijs van Zuijlen][mvz])

data/CONTRIBUTING.md

@@ -1,7 +1,7 @@
 # Contributing to ActsAsParanoid
 
-We welcome all contributions to ActsAsParanoid. Below are some guidelines to
-help the process of handling issues and pull requests go smoothly.
+We welcome contributions to ActsAsParanoid. Please follow the guidelines below to help the
+process of handling issues and pull requests go smoothly.
 
 ## Issues
 
@@ -14,30 +14,35 @@ ticket.
 - Describe what you are trying to achieve
 - Describe what you did, preferably including relevant code
 - Describe what you expected to happen
-- Describe what happened instead, possibly including relevant output
+- Describe what happened instead. Include relevant output if possible
+- State the version of ActsAsParanoid you are using
 - Use [code blocks](https://github.github.com/gfm/#fenced-code-blocks) to
   format any code and output in your ticket to make it readable.
 
-## Pull requests
+## Pull Requests
 
 If you have an idea for a particular feature, it's probably best to create a
 GitHub issue for it before trying to implement it yourself. That way, we can
 discuss the feature and whether it makes sense to include in ActsAsParanoid itself
 before putting in the work to implement it.
 
-To send pull requests or patches, please follow the instructions below.
-**If you get stuck, please make a pull request anyway and we'll try to
-help out.**
+When sending a pull request, please follow **all of** the instructions below:
 
-- Make sure `bundle exec rake` runs without reporting any failures.
-- Add tests for your feature. Otherwise, we can't see if it works or if we
-  break it later.
+- Make sure `bundle exec rake` runs without reporting any failures. See
+  *Testing your changes* below for more details.
+- Add tests for your feature. Otherwise, we can't see if it works or if
+  we break it later.
 - Create a separate branch for your feature based off of latest master.
+- Write [good commit messages](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 - Do not include changes that are irrelevant to your feature in the same
   commit.
 - Keep an eye on the build results in GitHub Actions. If the build fails and it
   seems due to your changes, please update your pull request with a fix.
 
+If you're not sure how to test the problem, or what the best solution is, or
+get stuck on something else, please open an issue first so that we can discuss
+the best approach.
+
 ### Testing your changes
 
 You can run the test suite with the latest version of all dependencies by running the following:
@@ -62,9 +67,10 @@ documentation for details.
   that just fix a mistake in a previous commits, we will ask you to clean up
   the history.
   Again, [the git-rebase guide](https://git-rebase.io/) should help out.
-- At the end of the review process we may still choose not to merge your pull
-  request. For example, this could happen if we decide the proposed feature
+  Note that we will not squash-merge pull requests, since that results in a loss of history.
+- **At the end of the review process we may still choose not to merge your pull
+  request.** For example, this could happen if we decide the proposed feature
   should not be part of ActsAsParanoid, or if the technical implementation does not
-  match where we want to go with the architecture the project.
+  match where we want to go with the architecture of the project.
 - We will generally not merge any pull requests that make the build fail, unless
   it's very clearly not related to the changes in the pull request.

data/README.md

@@ -1,6 +1,6 @@
 # ActsAsParanoid
 
-[![Build Status](https://travis-ci.org/ActsAsParanoid/acts_as_paranoid.png?branch=master)](https://travis-ci.org/ActsAsParanoid/acts_as_paranoid)
+[![CI](https://github.com/ActsAsParanoid/acts_as_paranoid/actions/workflows/ruby.yml/badge.svg)](https://github.com/ActsAsParanoid/acts_as_paranoid/actions/workflows/ruby.yml)
 
 A Rails plugin to add soft delete.
 
@@ -9,11 +9,10 @@ recoverable later.
 
 ## Support
 
-**This branch targets Rails 5.2+ and Ruby 2.5+ only**
+**This version targets Rails 6.1+ and Ruby 3.0+ only**
 
-If you're working with Rails 5.1 and earlier, or with Ruby 2.4 or earlier,
-please switch to the corresponding branch or require an older version of the
-`acts_as_paranoid` gem.
+If you're working with Rails 6.0 and earlier, or with Ruby 2.7 or earlier,
+please require an older version of the `acts_as_paranoid` gem.
 
 ### Known issues
 
@@ -24,10 +23,10 @@ please switch to the corresponding branch or require an older version of the
 
 ## Usage
 
-#### Install gem:
+#### Install gem
 
 ```ruby
-gem 'acts_as_paranoid'
+gem "acts_as_paranoid", "~> 0.10.3"
 ```
 
 ```shell
@@ -246,7 +245,7 @@ p1.recover #=> fails validation!
 
 ### Status
 
-A paranoid object could be deleted or destroyed fully. 
+A paranoid object could be deleted or destroyed fully.
 
 You can check if the object is deleted with the `deleted?` helper
 

data/lib/acts_as_paranoid/associations.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module ActsAsParanoid
+  # This module is included in ActiveRecord::Base to provide paranoid associations.
   module Associations
     def self.included(base)
       base.extend ClassMethods

data/lib/acts_as_paranoid/core.rb

@@ -74,9 +74,11 @@ module ActsAsParanoid
         "#{table_name}.#{paranoid_column}"
       end
 
+      DESTROYING_ASSOCIATION_DEPENDENCY_TYPES = [:destroy, :delete_all].freeze
+
       def dependent_associations
         reflect_on_all_associations.select do |a|
-          [:destroy, :delete_all].include?(a.options[:dependent])
+          DESTROYING_ASSOCIATION_DEPENDENCY_TYPES.include?(a.options[:dependent])
         end
       end
 
@@ -116,13 +118,10 @@ module ActsAsParanoid
       def without_paranoid_default_scope
         scope = all
 
-        # unscope avoids applying the default scope when using this scope for associations
-        scope = scope.unscope(where: paranoid_column)
-
-        paranoid_where_clause =
-          ActiveRecord::Relation::WhereClause.new([paranoid_default_scope])
-
-        scope.where_clause = all.where_clause - paranoid_where_clause
+        unless scope.unscope_values.include?({ where: paranoid_column })
+          # unscope avoids applying the default scope when using this scope for associations
+          scope = scope.unscope(where: paranoid_column)
+        end
 
         scope
       end
@@ -310,7 +309,7 @@ module ActsAsParanoid
     end
 
     def each_counter_cached_association_reflection
-      _reflections.each do |_name, reflection|
+      _reflections.each_value do |reflection|
         yield reflection if reflection.belongs_to? && reflection.counter_cache_column
       end
     end

data/lib/acts_as_paranoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActsAsParanoid
-  VERSION = "0.8.1"
+  VERSION = "0.10.3"
 end

data/lib/acts_as_paranoid.rb

@@ -30,9 +30,7 @@ module ActsAsParanoid
       dependent_recovery_window: 2.minutes,
       double_tap_destroys_fully: true
     }
-    if options[:column_type] == "string"
-      paranoid_configuration.merge!(deleted_value: "deleted")
-    end
+    paranoid_configuration[:deleted_value] = "deleted" if options[:column_type] == "string"
 
     paranoid_configuration.merge!(options) # user options
 
@@ -53,17 +51,19 @@ module ActsAsParanoid
   end
 end
 
-# Extend ActiveRecord's functionality
-ActiveRecord::Base.extend ActsAsParanoid
+ActiveSupport.on_load(:active_record) do
+  # Extend ActiveRecord's functionality
+  extend ActsAsParanoid
 
-# Extend ActiveRecord::Base with paranoid associations
-ActiveRecord::Base.include ActsAsParanoid::Associations
+  # Extend ActiveRecord::Base with paranoid associations
+  include ActsAsParanoid::Associations
 
-# Override ActiveRecord::Relation's behavior
-ActiveRecord::Relation.include ActsAsParanoid::Relation
+  # Override ActiveRecord::Relation's behavior
+  ActiveRecord::Relation.include ActsAsParanoid::Relation
 
-# Push the recover callback onto the activerecord callback list
-ActiveRecord::Callbacks::CALLBACKS.push(:before_recover, :after_recover)
+  # Push the recover callback onto the activerecord callback list
+  ActiveRecord::Callbacks::CALLBACKS.push(:before_recover, :after_recover)
 
-ActiveRecord::Reflection::AssociationReflection
-  .prepend ActsAsParanoid::AssociationReflection
+  ActiveRecord::Reflection::AssociationReflection
+    .prepend ActsAsParanoid::AssociationReflection
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.10.3
 platform: ruby
 authors:
 - Zachary Scott
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2024-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,40 +18,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.14'
+- !ruby/object:Gem::Dependency
+  name: minitest-around
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: minitest-stub-const
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,42 +170,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.52'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.36.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.36.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.18'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
 description: Check the home page for more in-depth information.
 email:
 - e@zzak.io
@@ -214,6 +270,7 @@ homepage: https://github.com/ActsAsParanoid/acts_as_paranoid
 licenses:
 - MIT
 metadata:
+  changelog_uri: https://github.com/ActsAsParanoid/acts_as_paranoid/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -223,14 +280,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Active Record plugin which allows you to hide and restore records without