soft_deletion 0.5.1 → 0.5.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soft_deletion (0.5.1)
+    soft_deletion (0.5.2)
 
 GEM
   remote: https://rubygems.org/

data/Readme.md

@@ -38,6 +38,12 @@ Usage
     # soft delete many
     User.soft_delete_all!(1,2,3,4)
 
+TODO
+====
+ - nullify should use update_all on has_many on soft_delete (performance)
+ - has_many :through should delete join associations on soft_delete
+ - cascading soft_deletes should use the same timestamp for easy reverts
+
 Authors
 =======
 

data/lib/soft_deletion/core.rb

@@ -21,9 +21,9 @@ module SoftDeletion
 
     module ClassMethods
       def soft_delete_dependents
-        self.reflect_on_all_associations.
+        reflect_on_all_associations.
           select { |a| [:destroy, :delete_all, :nullify].include?(a.options[:dependent]) }.
-          map(&:name)
+          select { |a| a.klass.method_defined?(:soft_delete!) }.map(&:name)
       end
 
       def with_deleted

data/lib/soft_deletion/dependency.rb

@@ -8,18 +8,17 @@ module SoftDeletion
     end
 
     def soft_delete!
-      return unless can_soft_delete?
-
-      if nullify?
+      case association.options[:dependent]
+      when :nullify
         nullify_dependencies
+      when :delete_all
+        dependency.update_all(:deleted_at => Time.now)
       else
         dependencies.each(&:soft_delete!)
       end
     end
 
     def soft_undelete!(limit)
-      return unless can_soft_delete?
-
       klass.with_deleted do
         dependencies.reject { |m| m.deleted_at < limit }.each(&:soft_undelete!)
       end
@@ -27,10 +26,6 @@ module SoftDeletion
 
     protected
 
-    def nullify?
-      association.options[:dependent] == :nullify
-    end
-
     def nullify_dependencies
       dependencies.each do |dependency|
         foreign_key = if association.respond_to?(:foreign_key) # rails 3.1+
@@ -43,10 +38,6 @@ module SoftDeletion
       end
     end
 
-    def can_soft_delete?
-      klass.method_defined? :soft_delete!
-    end
-
     def klass
       association.klass
     end
@@ -55,8 +46,12 @@ module SoftDeletion
       record.class.reflect_on_association(association_name.to_sym)
     end
 
+    def dependency
+      record.send(association_name)
+    end
+
     def dependencies
-      Array.wrap(record.send(association_name))
+      Array.wrap(dependency)
     end
   end
 end

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/spec/soft_deletion_spec.rb

@@ -330,6 +330,29 @@ describe SoftDeletion do
       end
     end
 
+    context "a soft-deleted has-many category that delete_all forum references on delete" do
+      it "use update_all to delete references" do
+        category = DDACategory.create!
+        forum = category.forums.create!
+        category.soft_delete!
+
+        forum.should_not be_deleted # just did an update_all
+        Forum.find(forum.id).should be_deleted
+      end
+    end
+
+    context "a soft-deleted has-many category that defaults dependent forum references on delete" do
+      it "does nothing to those references" do
+        category = XDACategory.create!
+        forum = category.forums.create!
+        category.soft_delete!
+
+        forum.reload
+        forum.should_not be_deleted
+        forum.category_id.should_not be_nil
+      end
+    end
+
     context "a soft-deleted has-many category that nullifies forum references on delete without foreign_key" do
       it "should nullify those references" do
         organization = Organization.create!

data/spec/spec_helper.rb

@@ -121,6 +121,24 @@ class NDACategory < ActiveRecord::Base
   has_many :forums, :dependent => :nullify, :foreign_key => :category_id
 end
 
+# Delete dependent association
+class DDACategory < ActiveRecord::Base
+  silent_set_table_name 'categories'
+
+  has_soft_deletion
+
+  has_many :forums, :dependent => :delete_all, :foreign_key => :category_id
+end
+
+# default dependent association
+class XDACategory < ActiveRecord::Base
+  silent_set_table_name 'categories'
+
+  has_soft_deletion
+
+  has_many :forums, :foreign_key => :category_id
+end
+
 # Has ome association
 class HOACategory < ActiveRecord::Base
   silent_set_table_name 'categories'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -54,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2369399626209139476
+      hash: -1879420123943437209
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2369399626209139476
+      hash: -1879420123943437209
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25