soft_deletion 0.1.9 → 0.1.10

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    soft_deletion (0.1.9)
+    soft_deletion (0.1.10)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+    activemodel (3.2.7)
+      activesupport (= 3.2.7)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.3)
+    activesupport (3.2.7)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     appraisal (0.4.1)
@@ -23,10 +23,17 @@ GEM
     arel (3.0.2)
     builder (3.0.0)
     i18n (0.6.0)
-    mocha (0.9.12)
-    multi_json (1.3.4)
+    metaclass (0.0.1)
+    mocha (0.12.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.6)
     rake (0.9.2.2)
-    shoulda (2.10.3)
+    shoulda (3.1.1)
+      shoulda-context (~> 1.0)
+      shoulda-matchers (~> 1.2)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.2.0)
+      activesupport (>= 3.0.0)
     sqlite3 (1.3.6)
     test-unit (2.2.0)
     tzinfo (0.3.33)

data/gemfiles/rails2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/soft_deletion
   specs:
-    soft_deletion (0.1.8)
+    soft_deletion (0.1.9)
 
 GEM
   remote: http://rubygems.org/

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/soft_deletion
   specs:
-    soft_deletion (0.1.8)
+    soft_deletion (0.1.9)
 
 GEM
   remote: http://rubygems.org/

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

data/lib/soft_deletion.rb

@@ -90,9 +90,7 @@ module SoftDeletion
   end
 
   def soft_delete(*args)
-    _run_soft_delete do
-      return false unless save(*args)
-    end
+    _run_soft_delete{ save(*args) }
   end
 
   def soft_undelete!
@@ -111,19 +109,21 @@ module SoftDeletion
 
   def _run_soft_delete(&block)
     self.class.transaction do
+      result = nil
       if ActiveRecord::VERSION::MAJOR > 2
         run_callbacks :soft_delete do
           mark_as_deleted
           soft_delete_dependencies.each(&:soft_delete!)
-          block.call
+          result = block.call
         end
       else
         run_callbacks :before_soft_delete
         mark_as_deleted
         soft_delete_dependencies.each(&:soft_delete!)
-        block.call
+        result = block.call
         run_callbacks :after_soft_delete
       end
+      result
     end
   end
 end

data/test/soft_deletion_test.rb

@@ -14,32 +14,32 @@ class SoftDeletionTest < ActiveSupport::TestCase
   end
 
   def self.successfully_soft_deletes
-    context 'successfully soft deleted' do
+    context "successfully soft deleted" do
       setup do
         @category.soft_delete!
       end
 
-      should 'mark itself as deleted' do
+      should "mark itself as deleted" do
         assert_deleted @category
       end
 
-      should 'soft delete its dependent associations' do
+      should "soft delete its dependent associations" do
         assert_deleted @forum
       end
     end
   end
 
   def self.successfully_bulk_soft_deletes
-    context 'successfully bulk soft deleted' do
+    context "successfully bulk soft deleted" do
       setup do
         Category.soft_delete_all!(@category)
       end
 
-      should 'mark itself as deleted' do
+      should "mark itself as deleted" do
         assert_deleted @category
       end
 
-      should 'soft delete its dependent associations' do
+      should "soft delete its dependent associations" do
         assert_deleted @forum
       end
     end
@@ -89,16 +89,16 @@ class SoftDeletionTest < ActiveSupport::TestCase
     end
   end
 
-  context 'without dependent associations' do
-    should 'only soft-delete itself' do
+  context "without dependent associations" do
+    should "only soft-delete itself" do
       category = NACategory.create!
       category.soft_delete!
       assert_deleted category
     end
   end
 
-  context 'with independent associations' do
-    should 'not delete associations' do
+  context "with independent associations" do
+    should "not delete associations" do
       category = IDACategory.create!
       forum = category.forums.create!
       category.soft_delete!
@@ -106,7 +106,7 @@ class SoftDeletionTest < ActiveSupport::TestCase
     end
   end
 
-  context 'with dependent has_one association' do
+  context "with dependent has_one association" do
     setup do
       @category = HOACategory.create!
       @forum = @category.create_forum
@@ -122,38 +122,38 @@ class SoftDeletionTest < ActiveSupport::TestCase
       @forum = @category.destroyable_forums.create!
     end
 
-    context 'successfully soft deleted' do
+    context "successfully soft deleted" do
       setup do
         @category.soft_delete!
       end
 
-      should 'mark itself as deleted' do
+      should "mark itself as deleted" do
         assert_deleted @category
       end
 
-      should 'not destroy dependent association' do
+      should "not destroy dependent association" do
         assert DestroyableForum.exists?(@forum.id)
       end
     end
   end
 
-  context 'with dependent has_many associations' do
+  context "with dependent has_many associations" do
     setup do
       @category = Category.create!
       @forum = @category.forums.create!
     end
 
-    context 'failing to soft delete' do
+    context "failing to soft delete" do
       setup do
         @category.stubs(:valid?).returns(false)
         assert_raise(ActiveRecord::RecordInvalid) { @category.soft_delete! }
       end
 
-      should 'not mark itself as deleted' do
+      should "not mark itself as deleted" do
         assert_not_deleted @category
       end
 
-      should 'not soft delete its dependent associations' do
+      should "not soft delete its dependent associations" do
         assert_not_deleted @forum
       end
     end
@@ -161,7 +161,7 @@ class SoftDeletionTest < ActiveSupport::TestCase
     successfully_soft_deletes
     successfully_bulk_soft_deletes
 
-    context 'being restored from soft deletion' do
+    context "being restored from soft deletion" do
       setup do
         @category.soft_delete!
         Category.with_deleted do
@@ -171,18 +171,18 @@ class SoftDeletionTest < ActiveSupport::TestCase
         end
       end
 
-      should 'not mark itself as deleted' do
+      should "not mark itself as deleted" do
         assert_not_deleted @category
       end
 
-      should 'restore its dependent associations' do
+      should "restore its dependent associations" do
         assert_not_deleted @forum
       end
     end
   end
 
-  context 'a soft-deleted has-many category that nullifies forum references on delete' do
-    should 'nullify those references' do
+  context "a soft-deleted has-many category that nullifies forum references on delete" do
+    should "nullify those references" do
       category = NDACategory.create!
       forum = category.forums.create!
       category.soft_delete!
@@ -191,15 +191,15 @@ class SoftDeletionTest < ActiveSupport::TestCase
     end
   end
 
-  context 'without deleted_at column' do
-    should 'default scope should not provoke an error' do
+  context "without deleted_at column" do
+    should "default scope should not provoke an error" do
       assert_nothing_raised do
         OriginalCategory.create!
       end
     end
   end
 
-  context "bulk soft deletion" do
+  context ".soft_delete_all!" do
     setup do
       @categories = 2.times.map { Category.create! }
     end
@@ -243,4 +243,44 @@ class SoftDeletionTest < ActiveSupport::TestCase
       assert_nil Cat1Forum.find_by_id(forum.id)
     end
   end
+
+  context "validations" do
+    should "fail when validations fail" do
+      forum = ValidatedForum.create!(:category_id => 1)
+      forum.category_id = nil
+      assert_raise ActiveRecord::RecordInvalid do
+        forum.soft_delete!
+      end
+      assert_not_deleted forum
+    end
+
+    should "pass when validations pass" do
+      forum = ValidatedForum.create!(:category_id => 1)
+      forum.soft_delete!
+      assert_deleted forum
+    end
+  end
+
+  context "#soft_delete" do
+    should "return true if it succeeds" do
+      forum = ValidatedForum.create!(:category_id => 1)
+      assert_equal true, forum.soft_delete
+      assert_deleted forum
+    end
+
+    should "return false if validations fail" do
+      forum = ValidatedForum.create!(:category_id => 1)
+      forum.category_id = nil
+      assert_equal false, forum.soft_delete
+      assert_not_deleted forum
+    end
+
+    should "return true if validations are prevented and it succeeds" do
+      forum = ValidatedForum.create!(:category_id => 1)
+      forum.category_id = nil
+      skip_validations = (ActiveRecord::VERSION::MAJOR == 2 ? false : {:validate => false})
+      assert_equal true, forum.soft_delete(skip_validations)
+      assert_deleted forum
+    end
+  end
 end

data/test/test_helper.rb

@@ -54,6 +54,13 @@ class Forum < ActiveRecord::Base
   belongs_to :category
 end
 
+class ValidatedForum < ActiveRecord::Base
+  silent_set_table_name 'forums'
+  include SoftDeletion
+  belongs_to :category
+  validates_presence_of :category_id
+end
+
 class Category < ActiveRecord::Base
   include SoftDeletion
   has_many :forums, :dependent => :destroy

metadata

@@ -1,32 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: soft_deletion
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 0.1.10
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 9
-  version: 0.1.9
 platform: ruby
-authors: 
+authors:
 - Zendesk
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-29 00:00:00 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: michael@grosser.it
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .travis.yml
 - Appraisals
 - Gemfile
@@ -45,37 +35,34 @@ files:
 - test/soft_deletion_test.rb
 - test/test_helper.rb
 homepage: http://github.com/grosser/soft_deletion
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1755831677353429354
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -1755831677353429354
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Explicit soft deletion for ActiveRecord via deleted_at and default scope.
 test_files: []
-