recurse-delete 0.0.1 → 0.0.3

data/lib/recurse-delete.rb

@@ -1,4 +1,4 @@
-# Recurse Delete by John Isaacks (programming-perils.com)
+# Recurse Delete by JD Isaacks (jisaacks.com)
 #
 # Copyright (c) 2012 John Isaacks
 #
@@ -21,29 +21,33 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require 'valium'
+
 module RecurseDelete
+  def recurse_delete
+    delete_recursively self.class, self.id
+  end
+
+  def delete_recursively(parent_class, parent_ids)
+    # delete all the parent records
+    parent_class.delete_all(:id => parent_ids)
 
-  def recurse_delete(model_class=nil, ids=nil)
-    ids = self.id if ids.nil?
-    model_class = self.class if model_class.nil?
-    
-    # Delete self
-    model_class.delete_all(:id => ids)
-    
-    # find and delete all dependent associations
-    delete_assocs = [:delete_all,:delete,:destroy,:destroy_all]
-    table_name = model_class.to_s.tableize
-    model_class.reflect_on_all_associations.select do |assoc|
-      delete_assocs.include? assoc.options[:dependent]
-    end.map(&:name).each do |sub|
-      sub_model_class = sub.to_s.classify.constantize
-      sub_ids = sub_model_class.send("find_all_by_#{table_name.classify.foreign_key}", ids).map(&:id)
-      recurse_delete(sub_model_class, sub_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|
+      # get the dependent class
+      dependent_class = assoc.to_s.classify.constantize
+      # get all the dependent record ids 
+      dependent_ids = dependent_class.where(parent_key => parent_ids).value_of(:id)
+      # recurse
+      delete_recursively(dependent_class, dependent_ids)
     end
-    
-    self
   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.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-01 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70171390191620 !ruby/object:Gem::Requirement
+  requirement: &70238368835880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70171390191620
+  version_requirements: *70238368835880
+- !ruby/object:Gem::Dependency
+  name: valium
+  requirement: &70238368834720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70238368834720
 description: Recursively delete all dependent model associations without an N + 1
 email: john.isaacks@programming-perils.com
 executables: []