lib/devise/orm/data_mapper.rb in dm-devise-1.4.0 vs lib/devise/orm/data_mapper.rb in dm-devise-1.5.0.beta

@@ -1,18 +1,28 @@
 require 'dm-devise'
 require 'devise/orm/data_mapper/compatibility'
 require 'devise/orm/data_mapper/schema'
 require 'devise/orm/data_mapper/date_time'
-require 'devise/orm/data_mapper/dm-validations'
+require 'devise/orm/data_mapper/serializable'
+require 'devise/orm/data_mapper/validations/dm-validations'
+require 'devise/orm/data_mapper/validations/active_model'
 require 'orm_adapter/adapters/data_mapper'
 
 module Devise
   module Orm
     module DataMapper
       module Hook
         def devise_modules_hook!
           extend Schema
+
+          if Devise.data_mapper_validation_lib == 'active_model'
+            include ActiveModel::Validations
+            include ActiveModelCompatibility
+            extend ActiveModelUniquenessCompatibility
+          end
+
           include Compatibility
+
           yield
           return unless Devise.apply_schema
           devise_modules.each { |m| send(m) if respond_to?(m, true) }
         end
       end