soft_deletion 0.4.2 → 0.4.3

data.tar.gz.sig

@@ -1 +1,2 @@
-Cm�tF�I�v�o]`vF
�xu�S�v]m1QL���f&]qfn��@iC��e�0�z����z��}��L4K�햡1O�=�@Ī��Iq��!I�(6Hj<+n�s<�@>�m��!�UX{z<�/���9�f��C�T�	%O�����uN?j����ΕM��D�i�$��>�pɶ�ĎinN%�[�j�B���S��EA���~�$n��J��T��,�T<��V�^�*��t�
+���͛H�S'U̬������r/1��SF��(|
+������\7��E:]�IcS:E\I�[șA�.E��4ά���T��ÏL��0i��Y1�x��-D/I

data/Gemfile.lock

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

data/lib/soft_deletion/dependency.rb

@@ -33,7 +33,12 @@ module SoftDeletion
 
     def nullify_dependencies
       dependencies.each do |dependency|
-        dependency.update_attribute(association.options[:foreign_key], nil)
+        foreign_key = if association.respond_to?(:foreign_key) # rails 3+
+          association.foreign_key
+        else # rails 2
+          association.options[:foreign_key] || "#{record.class.name.underscore}_id"
+        end
+        dependency.update_attribute(foreign_key, nil)
       end
     end
 

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/spec/soft_deletion_spec.rb

@@ -242,6 +242,18 @@ describe SoftDeletion do
         forum.category_id.should be_nil
       end
     end
+
+    context "a soft-deleted has-many category that nullifies forum references on delete without foreign_key" do
+      it "should nullify those references" do
+        organization = Organization.create!
+        forum = organization.forums.create!
+        organization.soft_delete!
+
+        forum.reload
+        forum.should_not be_deleted
+        forum.organization_id.should be_nil
+      end
+    end
   end
 
   context "without deleted_at column" do

data/spec/spec_helper.rb

@@ -43,6 +43,7 @@ ActiveRecord::Schema.verbose = false
 ActiveRecord::Schema.define(:version => 1) do
   create_table :forums do |t|
     t.integer :category_id
+    t.integer :organization_id
     t.timestamp :deleted_at
   end
 
@@ -87,6 +88,14 @@ class Category < ActiveRecord::Base
   has_many :forums, :dependent => :destroy
 end
 
+class Organization < ActiveRecord::Base
+  silent_set_table_name 'categories'
+  has_soft_deletion
+
+  has_many :forums, :dependent => :nullify
+end
+
+
 # No association
 class NACategory < ActiveRecord::Base
   silent_set_table_name 'categories'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2568323612092411395
+      hash: 673516693853522626
 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: -2568323612092411395
+      hash: 673516693853522626
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25