Merge pull request #423 from jhawthorn/paranoia_aliases

Add paranoia_destroy and paranoia_delete aliases

lib/paranoia.rb

@@ -14,7 +14,6 @@ module Paranoia
 
 
   def self.included(klazz)
   def self.included(klazz)
     klazz.extend Query
     klazz.extend Query
-    klazz.extend Callbacks
   end
   end
 
 
   module Query
   module Query
@@ -53,31 +52,11 @@ module Paranoia
     end
     end
   end
   end
 
 
-  module Callbacks
-    def self.extended(klazz)
-      [:restore, :real_destroy].each do |callback_name|
-        klazz.define_callbacks callback_name
-
-        klazz.define_singleton_method("before_#{callback_name}") do |*args, &block|
-          set_callback(callback_name, :before, *args, &block)
-        end
-
-        klazz.define_singleton_method("around_#{callback_name}") do |*args, &block|
-          set_callback(callback_name, :around, *args, &block)
-        end
-
-        klazz.define_singleton_method("after_#{callback_name}") do |*args, &block|
-          set_callback(callback_name, :after, *args, &block)
-        end
-      end
-    end
-  end
-
-  def destroy
+  def paranoia_destroy
     transaction do
     transaction do
       run_callbacks(:destroy) do
       run_callbacks(:destroy) do
         @_disable_counter_cache = deleted?
         @_disable_counter_cache = deleted?
-        result = delete
+        result = paranoia_delete
         next result unless result && ActiveRecord::VERSION::STRING >= '4.2'
         next result unless result && ActiveRecord::VERSION::STRING >= '4.2'
         each_counter_cached_associations do |association|
         each_counter_cached_associations do |association|
           foreign_key = association.reflection.foreign_key.to_sym
           foreign_key = association.reflection.foreign_key.to_sym
@@ -90,8 +69,14 @@ module Paranoia
       end
       end
     end
     end
   end
   end
+  alias_method :destroy, :paranoia_destroy
 
 
-  def delete
+  def paranoia_destroy!
+    paranoia_destroy ||
+      raise(ActiveRecord::RecordNotDestroyed.new("Failed to destroy the record", self))
+  end
+
+  def paranoia_delete
     raise ActiveRecord::ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
     raise ActiveRecord::ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
     if persisted?
     if persisted?
       # if a transaction exists, add the record so that after_commit
       # if a transaction exists, add the record so that after_commit
@@ -103,6 +88,7 @@ module Paranoia
     end
     end
     self
     self
   end
   end
+  alias_method :delete, :paranoia_delete
 
 
   def restore!(opts = {})
   def restore!(opts = {})
     self.class.transaction do
     self.class.transaction do
@@ -112,7 +98,7 @@ module Paranoia
         # This only happened on Rails versions earlier than 4.1.
         # This only happened on Rails versions earlier than 4.1.
         noop_if_frozen = ActiveRecord.version < Gem::Version.new("4.1")
         noop_if_frozen = ActiveRecord.version < Gem::Version.new("4.1")
         if within_recovery_window?(recovery_window_range) && ((noop_if_frozen && !@attributes.frozen?) || !noop_if_frozen)
         if within_recovery_window?(recovery_window_range) && ((noop_if_frozen && !@attributes.frozen?) || !noop_if_frozen)
-          @_disable_counter_cache = !deleted?
+          @_disable_counter_cache = !paranoia_destroyed?
           write_attribute paranoia_column, paranoia_sentinel_value
           write_attribute paranoia_column, paranoia_sentinel_value
           update_columns(paranoia_restore_attributes)
           update_columns(paranoia_restore_attributes)
           each_counter_cached_associations do |association|
           each_counter_cached_associations do |association|
@@ -149,7 +135,7 @@ module Paranoia
   def really_destroy!
   def really_destroy!
     transaction do
     transaction do
       run_callbacks(:real_destroy) do
       run_callbacks(:real_destroy) do
-        @_disable_counter_cache = deleted?
+        @_disable_counter_cache = paranoia_destroyed?
         dependent_reflections = self.class.reflections.select do |name, reflection|
         dependent_reflections = self.class.reflections.select do |name, reflection|
           reflection.options[:dependent] == :destroy
           reflection.options[:dependent] == :destroy
         end
         end
@@ -241,6 +227,8 @@ end
 ActiveSupport.on_load(:active_record) do
 ActiveSupport.on_load(:active_record) do
   class ActiveRecord::Base
   class ActiveRecord::Base
     def self.acts_as_paranoid(options={})
     def self.acts_as_paranoid(options={})
+      define_model_callbacks :restore, :real_destroy
+
       alias_method :really_destroyed?, :destroyed?
       alias_method :really_destroyed?, :destroyed?
       alias_method :really_delete, :delete
       alias_method :really_delete, :delete
       alias_method :destroy_without_paranoia, :destroy
       alias_method :destroy_without_paranoia, :destroy
@@ -317,7 +305,7 @@ module ActiveRecord
     class AssociationNotSoftDestroyedValidator < ActiveModel::EachValidator
     class AssociationNotSoftDestroyedValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
       def validate_each(record, attribute, value)
         # if association is soft destroyed, add an error
         # if association is soft destroyed, add an error
-        if value.present? && value.deleted?
+        if value.present? && value.paranoia_destroyed?
           record.errors[attribute] << 'has been soft-deleted'
           record.errors[attribute] << 'has been soft-deleted'
         end
         end
       end
       end