added support for am-validations

Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 require 'dm-core'
-require 'dm-validations'
+#require 'dm-validations'
 require 'dm-paperclip'
 
 desc 'Default: run unit tests.'

lib/dm-paperclip.rb

@@ -81,6 +81,7 @@ class Configuration
 
     attr_writer   :root, :env
     attr_accessor :use_dm_validations
+    attr_accessor :use_am_validations
 
     def root
       @root ||= Dir.pwd
@@ -224,9 +225,19 @@ def self.attachment_definitions=(obj)
 
       # Done at this time to ensure that the user
       # had a chance to configure the app in an initializer
+      raise if Paperclip.config.use_dm_validations && Paperclip.config.use_am_validations
+
       if Paperclip.config.use_dm_validations
-        require 'dm-validations'
-        require 'dm-paperclip/validations'
+        require 'dm-active_model'
+        require 'dm-paperclip/am-validations'
+        base.extend Paperclip::Validate::ClassMethods
+      end
+
+      if Paperclip.config.use_am_validations
+        require 'active_model'
+        require 'dm-active_model'
+        require 'dm-paperclip/am-validations'
+        base.send(:include,ActiveModel::Validations)
         base.extend Paperclip::Validate::ClassMethods
       end
 
@@ -329,6 +340,11 @@ def has_attached_file name, options = {}
         add_validator_to_context(opts_from_validator_args([name]), [name], Paperclip::Validate::CopyAttachmentErrors)
       end
 
+      if Paperclip.config.use_am_validations
+        #add_validator_to_context(opts_from_validator_args([name]), [name], Paperclip::Validate::CopyAttachmentErrors)
+        validates_with Paperclip::Validate::CopyAttachmentErrors, _merge_attributes([name])
+      end
+
     end
 
     # Returns the attachment definitions defined by each call to

lib/dm-paperclip/am-validations.rb

@@ -0,0 +1,110 @@
+module Paperclip
+  module Validate
+
+    module ClassMethods
+
+      # Places ActiveRecord-style validations on the size of the file assigned. The
+      # possible options are:
+      # * +in+: a Range of bytes (i.e. +1..1.megabyte+),
+      # * +less_than+: equivalent to :in => 0..options[:less_than]
+      # * +greater_than+: equivalent to :in => options[:greater_than]..Infinity
+      # * +message+: error message to display, use :min and :max as replacements
+      def validates_attachment_size(*fields)
+        validates_with Paperclip::Validate::SizeValidator, _merge_attributes(fields)
+      end
+
+      # Adds errors if thumbnail creation fails. The same as specifying :whiny_thumbnails => true.
+      def validates_attachment_thumbnails name, options = {}
+        self.attachment_definitions[name][:whiny_thumbnails] = true
+      end
+
+      # Places ActiveRecord-style validations on the presence of a file.
+      def validates_attachment_presence(*fields)
+        validates_with Paperclip::Validate::RequiredFieldValidator, _merge_attributes(fields)
+      end
+
+      # Places ActiveRecord-style validations on the content type of the file assigned. The
+      # possible options are:
+      # * +content_type+: Allowed content types.  Can be a single content type or an array.  Allows all by default.
+      # * +message+: The message to display when the uploaded file has an invalid content type.
+      def validates_attachment_content_type(*fields)
+        validates_with Paperclip::Validate::ContentTypeValidator, _merge_attributes(fields)
+      end
+
+    end
+
+    class SizeValidator < ActiveModel::EachValidator #:nodoc:
+     #def initialize(field_name, options={})
+     #  super
+     #  attribute, @options = field_name, options
+     #end
+
+      def validate_each(target, attribute, value)
+        field_value = target.send(:"#{attribute}_file_size")
+        return true if field_value.nil?
+
+        @options[:in] = (@options[:greater_than]..(1/0)) unless @options[:greater_than].nil?
+        @options[:in] = (0..@options[:less_than])        unless @options[:less_than].nil?
+        return true if @options[:in].include? field_value.to_i
+
+        target.errors.add(attribute, :less_than, :value => @options[:less_than]) unless @options[:less_than].nil?
+        target.errors.add(attribute, :greater_than, :value => @options[:greater_than]) unless @options[:greater_than].nil?
+        target.errors.add(attribute, :between, :first => @options[:in].first, :last => @options[:in].last)
+        return false
+      end
+    end
+
+    class RequiredFieldValidator < ActiveModel::EachValidator #:nodoc:
+     #def initialize(field_name, options={})
+     #  super
+     #  attribute, @options = field_name, options
+     #end
+
+      def validate_each(target, attribute, value)
+        field_value = target.send(attribute)
+        if field_value.nil? || field_value.original_filename.blank?
+          target.errors.add(attribute, :must_be_set)
+          return false
+        end
+        return true
+      end
+    end
+
+    class ContentTypeValidator < ActiveModel::EachValidator #:nodoc:
+     #def initialize(field_name, options={})
+     #  super
+     #  attribute, @options = field_name, options
+     #end
+
+      def validate_each(target, attribute, value)
+        valid_types = [@options[:content_type]].flatten
+        field_value = target.send(attribute)
+
+        unless field_value.nil? || field_value.original_filename.blank?
+          unless @options[:content_type].blank?
+            content_type = target.send(:"#{attribute}_content_type")
+            unless valid_types.any?{|t| t === content_type }
+              target.errors.add(attribute, :not_a_valid_content_type,:content_type => content_type)
+              return false
+            end
+          end
+        end
+
+        return true
+      end
+    end
+
+    class CopyAttachmentErrors < ActiveModel::EachValidator #:nodoc:
+      def validate_each(target, attribute, value)
+        field_value = target.send(attribute)
+        unless field_value.nil? || field_value.original_filename.blank?
+          return true if field_value.errors.length == 0
+          field_value.errors.each { |error| target.errors.add(attribute, error.first, :message => error.last.join(", ")) } 
+          return false
+        end
+        return true
+      end
+    end
+  end
+end
+

test/helper.rb

@@ -5,7 +5,7 @@
 require 'tempfile'
 
 require 'dm-core'
-require 'dm-validations'
+#require 'dm-validations'
 require 'dm-migrations'
 begin
   require 'ruby-debug'
@@ -46,15 +46,16 @@ class Mash < Hash
 Paperclip.configure do |config|
   config.root               = Merb.root # the application root to anchor relative urls (defaults to Dir.pwd)
   config.env                = Merb.env  # server env support, defaults to ENV['RACK_ENV'] or 'development'
-  config.use_dm_validations = true      # validate attachment sizes and such, defaults to false
+  #config.use_dm_validations = true      # validate attachment sizes and such, defaults to false
+  config.use_am_validations = true      # validate attachment sizes and such, defaults to false
 end
 
 def rebuild_model options = {}
   Object.send(:remove_const, "Dummy") rescue nil
   Object.const_set("Dummy", Class.new())
   Dummy.class_eval do
     include DataMapper::Resource
-    include DataMapper::Validate
+    #include DataMapper::Validate
     include Paperclip::Resource
     property :id, ::DataMapper::Types::Serial
     property :other, String

test/paperclip_test.rb

@@ -19,7 +19,6 @@ class PaperclipTest < Test::Unit::TestCase
       Object.const_set("DummyTwo", Class.new())
       DummyTwo.class_eval do
         include DataMapper::Resource
-        include DataMapper::Validate
         include Paperclip::Resource
         property :id, DataMapper::Types::Serial
         property :other, String