Improve more loading process.

lib/devise.rb

@@ -150,6 +150,5 @@ def friendly_token
 
 require 'devise/controllers'
 require 'devise/encryptors'
-require 'devise/strategies/base'
-require 'devise/serializers/base'
+require 'devise/orm'
 require 'devise/rails'

lib/devise/orm.rb

@@ -0,0 +1,7 @@
+module Devise
+  module Orm
+    autoload :ActiveRecord, 'devise/orm/active_record'
+    autoload :DataMapper,   'devise/orm/data_mapper'
+    autoload :MongoMapper,  'devise/orm/mongo_mapper'
+  end
+end

lib/devise/serializers/authenticatable.rb

@@ -1,3 +1,5 @@
+require 'devise/serializers/base'
+
 module Devise
   module Serializers
     class Authenticatable < Warden::Serializers::Session
@@ -6,4 +8,4 @@ class Authenticatable < Warden::Serializers::Session
   end
 end
 
-Warden::Serializers.add(:authenticatable, Devise::Serializers::Authenticatable)
+Warden::Serializers.add(:authenticatable, Devise::Serializers::Authenticatable)

lib/devise/serializers/base.rb

@@ -1,3 +1,5 @@
+require 'devise/strategies/base'
+
 module Devise
   module Serializers
     module Base

lib/devise/serializers/rememberable.rb

@@ -1,3 +1,5 @@
+require 'devise/serializers/base'
+
 module Devise
   module Serializers
     class Rememberable < Warden::Serializers::Cookie

lib/devise/strategies/authenticatable.rb

@@ -1,3 +1,5 @@
+require 'devise/strategies/base'
+
 module Devise
   module Strategies
     # Default strategy for signing in a user, based on his email and password.