soft_destroyable 0.1.5 → 0.1.6

data/Rakefile

@@ -24,17 +24,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "soft_destroyable"
-    gem.summary = "Rails 3 ActiveRecord compatible soft destroy implementation"
-    gem.description = "Rails 3 ActiveRecord compatible soft destroy implementation supporting dependent associations"
-    gem.email = "rockrep@yahoo.com"
-    gem.homepage = "http://github.com/rockrep/soft_destroyable"
-    gem.authors = ["Michael Kintzer"]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/soft_destroyable.rb

@@ -229,7 +229,7 @@ module SoftDestroyable
         when :has_many
           restrict_on_non_empty_has_many(reflection, association)
         when :has_one
-          restrict_on_nil_has_one(reflection, association)
+          restrict_on_non_nil_has_one(reflection, association)
         else
       end
     end
@@ -278,11 +278,21 @@ module SoftDestroyable
 
     def restrict_on_non_empty_has_many(reflection, association)
       return unless association
-      raise ActiveRecord::DeleteRestrictionError.new(reflection) if !association.empty?
+      association.each {|assoc_obj|
+        if assoc_obj.respond_to?(:deleted?)
+          raise ActiveRecord::DeleteRestrictionError.new(reflection) if !assoc_obj.deleted?
+        else
+          raise ActiveRecord::DeleteRestrictionError.new(reflection)
+        end
+      }
     end
 
-    def restrict_on_nil_has_one(reflection, association)
-      raise ActiveRecord::DeleteRestrictionError.new(reflection) if !association.nil?
+    def restrict_on_non_nil_has_one(reflection, association)
+      if association.respond_to?(:deleted?)
+        raise ActiveRecord::DeleteRestrictionError.new(reflection) if !association.nil? && !association.deleted?
+      else
+        raise ActiveRecord::DeleteRestrictionError.new(reflection) if !association.nil?
+      end
     end
 
   end

data/soft_destroyable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{soft_destroyable}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Kintzer"]

data/test/dependent_restrict_test.rb

@@ -14,6 +14,16 @@ class DependentRestrictTest < Test::Unit::TestCase
     SoftRestrictOne.delete_all
   end
 
+  def test_destroy_no_restrict_or_soft_restrict_children
+    @fred.destroy
+    assert_equal true, @fred.deleted?
+  end
+
+  def test_destroy_bang_no_restrict_or_soft_restrict_children
+    @fred.destroy!
+    assert_nil Parent.find_by_id(@fred.id)
+  end
+
   def test_destroy_has_many_restrict_soft_children
     @fred.soft_restrict_children << pebbles = SoftRestrictChild.new(:name => "pebbles")
     @fred.soft_restrict_children << bambam = SoftRestrictChild.new(:name => "bambam")
@@ -26,6 +36,17 @@ class DependentRestrictTest < Test::Unit::TestCase
     assert_equal false, bambam.reload.deleted?
   end
 
+  def test_destroy_has_many_restrict_soft_children_which_are_deleted
+    @fred.soft_restrict_children << pebbles = SoftRestrictChild.new(:name => "pebbles")
+    @fred.soft_restrict_children << bambam = SoftRestrictChild.new(:name => "bambam")
+    assert_equal 2, @fred.reload.soft_restrict_children.count
+    pebbles.destroy
+    bambam.destroy
+    assert_equal 0, @fred.soft_restrict_children.not_deleted.count
+    @fred.destroy
+    assert_equal true, @fred.deleted?
+  end
+
   def test_destroy_has_many_restrict_children
     @fred.restrict_children << pebbles = RestrictChild.new(:name => "pebbles")
     @fred.restrict_children << bambam = RestrictChild.new(:name => "bambam")
@@ -50,6 +71,17 @@ class DependentRestrictTest < Test::Unit::TestCase
     assert_equal false, bambam.reload.deleted?
   end
 
+  def test_destroy_bang_has_many_restrict_soft_children_which_are_deleted
+    @fred.soft_restrict_children << pebbles = SoftRestrictChild.new(:name => "pebbles")
+    @fred.soft_restrict_children << bambam = SoftRestrictChild.new(:name => "bambam")
+    assert_equal 2, @fred.reload.soft_restrict_children.count
+    pebbles.destroy
+    bambam.destroy
+    assert_equal 0, @fred.soft_restrict_children.not_deleted.count
+    @fred.destroy!
+    assert_nil Parent.find_by_id(@fred.id)
+  end
+
   def test_destroy_bang_has_many_restrict_children
     @fred.restrict_children << pebbles = RestrictChild.new(:name => "pebbles")
     @fred.restrict_children << bambam = RestrictChild.new(:name => "bambam")
@@ -62,7 +94,7 @@ class DependentRestrictTest < Test::Unit::TestCase
     assert_not_nil RestrictChild.find_by_name("bambam")
   end
 
-  def test_destroys_has_soft_restrict_ones
+  def test_destroy_has_soft_restrict_ones
     @fred.soft_restrict_one = SoftRestrictOne.new(:name => "bambam")
     assert_equal @fred.reload.soft_restrict_one, SoftRestrictOne.where(:name => "bambam", :parent_id => @fred.id).first
     assert_raise ActiveRecord::DeleteRestrictionError do
@@ -72,7 +104,17 @@ class DependentRestrictTest < Test::Unit::TestCase
     assert_not_nil SoftRestrictOne.find_by_name("bambam")
   end
 
-  def test_destroys_has_restrict_ones
+  def test_destroy_has_soft_restrict_ones_which_is_deleted
+    @fred.soft_restrict_one = bambam = SoftRestrictOne.new(:name => "bambam")
+    assert_equal @fred.reload.soft_restrict_one, SoftRestrictOne.where(:name => "bambam", :parent_id => @fred.id).first
+    bambam.destroy
+    assert_equal true, @fred.reload.soft_restrict_one.deleted?
+    @fred.destroy
+    assert_equal true, @fred.deleted?
+    assert_not_nil SoftRestrictOne.find_by_name("bambam")
+  end
+
+  def test_destroy_has_restrict_ones
     @fred.restrict_one = RestrictOne.new(:name => "bambam")
     assert_equal @fred.reload.restrict_one, RestrictOne.where(:name => "bambam", :parent_id => @fred.id).first
     assert_raise ActiveRecord::DeleteRestrictionError do
@@ -92,6 +134,15 @@ class DependentRestrictTest < Test::Unit::TestCase
     assert_not_nil SoftRestrictOne.find_by_name("bambam")
   end
 
+  def test_destroy_bang_has_soft_restrict_ones_which_is_deleted
+    @fred.soft_restrict_one = bambam = SoftRestrictOne.new(:name => "bambam")
+    assert_equal @fred.reload.soft_restrict_one, SoftRestrictOne.where(:name => "bambam", :parent_id => @fred.id).first
+    bambam.destroy
+    assert_equal true, @fred.reload.soft_restrict_one.deleted?
+    @fred.destroy!
+    assert_nil Parent.find_by_id(@fred.id)
+  end  
+
   def test_destroy_bang_has_restrict_ones
     @fred.restrict_one = RestrictOne.new(:name => "bambam")
     assert_equal @fred.reload.restrict_one, RestrictOne.where(:name => "bambam", :parent_id => @fred.id).first

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soft_destroyable
 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: 
 - Michael Kintzer