soft_deletion 0.5.0 → 0.5.1

data/Gemfile.lock

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

data/lib/soft_deletion/core.rb

@@ -98,43 +98,48 @@ module SoftDeletion
     protected
 
     def _run_soft_delete(&block)
+      result = false
+      internal = lambda do
+        mark_as_deleted
+        soft_delete_dependencies.each(&:soft_delete!)
+        result = block.call
+      end
+
       self.class.transaction do
-        result = false
         if ActiveRecord::VERSION::MAJOR > 2
-          run_callbacks :soft_delete do
-            mark_as_deleted
-            soft_delete_dependencies.each(&:soft_delete!)
-            result = block.call
-          end
+          run_callbacks :soft_delete, &internal
         else
           return false if !run_callbacks(:before_soft_delete) { |result, object| result == false }
-          mark_as_deleted
-          soft_delete_dependencies.each(&:soft_delete!)
-          result = block.call
+          internal.call
           run_callbacks :after_soft_delete
         end
-        result
       end
+
+      result
     end
 
     def _run_soft_undelete(&block)
+      raise "#{self.class} is not deleted" unless deleted_at
+
+      result = false
+      limit = deleted_at - 1.hour
+      internal = lambda do
+        mark_as_undeleted
+        soft_delete_dependencies.each { |m| m.soft_undelete!(limit)}
+        result = block.call
+      end
+
       self.class.transaction do
-        result = false
         if ActiveRecord::VERSION::MAJOR > 2
-          run_callbacks :soft_undelete do
-            mark_as_undeleted
-            soft_delete_dependencies.each(&:soft_undelete!)
-            result = block.call
-          end
+          run_callbacks :soft_undelete, &internal
         else
           return false if !run_callbacks(:before_soft_undelete) { |result, object| result == false }
-          mark_as_undeleted
-          soft_delete_dependencies.each(&:soft_undelete!)
-          result = block.call
+          internal.call
           run_callbacks :after_soft_undelete
         end
-        result
       end
+
+      result
     end
   end
 end

data/lib/soft_deletion/dependency.rb

@@ -17,11 +17,11 @@ module SoftDeletion
       end
     end
 
-    def soft_undelete!
+    def soft_undelete!(limit)
       return unless can_soft_delete?
 
       klass.with_deleted do
-        dependencies.each(&:soft_undelete!)
+        dependencies.reject { |m| m.deleted_at < limit }.each(&:soft_undelete!)
       end
     end
 

data/lib/soft_deletion/version.rb

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

data/spec/soft_deletion_spec.rb

@@ -133,7 +133,7 @@ describe SoftDeletion do
     describe ".before_soft_undelete" do
       it "is called on soft-undeletion" do
         Category.before_soft_undelete :foo
-        category = Category.create!
+        category = Category.create!(:deleted_at => Time.now)
 
         category.should_receive(:foo)
 
@@ -142,21 +142,21 @@ describe SoftDeletion do
 
       it "stops execution chain if false is returned" do
         Category.before_soft_undelete :foo, :bar
-        category = Category.create!
+        category = Category.create!(:deleted_at => Time.now)
 
         category.should_receive(:foo).and_return(false)
         category.should_not_receive(:bar)
 
         category.soft_undelete!.should == false
         category.reload
-        category.should_not be_deleted
+        category.should be_deleted
       end
     end
 
     describe ".after_soft_undelete" do
       it "is called after soft-undeletion" do
         Category.after_soft_undelete :foo
-        category = Category.create!
+        category = Category.create!(:deleted_at => Time.now)
 
         category.should_receive(:foo)
 
@@ -165,7 +165,7 @@ describe SoftDeletion do
 
       it "is called with a block" do
         Category.after_soft_undelete{|c| c.foo }
-        category = Category.create!
+        category = Category.create!(:deleted_at => Time.now)
 
         category.should_receive(:foo)
 
@@ -174,7 +174,7 @@ describe SoftDeletion do
 
       it "calls multiple after soft-undeletion" do
         Category.after_soft_undelete :foo, :bar
-        category = Category.create!
+        category = Category.create!(:deleted_at => Time.now)
 
         category.should_receive(:foo)
         category.should_receive(:bar)
@@ -184,7 +184,7 @@ describe SoftDeletion do
 
       it "does not stop undeletion when returning false" do
         Category.after_soft_undelete :foo
-        category = Category.create!
+        category = Category.create!(:deleted_at => Time.now)
 
         category.should_receive(:foo).and_return false
 
@@ -196,7 +196,7 @@ describe SoftDeletion do
 
       it "is not called after normal destroy" do
         Category.after_soft_undelete :foo
-        category = Category.create!
+        category = Category.create!(:deleted_at => Time.now)
 
         category.should_not_receive(:foo)
 
@@ -286,23 +286,35 @@ describe SoftDeletion do
       successfully_bulk_soft_deletes
 
       context "being restored from soft deletion" do
-        before do
-          @category.soft_delete!
+        def undelete!
           Category.with_deleted do
             @category.reload
             @category.soft_undelete!
           end
         end
 
-        it "should not mark itself as deleted" do
+        before do
+          @category.soft_delete!
+          Category.with_deleted { @category = Category.find(@category.id) }
+        end
+
+        it "does not mark itself as deleted" do
+          undelete!
           @category.reload
           @category.should_not be_deleted
         end
 
-        it "should restore its dependent associations" do
+        it "restores its dependent associations" do
+          undelete!
           @forum.reload
           @forum.should_not be_deleted
         end
+
+        it "does not restore far previous deletions" do
+          @forum.update_attributes(:deleted_at => 1.year.ago)
+          undelete!
+          @forum.reload.should be_deleted
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -54,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1457355893249503490
+      hash: -2369399626209139476
 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: 1457355893249503490
+      hash: -2369399626209139476
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25