recurse-delete 0.0.4 → 0.0.8

data/lib/recurse-delete.rb

@@ -24,6 +24,8 @@
 require 'valium'
 
 module RecurseDelete
+  extend ActiveSupport::Concern
+
   def recurse_delete
     delete_recursively self.class, self.id
   end
@@ -32,22 +34,34 @@ module RecurseDelete
     # delete all the parent records
     parent_class.delete_all(:id => parent_ids)
 
-    # get the foreign key for the parent class
-    parent_key = parent_class.to_s.foreign_key
-
     # get the assocs for the parent class
     assocs = parent_class.reflect_on_all_associations.select do |assoc|
       [:destroy, :destroy_all, :delete, :delete_all].include? assoc.options[:dependent]
     end
-    assocs.map(&:name).each do |assoc|
+    assocs.each do |assoc|
       # get the dependent class
-      dependent_class = assoc.to_s.classify.constantize
+      dependent_class = assoc.name.to_s.classify.constantize
+      # get the foreign key
+      foreign_key = (assoc.options[:foreign_key] or parent_class.to_s.foreign_key)
       # get all the dependent record ids 
-      dependent_ids = dependent_class.where(parent_key => parent_ids).value_of(:id)
+      dependent_ids = dependent_class.where(foreign_key => parent_ids).value_of(:id)
       # recurse
       delete_recursively(dependent_class, dependent_ids)
     end
   end
+
+  module ClassMethods
+    def recurse_delete_all
+      delete_all
+      assocs = reflect_on_all_associations.select do |assoc|
+        [:destroy, :destroy_all, :delete, :delete_all].include? assoc.options[:dependent]
+      end
+      assocs.each do |assoc|
+        assoc.klass.recurse_delete_all
+      end
+    end
+  end
+
 end
 
 class ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recurse-delete
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70334481169100 !ruby/object:Gem::Requirement
+  requirement: &70309449741060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70334481169100
+  version_requirements: *70309449741060
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70309449740180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *70309449740180
 - !ruby/object:Gem::Dependency
   name: valium
-  requirement: &70334481166600 !ruby/object:Gem::Requirement
+  requirement: &70309449755320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,7 +43,7 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334481166600
+  version_requirements: *70309449755320
 description: Recursively delete all dependent model associations without an N + 1
 email: john.isaacks@programming-perils.com
 executables: []