Move the before_destroy callback out

lib/paperclip.rb

@@ -175,7 +175,6 @@ module Paperclip
     def has_attached_file(name, options = {})
       HasAttachedFile.define_on(self, name, options)
 
-      before_destroy { send(name).send(:queue_all_for_delete) }
       after_destroy { send(name).send(:flush_deletes) }
 
       define_paperclip_callbacks :post_process, :"#{name}_post_process"

lib/paperclip/has_attached_file.rb

@@ -72,6 +72,7 @@ module Paperclip
     def add_active_record_callbacks
       name = @name
       @klass.send(:after_save) { send(name).send(:save) }
+      @klass.send(:before_destroy) { send(name).send(:queue_all_for_delete) }
     end
   end
 end

test/has_attached_file_test.rb

@@ -26,6 +26,10 @@ class HasAttachedFileTest < Test::Unit::TestCase
     should 'define an after_save callback' do
       assert_adding_attachment('avatar').defines_callback('after_save')
     end
+
+    should 'define a before_destroy callback' do
+      assert_adding_attachment('avatar').defines_callback('before_destroy')
+    end
   end
 
   private