paperclip.rb in paperclip-2.4.3

- old
+ new

@@ -26,10 +26,11 @@
 # See the +has_attached_file+ documentation for more details.
 
 require 'erb'
 require 'digest'
 require 'tempfile'
+require 'paperclip/options'
 require 'paperclip/version'
 require 'paperclip/upfile'
 require 'paperclip/iostream'
 require 'paperclip/geometry'
 require 'paperclip/processor'
@@ -135,12 +136,14 @@
     def register_processor(name, processor)
       @known_processors ||= {}
       @known_processors[name.to_s] = processor
     end
 
+    # Find all instances of the given Active Record model +klass+ with attachment +name+.
+    # This method is used by the refresh rake tasks.
     def each_instance_with_attachment(klass, name)
-      class_for(klass).all.each do |instance|
+      class_for(klass).find(:all, :order => 'id').each do |instance|
         yield(instance) if instance.send(:"#{name}?")
       end
     end
 
     # Log a paperclip-specific line. This will logs to STDOUT
@@ -315,10 +318,10 @@
           write_inheritable_attribute(:attachment_definitions, {})
         end
       end
 
       attachment_definitions[name] = {:validations => []}.merge(options)
-      Paperclip.classes_with_attachments << self unless Paperclip.classes_with_attachments.include?(self)
+      Paperclip.classes_with_attachments << self.name
       Paperclip.check_for_url_clash(name,attachment_definitions[name][:url],self.name)
 
       after_save :save_attached_files
       before_destroy :prepare_for_destroy
       after_destroy :destroy_attached_files