acts_as_paranoid 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a0dd97ab43e1d7a8a72327a1abf5df84ae9d3ff36c38caed38a808aacef6b01
-  data.tar.gz: a628f74884aff858620127b163b1998b5d790a0cfcbff4ad56e9851f962a3caf
+  metadata.gz: b0a0cec714f9701fb054580a39b677e73a3cfd3fa1909afd29dfedbbfdcb82d0
+  data.tar.gz: bef6e1c18c141b3035d5a4b3c33cad22a398d06250f1f09730ae39662e48a0ca
 SHA512:
-  metadata.gz: 1488e86f1437d179e8aef1bc8b2e6da851a29d44ef9a93d7d2a60685bae36da50d69ec74bb19f6c4751257ddce5af556994c1d38beaef037b5753c063fdf409a
-  data.tar.gz: 630cec48256d5baf5e859f138fcc74b0a3718f6283ee08d47b36fa96cca9feba16bd6a2e1e4a3eeb3ecc210238d5ac8eb4ea31374ca8b0cfa07b57bdb9392368
+  metadata.gz: 804904753df983b7e366d4a6af8f4c80b24cda018a2cd2534721f7d943cc23556a9a1a9c77a7f37de335c60a3fde99639036315f235b303a60fdefc871e693b9
+  data.tar.gz: 40e9a9229af5706aa62e319e49c74b60b2d89e8880d46f6106ec51ef44e1e4811715b514b5e691500abc65805dd521c6741130f8eba0b892d2738cfe8efca23a

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 Notable changes to this project will be documented in this file.
 
+## 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 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])
+* Remove test files from the gem ([#261] by [Matijs van Zuijlen][mvz])
+* Add support for Rails 7 ([#262] by [Vederis Leunardus][cloudsbird])
+
 ## 0.7.3
 
 ## Improvements
@@ -104,10 +115,12 @@ Notable changes to this project will be documented in this file.
 [AlexWheeler]: https://github.com/AlexWheeler
 [RomainAlexandre]: https://github.com/RomainAlexandre
 [avinoth]: https://github.com/avinoth
+[cloudsbird]: https://github.com/cloudsbird
 [aymeric-ledorze]: https://github.com/aymeric-ledorze
 [danielricecodes]: https://github.com/danielricecodes
 [jbryant92]: https://github.com/jbryant92
 [kevinmcalear]: https://github.com/kevinmcalear
+[leomayleomay]: https://github.com/leomayleomay
 [marycodes2]: https://github.com/marycodes2
 [mvz]: https://github.com/mvz
 [nedcampion]: https://github.com/nedcampion
@@ -121,6 +134,15 @@ Notable changes to this project will be documented in this file.
 
 <!-- issues & pull requests -->
 
+[#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
+[#244]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/244
+[#243]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/243
+[#241]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/241
+[#240]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/240
+[#239]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/239
+[#238]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/238
 [#227]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/227
 [#222]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/222
 [#220]: https://github.com/ActsAsParanoid/acts_as_paranoid/pull/220

data/CONTRIBUTING.md

@@ -5,10 +5,10 @@ help the process of handling issues and pull requests go smoothly.
 
 ## Issues
 
-When creating an issue, please try to provide as much information as possible.
-Also, please follow the guidelines below to make it easier for us to figure out
-what's going on. If you miss any of these points we will probably ask you to
-improve the ticket.
+When creating an issue, please provide as much information as possible, and
+follow the guidelines below to make it easier for us to figure out what's going
+on. If you miss any of these points we will probably ask you to improve the
+ticket.
 
 - Include a clear title describing the problem
 - Describe what you are trying to achieve
@@ -25,17 +25,16 @@ 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.
 
-If you want to send pull requests or patches, try to follow the instructions
-below. **If you get stuck, please make a pull request anyway and we'll try to
+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.
 - Add tests for your feature. Otherwise, we can't see if it works or if we
   break it later.
-- Make sure latest master merges cleanly with your branch. Things might
-  have moved around since you forked.
-- Try not to include changes that are irrelevant to your feature in the
-  same commit.
+- Create a separate branch for your feature based off of latest master.
+- 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.
 

data/README.md

@@ -9,9 +9,9 @@ recoverable later.
 
 ## Support
 
-**This branch targets Rails 5.2+ and Ruby 2.4+ only**
+**This branch targets Rails 5.2+ and Ruby 2.5+ only**
 
-If you're working with Rails 5.1 and earlier, or with Ruby 2.3 or earlier,
+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.
 
@@ -27,7 +27,7 @@ please switch to the corresponding branch or require an older version of the
 #### Install gem:
 
 ```ruby
-gem 'acts_as_paranoid', '~> 0.7.0'
+gem 'acts_as_paranoid'
 ```
 
 ```shell

data/lib/acts_as_paranoid/core.rb

@@ -89,12 +89,7 @@ module ActsAsParanoid
       end
 
       def recovery_value
-        if paranoid_configuration.key? :recovery_value
-          ActiveSupport::Deprecation.warn \
-            "The recovery_value setting is deprecated and will be removed in" \
-            " ActsAsParanoid 0.8.0"
-          paranoid_configuration[:recovery_value]
-        elsif boolean_type_not_nullable?
+        if boolean_type_not_nullable?
           false
         else
           nil
@@ -121,9 +116,13 @@ 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)
-        # Fix problems with unscope group chain
-        scope = scope.unscoped if scope.to_sql.include? paranoid_default_scope.to_sql
+
+        paranoid_where_clause =
+          ActiveRecord::Relation::WhereClause.new([paranoid_default_scope])
+
+        scope.where_clause = all.where_clause - paranoid_where_clause
 
         scope
       end
@@ -157,7 +156,6 @@ module ActsAsParanoid
             decrement_counters_on_associations
           end
 
-          stale_paranoid_value
           @destroyed = true
           freeze
         end
@@ -165,6 +163,12 @@ module ActsAsParanoid
     end
 
     def destroy!
+      destroy || raise(
+        ActiveRecord::RecordNotDestroyed.new("Failed to destroy the record", self)
+      )
+    end
+
+    def destroy
       if !deleted?
         with_transaction_returning_status do
           run_callbacks :destroy do
@@ -187,8 +191,6 @@ module ActsAsParanoid
       end
     end
 
-    alias destroy destroy!
-
     def recover(options = {})
       return if !deleted?
 
@@ -220,23 +222,6 @@ module ActsAsParanoid
       recover(options)
     end
 
-    def recover_dependent_associations(deleted_value, options)
-      self.class.dependent_associations.each do |reflection|
-        recover_dependent_association(reflection, deleted_value, options)
-      end
-    end
-
-    def destroy_dependent_associations!
-      self.class.dependent_associations.each do |reflection|
-        assoc = association(reflection.name)
-        next unless (klass = assoc.klass).paranoid?
-
-        klass
-          .only_deleted.merge(get_association_scope(assoc))
-          .each(&:destroy!)
-      end
-    end
-
     def deleted?
       return true if @destroyed
 
@@ -259,6 +244,23 @@ module ActsAsParanoid
 
     private
 
+    def recover_dependent_associations(deleted_value, options)
+      self.class.dependent_associations.each do |reflection|
+        recover_dependent_association(reflection, deleted_value, options)
+      end
+    end
+
+    def destroy_dependent_associations!
+      self.class.dependent_associations.each do |reflection|
+        assoc = association(reflection.name)
+        next unless (klass = assoc.klass).paranoid?
+
+        klass
+          .only_deleted.merge(get_association_scope(assoc))
+          .each(&:destroy!)
+      end
+    end
+
     def recover_dependent_association(reflection, deleted_value, options)
       assoc = association(reflection.name)
       return unless (klass = assoc.klass).paranoid?

data/lib/acts_as_paranoid/relation.rb

@@ -29,13 +29,6 @@ module ActsAsParanoid
           end
         end
 
-        def destroy!(id_or_array)
-          destroy_fully! id_or_array
-        end
-
-        deprecate :destroy!,
-                  deprecator: ActiveSupport::Deprecation.new("0.8.0", "ActsAsParanoid")
-
         def destroy_fully!(id_or_array)
           where(primary_key => id_or_array).orig_delete_all
         end

data/lib/acts_as_paranoid/version.rb

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

data/lib/acts_as_paranoid.rb

@@ -36,8 +36,9 @@ module ActsAsParanoid
     paranoid_configuration.merge!(options) # user options
 
     unless %w[time boolean string].include? paranoid_configuration[:column_type]
-      raise ArgumentError, "'time', 'boolean' or 'string' expected" \
-        " for :column_type option, got #{paranoid_configuration[:column_type]}"
+      raise ArgumentError,
+            "'time', 'boolean' or 'string' expected for :column_type option," \
+            " got #{paranoid_configuration[:column_type]}"
     end
 
     return if paranoid?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Zachary Scott
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-02 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,131 +51,133 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: minitest-focus
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rake-manifest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.18.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
-    - - "<"
+        version: 0.17.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.21.2
 description: Check the home page for more in-depth information.
 email:
 - e@zzak.io
@@ -193,20 +195,11 @@ files:
 - lib/acts_as_paranoid/relation.rb
 - lib/acts_as_paranoid/validations.rb
 - lib/acts_as_paranoid/version.rb
-- test/test_associations.rb
-- test/test_core.rb
-- test/test_default_scopes.rb
-- test/test_dependent_recovery.rb
-- test/test_deprecated_behavior.rb
-- test/test_helper.rb
-- test/test_inheritance.rb
-- test/test_relations.rb
-- test/test_table_namespace.rb
-- test/test_validations.rb
 homepage: https://github.com/ActsAsParanoid/acts_as_paranoid
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -215,26 +208,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Active Record plugin which allows you to hide and restore records without
   actually deleting them.
-test_files:
-- test/test_associations.rb
-- test/test_core.rb
-- test/test_default_scopes.rb
-- test/test_dependent_recovery.rb
-- test/test_deprecated_behavior.rb
-- test/test_helper.rb
-- test/test_inheritance.rb
-- test/test_relations.rb
-- test/test_table_namespace.rb
-- test/test_validations.rb
+test_files: []