mongoid_paranoia 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a91dadeb276e443e5060c0365961ca55f0a64e52dc6d98ec9d1f8c27323e4c9
-  data.tar.gz: 71acb61e9ac0c78c37b9e70c9985bcfbbd778364b0e4394ae087dbfc3c260955
+  metadata.gz: ec456afdb66a1a23fdb5dc73db06b9dc6344932f8aa3c95b378ca60560aea474
+  data.tar.gz: b80b6cfaedfb9523b9dbfe791d586493eb4c9d3e65b7286d3cdc2010d8f9874e
 SHA512:
-  metadata.gz: 3c1516b87ec542acbd708b0d5aca3a372b2cdc16123df093223d2159eb8b4a8c2c13720b4bd8492ada399e58308a49e5ba1895273fb18bac2bd784978e4f282c
-  data.tar.gz: 71eb2a17add46c46f97f6b5fab35907765c6ba1e97ebc24016e0314feee8d0bf9ac0964e3e45910d260ea3b1abb4e9492ac4928181a6307772347f919f16a463
+  metadata.gz: 3aff3ad8f7f06f0a1498143baf6cf72d58c24b99b3a4f0bfb19fd314ec836625356291989293ddee2dc230d148dda65f84bc153660bd00566ba8bc727e21ee9f
+  data.tar.gz: 5322c2f12d84591a8e0bc3463faf1e82571f09c5877bc3a3f7bcfbf7c10c87e198bb8be2add2ab42c6e71341df77fdbe7dbe368ccc476d7e44c8f41839c283cb

data/lib/mongoid/paranoia.rb

@@ -50,23 +50,6 @@ module Mongoid
       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 @@ module Mongoid
     # @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.

data/lib/mongoid/paranoia/version.rb

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

data/spec/mongoid/paranoia_spec.rb

@@ -531,10 +531,10 @@ describe Mongoid::Paranoia do
         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 @@ describe Mongoid::Paranoia do
         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 @@ describe Mongoid::Paranoia do
         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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_paranoia
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Durran Jordan
@@ -15,20 +15,14 @@ dependencies:
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '7.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '7.3'
 - !ruby/object:Gem::Dependency