soft_deletion 0.4.4 → 0.4.5

data/Gemfile.lock

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

data/lib/soft_deletion/core.rb

@@ -9,9 +9,13 @@ module SoftDeletion
       # backport after_soft_delete so we can safely upgrade to rails 3
       if ActiveRecord::VERSION::MAJOR > 2
         base.define_model_callbacks :soft_delete
+        base.define_model_callbacks :soft_undelete
       else
         base.define_callbacks :before_soft_delete
         base.define_callbacks :after_soft_delete
+
+        base.define_callbacks :before_soft_undelete
+        base.define_callbacks :after_soft_undelete
       end
     end
 
@@ -84,11 +88,7 @@ module SoftDeletion
     end
 
     def soft_undelete!
-      self.class.transaction do
-        mark_as_undeleted
-        soft_delete_dependencies.each(&:soft_undelete!)
-        save!
-      end
+      _run_soft_undelete{ save! }
     end
 
     def soft_delete_dependencies
@@ -116,5 +116,25 @@ module SoftDeletion
         result
       end
     end
+
+    def _run_soft_undelete(&block)
+      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
+        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
+          run_callbacks :after_soft_undelete
+        end
+        result
+      end
+    end
   end
 end

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

data/spec/soft_deletion_spec.rb

@@ -39,6 +39,7 @@ describe SoftDeletion do
 
   before do
     clear_callbacks Category, :soft_delete
+    clear_callbacks Category, :soft_undelete
 
     # Stub dump method calls
     Category.any_instance.stub(:foo)
@@ -128,6 +129,80 @@ describe SoftDeletion do
         category.destroy
       end
     end
+
+    describe ".before_soft_undelete" do
+      it "is called on soft-undeletion" do
+        Category.before_soft_undelete :foo
+        category = Category.create!
+
+        category.should_receive(:foo)
+
+        category.soft_undelete!
+      end
+
+      it "stops execution chain if false is returned" do
+        Category.before_soft_undelete :foo, :bar
+        category = Category.create!
+
+        category.should_receive(:foo).and_return(false)
+        category.should_not_receive(:bar)
+
+        category.soft_undelete!.should == false
+        category.reload
+        category.should_not 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.should_receive(:foo)
+
+        category.soft_undelete!
+      end
+
+      it "is called with a block" do
+        Category.after_soft_undelete{|c| c.foo }
+        category = Category.create!
+
+        category.should_receive(:foo)
+
+        category.soft_undelete!
+      end
+
+      it "calls multiple after soft-undeletion" do
+        Category.after_soft_undelete :foo, :bar
+        category = Category.create!
+
+        category.should_receive(:foo)
+        category.should_receive(:bar)
+
+        category.soft_undelete!
+      end
+
+      it "does not stop undeletion when returning false" do
+        Category.after_soft_undelete :foo
+        category = Category.create!
+
+        category.should_receive(:foo).and_return false
+
+        category.soft_undelete!
+
+        category.reload
+        category.should_not be_deleted
+      end
+
+      it "is not called after normal destroy" do
+        Category.after_soft_undelete :foo
+        category = Category.create!
+
+        category.should_not_receive(:foo)
+
+        category.destroy
+      end
+    end
   end
 
   describe "association" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   VHNmKzZNYWVud0FNa0FnSGRzd0dzSnp0T25ObkJhM0YKeTBrQ1NXbUs2RCt4
   L1NiZlM2cjdLZTA3TVJxemlKZEI5R3VFMSswY0lSdUZoOEVRK0xONkhYQ0tN
   NXBvbi9HVQp5Y3dNWGZsMAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4454320574336980361
+      hash: 888472233015841176
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4454320574336980361
+      hash: 888472233015841176
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25