lib/vandal.rb in vandal-0.0.1 vs lib/vandal.rb in vandal-0.0.2

@@ -1,38 +1,34 @@
 require 'vandal/version'
-require 'pry-byebug'
 
 module Vandal
   module Destroy
     extend ::ActiveSupport::Concern
-    DELETE_OPTIONS = [:destroy, :delete, :delete_all]
 
     def vandal_destroy
-      begin
-        @destroying ||= false
-        return if @destroying
-        @destroying = true
-        self.class.transaction do
-          self.class.related_associations.each do |association|
-            related = self.send(association[:name])
-            related.send("vandal_destroy#{association[:collection] ? '_all': ''}") if related.present?
-          end
-          self.delete
+      @destroying ||= false
+      return if @destroying
+      @destroying = true
+      self.class.transaction do
+        self.class.related_associations.each do |association|
+          related = send(association[:name])
+          related.send("vandal_destroy#{association[:collection] ? '_all' : ''}") if related.present?
         end
-      ensure
-        @destroying = false
+        delete
       end
+    ensure
+      @destroying = false
     end
 
     module ClassMethods
       def vandal_destroy_all
-        transaction { find_each { |r| r.vandal_destroy! } }
+        transaction { find_each { |r| r.vandal_destroy } }
       end
 
       def related_associations
-        @related_associations ||= reflections.select do |name, association|
-          association.options[:dependent].in?(DELETE_OPTIONS)
-        end.collect { |name, association| { name: name, collection: association.collection? } }
+        @related_associations ||= reflections.collect do |name, association|
+          { name: name, collection: association.collection? }
+        end
       end
     end
   end
 end