mongoid_paranoia 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f5e32d59286713e858a9dceb94d5f4fb41adeb83
-  data.tar.gz: bb428d1861efb3f46e00934b27f337b9ea1a5c65
+SHA256:
+  metadata.gz: 43d1da1cdc376721364043d5031170e7958fffcb759f9c0e64990a51ba0f5480
+  data.tar.gz: b5d1105826ee2edfa11a1b1432230200986ddb8d55b844dc80487c27ccb7cc48
 SHA512:
-  metadata.gz: c692991d080ea171430e3114f53c4dea77ebcb1dd0c5cbf74543ffb7433610541070c5da097482608277ac4b75bea095a9c4f9c510b29b0fb46085fae2fff43b
-  data.tar.gz: 21ccd86425e06c85938fad3121f01ae457b5e1b2061606a2bff1cdc894432bbbe3de728381b87cc5e099403c0511bd2e533347075e713bca972c094c1c41d2a6
+  metadata.gz: 306b10fc581eb21195661f6303bf76316854c1cfb5be09c33443b51b4fa865851d4b4c819b7402d7e269684358f62773adbaca4003c7c0b87ef856a9ddcb608e
+  data.tar.gz: 1466019a022ce6a6a419d49794ba6c9a00121183dacbe982519174e2b6cf155261e44245bff87711e6333f42cc0a86352dbe4f4ef180f86a3cd8717073c54b6b

data/README.md

@@ -1,4 +1,5 @@
-# Paranoid Documents for Mongoid [![Build Status](https://travis-ci.org/simi/mongoid_paranoia.png?branch=master)](https://travis-ci.org/simi/mongoid_paranoia)[![Gitter chat](https://badges.gitter.im/simi/mongoid_paranoia.png)](https://gitter.im/simi/mongoid_paranoia)
+# Paranoid Documents for Mongoid
+[![Build Status](https://travis-ci.org/simi/mongoid_paranoia.svg?branch=master)](https://travis-ci.org/simi/mongoid_paranoia) [![Gem Version](https://img.shields.io/gem/v/mongoid_paranoia.svg)](https://rubygems.org/gems/mongoid_paranoia) [![Gitter chat](https://badges.gitter.im/simi/mongoid_paranoia.svg)](https://gitter.im/simi/mongoid_paranoia)
 
 `Mongoid::Paranoia` enables a "soft delete" of Mongoid documents. Instead of being removed from the database, paranoid docs are flagged with a `deleted_at` timestamp and are ignored from queries by default.
 

data/lib/mongoid/paranoia.rb

@@ -97,7 +97,7 @@ module Mongoid
     alias orig_remove :remove
 
     def remove(_ = {})
-      cascade!
+      return false unless catch(:abort) { apply_delete_dependencies! }
       time = self.deleted_at = Time.now
       _paranoia_update('$set' => { paranoid_field => time })
       @destroyed = true
@@ -160,8 +160,8 @@ module Mongoid
     end
 
     def restore_relations
-      self.relations.each_pair do |name, metadata|
-        next unless metadata[:dependent] == :destroy
+      self.relations.each_pair do |name, association|
+        next unless association.dependent == :destroy
         relation = self.send(name)
         if relation.present? && relation.paranoid?
           Array.wrap(relation).each do |doc|

data/lib/mongoid/paranoia/monkey_patches.rb

@@ -17,30 +17,28 @@ end
 Mongoid::Document.send(:include, Mongoid::Paranoia::Document)
 
 module Mongoid
-  module Relations
-    module Builders
-      module NestedAttributes
-        class Many < NestedBuilder
-          # Destroy the child document, needs to do some checking for embedded
-          # relations and delay the destroy in case parent validation fails.
-          #
-          # @api private
-          #
-          # @example Destroy the child.
-          #   builder.destroy(parent, relation, doc)
-          #
-          # @param [ Document ] parent The parent document.
-          # @param [ Proxy ] relation The relation proxy.
-          # @param [ Document ] doc The doc to destroy.
-          #
-          # @since 3.0.10
-          def destroy(parent, relation, doc)
-            doc.flagged_for_destroy = true
-            if !doc.embedded? || parent.new_record? || doc.paranoid?
-              destroy_document(relation, doc)
-            else
-              parent.flagged_destroys.push(->{ destroy_document(relation, doc) })
-            end
+  module Association
+    module Nested
+      class Many
+        # Destroy the child document, needs to do some checking for embedded
+        # relations and delay the destroy in case parent validation fails.
+        #
+        # @api private
+        #
+        # @example Destroy the child.
+        #   builder.destroy(parent, relation, doc)
+        #
+        # @param [ Document ] parent The parent document.
+        # @param [ Proxy ] relation The relation proxy.
+        # @param [ Document ] doc The doc to destroy.
+        #
+        # @since 3.0.10
+        def destroy(parent, relation, doc)
+          doc.flagged_for_destroy = true
+          if !doc.embedded? || parent.new_record? || doc.paranoid?
+            destroy_document(relation, doc)
+          else
+            parent.flagged_destroys.push(->{ destroy_document(relation, doc) })
           end
         end
       end
@@ -49,41 +47,41 @@ module Mongoid
 end
 
 module Mongoid
-  module Relations
+  module Association
     module Embedded
-      # This class handles the behaviour for a document that embeds many other
-      # documents within in it as an array.
-      class Many < Relations::Many
-        # Delete the supplied document from the target. This method is proxied
-        # in order to reindex the array after the operation occurs.
-        #
-        # @example Delete the document from the relation.
-        #   person.addresses.delete(address)
-        #
-        # @param [ Document ] document The document to be deleted.
-        #
-        # @return [ Document, nil ] The deleted document or nil if nothing deleted.
-        #
-        # @since 2.0.0.rc.1
-        def delete(document)
-          execute_callback :before_remove, document
-          doc = target.delete_one(document)
-          if doc && !_binding?
-            _unscoped.delete_one(doc) unless doc.paranoid?
-            if _assigning?
-              if doc.paranoid?
-                doc.destroy(suppress: true)
+      class EmbedsMany
+        class Proxy < Association::Many
+          # Delete the supplied document from the target. This method is proxied
+          # in order to reindex the array after the operation occurs.
+          #
+          # @example Delete the document from the relation.
+          #   person.addresses.delete(address)
+          #
+          # @param [ Document ] document The document to be deleted.
+          #
+          # @return [ Document, nil ] The deleted document or nil if nothing deleted.
+          #
+          # @since 2.0.0.rc.1
+          def delete(document)
+            execute_callback :before_remove, document
+            doc = _target.delete_one(document)
+            if doc && !_binding?
+              _unscoped.delete_one(doc) unless doc.paranoid?
+              if _assigning?
+                if doc.paranoid?
+                  doc.destroy(suppress: true)
+                else
+                  _base.add_atomic_pull(doc)
+                end
               else
-                base.add_atomic_pull(doc)
+                doc.delete(suppress: true)
+                unbind_one(doc)
               end
-            else
-              doc.delete(suppress: true)
-              unbind_one(doc)
             end
+            reindex
+            execute_callback :after_remove, document
+            doc
           end
-          reindex
-          execute_callback :after_remove, document
-          doc
         end
       end
     end
@@ -91,22 +89,24 @@ module Mongoid
 end
 
 module Mongoid
-  module Relations
+  module Association
     module Embedded
-      class Many < Relations::Many
-        # For use only with Mongoid::Paranoia - will be removed in 4.0.
-        #
-        # @example Get the deleted documents from the relation.
-        #   person.paranoid_phones.deleted
-        #
-        # @return [ Criteria ] The deleted documents.
-        #
-        # @since 3.0.10
-        def deleted
-          unscoped.deleted
+      class EmbedsMany
+        class Proxy < Association::Many
+          # For use only with Mongoid::Paranoia - will be removed in 4.0.
+          #
+          # @example Get the deleted documents from the relation.
+          #   person.paranoid_phones.deleted
+          #
+          # @return [ Criteria ] The deleted documents.
+          #
+          # @since 3.0.10
+          def deleted
+            unscoped.deleted
+          end
+          # This class handles the behaviour for a document that embeds many other
+          # documents within in it as an array.
         end
-        # This class handles the behaviour for a document that embeds many other
-        # documents within in it as an array.
       end
     end
   end

data/lib/mongoid/paranoia/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Paranoia
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/spec/app/models/paranoid_phone.rb

@@ -20,6 +20,6 @@ class ParanoidPhone
   end
 
   def halt_me
-    person.age == 42 ? false : true
+    throw :abort if person.age == 42
   end
 end

data/spec/app/models/paranoid_post.rb

@@ -12,8 +12,8 @@ class ParanoidPost
   belongs_to :person
 
   has_and_belongs_to_many :tags
-  has_many :authors, dependent: :delete, inverse_of: :post
-  has_many :titles, dependent: :restrict
+  has_many :authors, dependent: :delete_all, inverse_of: :post
+  has_many :titles, dependent: :restrict_with_error
 
   scope :recent, -> {where(created_at: { "$lt" => Time.now, "$gt" => 30.days.ago })}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_paranoia
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Durran Jordan
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '7.0'
 description: There may be times when you don't want documents to actually get deleted
   from the database, but "flagged" as deleted. Mongoid provides a Paranoia module
   to give you just that.
@@ -82,27 +82,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Paranoid documents
 test_files:
 - perf/scope.rb
-- spec/mongoid/nested_attributes_spec.rb
-- spec/mongoid/scoping_spec.rb
-- spec/mongoid/configuration_spec.rb
+- spec/spec_helper.rb
 - spec/mongoid/paranoia_spec.rb
+- spec/mongoid/configuration_spec.rb
 - spec/mongoid/document_spec.rb
+- spec/mongoid/nested_attributes_spec.rb
 - spec/mongoid/validatable/uniqueness_spec.rb
-- spec/app/models/paranoid_phone.rb
-- spec/app/models/paranoid_post.rb
-- spec/app/models/tag.rb
-- spec/app/models/title.rb
+- spec/mongoid/scoping_spec.rb
+- spec/app/models/author.rb
+- spec/app/models/relations.rb
+- spec/app/models/phone.rb
 - spec/app/models/person.rb
-- spec/app/models/address.rb
 - spec/app/models/appointment.rb
+- spec/app/models/title.rb
 - spec/app/models/fish.rb
-- spec/app/models/relations.rb
-- spec/app/models/author.rb
-- spec/app/models/phone.rb
-- spec/spec_helper.rb
+- spec/app/models/address.rb
+- spec/app/models/paranoid_phone.rb
+- spec/app/models/paranoid_post.rb
+- spec/app/models/tag.rb