0
@@ -54,10 +54,6 @@ module Paperclip
0
       path = [options[:image_magick_path], command].compact
0
       File.join(*path)
0
     end
0
-
0
-    def included base #:nodoc:
0
-      base.extend ClassMethods
0
-    end
0
   end
0
 
0
   class PaperclipError < StandardError #:nodoc:
0
@@ -66,6 +62,12 @@ module Paperclip
0
   class NotIdentifiedByImageMagickError < PaperclipError #:nodoc:
0
   end
0
 
0
+  module Resource
0
+    def self.included(base)
0
+      base.extend Paperclip::ClassMethods
0
+    end
0
+  end
0
+
0
   module ClassMethods
0
     @@attachment_definitions = {}
0
 

0
@@ -59,7 +59,7 @@ def rebuild_model options = {}
0
   Dummy.class_eval do
0
     include DataMapper::Resource
0
     include DataMapper::Validate
0
-    include Paperclip
0
+    include Paperclip::Resource
0
 #    include Paperclip::Validations
0
     property :id, Integer, :serial => true
0
     property :other, String