Move the after_destroy callback out

lib/paperclip.rb

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

lib/paperclip/has_attached_file.rb

@@ -73,6 +73,7 @@ module Paperclip
       name = @name
       @klass.send(:after_save) { send(name).send(:save) }
       @klass.send(:before_destroy) { send(name).send(:queue_all_for_delete) }
+      @klass.send(:after_destroy) { send(name).send(:flush_deletes) }
     end
   end
 end

test/has_attached_file_test.rb

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