acts_as_paranoid 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0a0cec714f9701fb054580a39b677e73a3cfd3fa1909afd29dfedbbfdcb82d0
-  data.tar.gz: bef6e1c18c141b3035d5a4b3c33cad22a398d06250f1f09730ae39662e48a0ca
+  metadata.gz: be004bb0de25cdda73697fa22c07d0a64e1d98c071506d4b0a608a3d3231e103
+  data.tar.gz: 9334fe5730d07f94d087f3e6f1d4803126224a4106cc378d9f6263fc15295d93
 SHA512:
-  metadata.gz: 804904753df983b7e366d4a6af8f4c80b24cda018a2cd2534721f7d943cc23556a9a1a9c77a7f37de335c60a3fde99639036315f235b303a60fdefc871e693b9
-  data.tar.gz: 40e9a9229af5706aa62e319e49c74b60b2d89e8880d46f6106ec51ef44e1e4811715b514b5e691500abc65805dd521c6741130f8eba0b892d2738cfe8efca23a
+  metadata.gz: c3e7ebd79d467118c9c91374088f3fe3a203ae6ca914fa036646fb77e7f4c1c9ba4e1c653dc2311ac1bd53bbf2517cb1a00ee06b32e0f09d6937bfb1ea8f6247
+  data.tar.gz: 99c7d3d41d9a94b26d2fed6ce5b01ea2fddfbc09bd958d9ca990a7b2d92c466a876e23011db5f7fda02b4efb9cd417b9a8dfe62a432757e788e7a89c898dbcd0

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Notable changes to this project will be documented in this file.
 
+## 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 +139,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/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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActsAsParanoid
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 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?
@@ -63,3 +64,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.8.1
 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: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,6 +52,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
+- !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,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +204,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
@@ -215,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Active Record plugin which allows you to hide and restore records without