Move the attachment query to the HasAttachedFile class

lib/paperclip.rb

@@ -192,10 +192,6 @@ module Paperclip
         attachment = record.send(name)
         attachment.send(:flush_errors)
       end
-
-      define_method "#{name}?" do
-        send(name).file?
-      end
     end
   end
 end

lib/paperclip/has_attached_file.rb

@@ -13,6 +13,7 @@ module Paperclip
     def define
       define_getter
       define_setter
+      define_query
     end
 
     private
@@ -45,5 +46,13 @@ module Paperclip
         send(name).assign(file)
       end
     end
+
+    def define_query
+      name = @name
+
+      @klass.send :define_method, "#{@name}?" do
+        send(name).file?
+      end
+    end
   end
 end

test/has_attached_file_test.rb

@@ -10,6 +10,10 @@ class HasAttachedFileTest < Test::Unit::TestCase
     should 'define a getter on the class object' do
       assert_adding_attachment('avatar').defines_method('avatar')
     end
+
+    should 'define a query on the class object' do
+      assert_adding_attachment('avatar').defines_method('avatar?')
+    end
   end
 
   private