From f8ea5e094283769add65816180de8a2508ac34fb Mon Sep 17 00:00:00 2001 From: Jared Morgan Date: Tue, 20 Dec 2011 15:52:26 -0600 Subject: [PATCH] move include Devise::Models::Authenticatable inside devise_modules_hook! call This allows alternate ORMs to run compatibility setup code before Authenticatable is included. The particular issue for dm-devise is that DataMapper does not have a before_validation method, which is called when Authenticatable is included (as of plataformatec/devise@bd27bf76). dm-devise adds before_validation in it's devise_modules_hook! --- lib/devise/models.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/devise/models.rb b/lib/devise/models.rb index 435b4b33..ae65c5f4 100644 --- a/lib/devise/models.rb +++ b/lib/devise/models.rb @@ -48,7 +48,6 @@ module Devise # for a complete description on those values. # def devise(*modules) - include Devise::Models::Authenticatable options = modules.extract_options!.dup selected_modules = modules.map(&:to_sym).uniq.sort_by do |s| @@ -56,6 +55,7 @@ module Devise end devise_modules_hook! do + include Devise::Models::Authenticatable selected_modules.each do |m| mod = Devise::Models.const_get(m.to_s.classify)