rails3_acts_as_paranoid 0.2.1 → 0.2.2

data/lib/acts_as_paranoid/core.rb

@@ -134,11 +134,16 @@ module ActsAsParanoid
     end
     
     def destroy_dependent_associations!
-      self.class.dependent_associations.each do |association|
-        if association.collection? && self.send(association.name).paranoid?
-          association.klass.with_deleted.instance_eval("find_all_by_#{association.foreign_key}(#{self.id.to_json})").each do |object|
-            object.destroy!
-          end
+      self.class.dependent_associations.each do |reflection|
+        next unless reflection.klass.paranoid?
+
+        scope = reflection.klass.only_deleted
+       
+        # Merge in the association's scope
+        scope = scope.merge(association(reflection.name).association_scope)
+
+        scope.each do |object|
+          object.destroy!
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails3_acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-11 00:00:00.000000000 Z
+date: 2012-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70201325143880 !ruby/object:Gem::Requirement
+  requirement: &70127635131740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70201325143880
+  version_requirements: *70127635131740
 description: Active Record (~>3.2) plugin which allows you to hide and restore records
   without actually deleting them. Check its GitHub page for more in-depth information.
 email:
@@ -51,7 +51,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2548769094078379763
+      hash: -64246137281541820
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: