* Support only Mongoid 7.3 and later. (#68)

* In conformity with Mongoid 7.3+ behavior, dependencies are not destroyed when calling delete/delete!

Co-authored-by: shields <shields@tablecheck.com>

Author: johnnyshields

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.5.0 (2021/07/24)
+
+* Support only Mongoid 7.3 and later.
+* In conformity with Mongoid 7.3+ behavior, dependencies are not destroyed when calling delete/delete!
+
 ## 0.4.1 (2021/07/24)
 
 * Do not allow Mongoid 7.3 and later, due to breaking changes

Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 gemspec name: 'mongoid_paranoia'
 
-gem 'mongoid', '~> 7.0'
+gem 'mongoid', '~> 7.3'
 
 group :test do
   gem 'rspec', '~> 3.8'

lib/mongoid/paranoia.rb

@@ -50,23 +50,6 @@ def configure
       define_model_callbacks :remove
     end
 
-    # Delete the paranoid +Document+ from the database completely. This will
-    # run the destroy callbacks.
-    #
-    # @example Hard destroy the document.
-    #   document.destroy!
-    #
-    # @return [ true, false ] If the operation succeeded.
-    #
-    # @since 1.0.0
-    def destroy!
-      run_callbacks(:destroy) do
-        run_callbacks(:remove) do
-          delete!
-        end
-      end
-    end
-
     # Override the persisted method to allow for the paranoia gem.
     # If a paranoid record is selected, then we only want to check
     # if it's a new record, not if it is "destroyed"
@@ -92,34 +75,41 @@ def persisted?
     # @return [ true ] True.
     #
     # @since 1.0.0
-    alias orig_remove :remove
+    alias :orig_delete :delete
 
     def remove(_ = {})
-      return false unless catch(:abort) do
-        if respond_to?(:apply_destroy_dependencies!)
-          apply_destroy_dependencies!
-        else
-          apply_delete_dependencies!
-        end
-      end
       time = self.deleted_at = Time.now
       _paranoia_update('$set' => { paranoid_field => time })
       @destroyed = true
       true
     end
 
-    alias delete :remove
+    alias :delete :remove
+    alias :delete! :orig_delete
 
-    # Delete the paranoid +Document+ from the database completely.
+    # Delete the paranoid +Document+ from the database completely. This will
+    # run the destroy and remove callbacks.
     #
-    # @example Hard delete the document.
-    #   document.delete!
+    # @example Hard destroy the document.
+    #   document.destroy!
     #
     # @return [ true, false ] If the operation succeeded.
     #
     # @since 1.0.0
-    def delete!
-      orig_remove
+    def destroy!(options = {})
+      raise Errors::ReadonlyDocument.new(self.class) if readonly?
+      self.flagged_for_destroy = true
+      result = run_callbacks(:destroy) do
+        run_callbacks(:remove) do
+          if catch(:abort) { apply_destroy_dependencies! }
+            delete!(options || {})
+          else
+            false
+          end
+        end
+      end
+      self.flagged_for_destroy = false
+      result
     end
 
     # Determines if this document is destroyed.

lib/mongoid/paranoia/version.rb

@@ -2,6 +2,6 @@
 
 module Mongoid
   module Paranoia
-    VERSION = '0.4.1'
+    VERSION = '0.5.0'
   end
 end

mongoid_paranoia.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = Dir.glob('{perf,spec}/**/*')
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'mongoid', '>= 7.0', '< 7.3'
+  gem.add_dependency 'mongoid', '~> 7.3'
 
   gem.add_development_dependency 'rubocop', '>= 1.8.1'
 end

spec/mongoid/paranoia_spec.rb

@@ -531,10 +531,10 @@ class ParanoidConfiguredReset
         post.delete!
       end
 
-      it "cascades the dependent option" do
+      it "does not cascade the dependent option" do
         expect {
           author.reload
-        }.to raise_error(Mongoid::Errors::DocumentNotFound)
+        }.to_not raise_error(Mongoid::Errors::DocumentNotFound)
       end
     end
   end
@@ -613,10 +613,10 @@ class ParanoidConfiguredReset
         post.delete
       end
 
-      it "cascades the dependent option" do
+      it "does not cascade the dependent option" do
         expect {
           author.reload
-        }.to raise_error(Mongoid::Errors::DocumentNotFound)
+        }.to_not raise_error(Mongoid::Errors::DocumentNotFound)
       end
     end
 
@@ -637,8 +637,8 @@ class ParanoidConfiguredReset
         end
       end
 
-      it "does not destroy the document" do
-        expect(post).not_to be_destroyed
+      it "ignores restrict and destroys the document" do
+        expect(post).to be_destroyed
       end
     end
   end