soft_deletion 0.1.5 → 0.1.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soft_deletion (0.1.5)
+    soft_deletion (0.1.6)
 
 GEM
   remote: http://rubygems.org/

data/lib/soft_deletion/dependency.rb

@@ -38,7 +38,7 @@ module SoftDeletion
     end
 
     def can_soft_delete?
-      respond_to? :soft_delete!
+      klass.method_defined? :soft_delete!
     end
 
     def klass

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/test/soft_deletion_test.rb

@@ -78,6 +78,18 @@ class OriginalCategory < ActiveRecord::Base
   include SoftDeletion
 end
 
+# Has many destroyable association
+class DACategory < ActiveRecord::Base
+  silent_set_table_name 'categories'
+  include SoftDeletion
+  has_many :destroyable_forums, :dependent => :destroy, :foreign_key => :category_id
+end
+
+# Forum that isn't soft deletable for association checing
+class DestroyableForum < ActiveRecord::Base
+  silent_set_table_name 'forums'
+end
+
 def clear_callbacks(model, callback)
   if ActiveRecord::VERSION::MAJOR > 2
     model.define_callbacks callback
@@ -193,6 +205,27 @@ class SoftDeletionTest < ActiveSupport::TestCase
     successfully_bulk_soft_deletes
   end
 
+  context "with dependent association that doesn't have soft deletion" do
+    setup do
+      @category = DACategory.create!
+      @forum = @category.destroyable_forums.create!
+    end
+
+    context 'successfully soft deleted' do
+      setup do
+        @category.soft_delete!
+      end
+
+      should 'mark itself as deleted' do
+        assert_deleted @category
+      end
+
+      should 'not destroy dependent association' do
+        assert DestroyableForum.exists?(@forum.id)
+      end
+    end
+  end
+
   context 'with dependent has_many associations' do
     setup do
       @category = Category.create!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soft_deletion
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Zendesk