acts_as_paranoid 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0a0cec714f9701fb054580a39b677e73a3cfd3fa1909afd29dfedbbfdcb82d0
-  data.tar.gz: bef6e1c18c141b3035d5a4b3c33cad22a398d06250f1f09730ae39662e48a0ca
+  metadata.gz: 6f1ac92694d6049922653950c656bbe2f9f8959045c4fb62ba212402c280f1a4
+  data.tar.gz: fae3cf0d15387eabc253bcaedf768f4920d49394a64eefe451e5a9adc594708d
 SHA512:
-  metadata.gz: 804904753df983b7e366d4a6af8f4c80b24cda018a2cd2534721f7d943cc23556a9a1a9c77a7f37de335c60a3fde99639036315f235b303a60fdefc871e693b9
-  data.tar.gz: 40e9a9229af5706aa62e319e49c74b60b2d89e8880d46f6106ec51ef44e1e4811715b514b5e691500abc65805dd521c6741130f8eba0b892d2738cfe8efca23a
+  metadata.gz: fe97872c256e562f77e719d7ff81f35826ed961ed4b7868950fdf04f743420012ff10d040a8b2776579733d0fc1746cafd34419fe606acdda35a41fd9917e7cf
+  data.tar.gz: 05c347bdd2a2f54160d8aca242a9601e328249111a01f7318fa09dfc64252bdf30dc67e875b5e928a7bada96337ad98f9ea2d2f7c77ae7d364ff6e2ad9098c74

data/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 Notable changes to this project will be documented in this file.
 
+## 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])
+
 ## 0.8.0
 
 * Do not set `paranoid_value` when destroying fully ([#238], by [Aymeric Le Dorze][aymeric-ledorze])
@@ -134,6 +154,8 @@ Notable changes to this project will be documented in this file.
 
 <!-- issues & pull requests -->
 
+[#277]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/277
+[#268]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/268
 [#262]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/262
 [#261]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/261
 [#245]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/245

data/CONTRIBUTING.md

@@ -29,7 +29,7 @@ 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.**
 
-- Make sure `rake test` runs without reporting any failures.
+- 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.
 - Create a separate branch for your feature based off of latest master.
@@ -38,6 +38,18 @@ help out.**
 - 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.
 
+### Testing your changes
+
+You can run the test suite with the latest version of all dependencies by running the following:
+
+- Run `bundle install` if you haven't done so already, or `bundle update` to update the dependencies
+- Run `bundle exec rake` to run the tests
+
+To run the tests suite for a particular version of ActiveRecord use
+[appraisal](https://github.com/thoughtbot/appraisal). For example, to run the
+specs with ActiveRecord 6.1, run `appraisal active_record_61 rake`. See appraisal's
+documentation for details.
+
 ### The review process
 
 - We will try to review your pull request as soon as possible but we can make no

data/README.md

@@ -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 2.7+ 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.6 or earlier,
+please require an older version of the `acts_as_paranoid` gem.
 
 ### Known issues
 

data/lib/acts_as_paranoid/association_reflection.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module ActsAsParanoid
+  # Override for ActiveRecord::Reflection::AssociationReflection
+  #
+  # This makes automatic finding of inverse associations work where the
+  # inverse is a belongs_to association with the :with_deleted option set.
+  #
+  # Specifying :with_deleted for the belongs_to association would stop the
+  # inverse from being calculated because it sets scope where there was none,
+  # and normally an association having a scope means ActiveRecord will not
+  # automatically find the inverse association.
+  #
+  # This override adds an exception to that rule only for the case where the
+  # scope was added just to support the :with_deleted option.
+  module AssociationReflection
+    if ActiveRecord::VERSION::MAJOR < 7
+      def can_find_inverse_of_automatically?(reflection)
+        options = reflection.options
+
+        if reflection.macro == :belongs_to && options[:with_deleted]
+          return false if options[:inverse_of] == false
+          return false if options[:foreign_key]
+
+          !options.fetch(:original_scope)
+        else
+          super
+        end
+      end
+    else
+      def scope_allows_automatic_inverse_of?(reflection, inverse_reflection)
+        if reflection.scope
+          options = reflection.options
+          return true if options[:with_deleted] && !options.fetch(:original_scope)
+        end
+
+        super
+      end
+    end
+  end
+end

data/lib/acts_as_paranoid/associations.rb

@@ -19,32 +19,45 @@ module ActsAsParanoid
 
         with_deleted = options.delete(:with_deleted)
         if with_deleted
-          if scope
-            old_scope = scope
-            scope = proc do |*args|
-              if old_scope.arity == 0
-                instance_exec(&old_scope).with_deleted
-              else
-                old_scope.call(*args).with_deleted
-              end
-            end
-          else
-            scope = proc do
-              if respond_to? :with_deleted
-                self.with_deleted
-              else
-                all
-              end
-            end
-          end
+          original_scope = scope
+          scope = make_scope_with_deleted(scope)
         end
 
         result = belongs_to_without_deleted(target, scope, **options)
 
-        result.values.last.options[:with_deleted] = with_deleted if with_deleted
+        if with_deleted
+          options = result.values.last.options
+          options[:with_deleted] = with_deleted
+          options[:original_scope] = original_scope
+        end
 
         result
       end
+
+      private
+
+      def make_scope_with_deleted(scope)
+        if scope
+          old_scope = scope
+          scope = proc do |*args|
+            if old_scope.arity == 0
+              instance_exec(&old_scope).with_deleted
+            else
+              old_scope.call(*args).with_deleted
+            end
+          end
+        else
+          scope = proc do
+            if respond_to? :with_deleted
+              with_deleted
+            else
+              all
+            end
+          end
+        end
+
+        scope
+      end
     end
   end
 end

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
 

data/lib/acts_as_paranoid/version.rb

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

data/lib/acts_as_paranoid.rb

@@ -5,6 +5,7 @@ require "acts_as_paranoid/core"
 require "acts_as_paranoid/associations"
 require "acts_as_paranoid/validations"
 require "acts_as_paranoid/relation"
+require "acts_as_paranoid/association_reflection"
 
 module ActsAsParanoid
   def paranoid?
@@ -29,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
 
@@ -63,3 +62,6 @@ ActiveRecord::Relation.include ActsAsParanoid::Relation
 
 # Push the recover callback onto the activerecord callback list
 ActiveRecord::Callbacks::CALLBACKS.push(:before_recover, :after_recover)
+
+ActiveRecord::Reflection::AssociationReflection
+  .prepend ActsAsParanoid::AssociationReflection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Zachary Scott
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,40 +18,54 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   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: '7.2'
 - !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: '7.2'
   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: '7.2'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -142,42 +156,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: '1.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: '1.52'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.32.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.32.2
+- !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.17.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
@@ -190,6 +246,7 @@ files:
 - LICENSE
 - README.md
 - lib/acts_as_paranoid.rb
+- lib/acts_as_paranoid/association_reflection.rb
 - lib/acts_as_paranoid/associations.rb
 - lib/acts_as_paranoid/core.rb
 - lib/acts_as_paranoid/relation.rb
@@ -208,14 +265,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Active Record plugin which allows you to hide and restore records without