Moving Devise method to Devise::ActiveRecord and updating TODO

lib/devise.rb

@@ -16,29 +16,8 @@ require 'devise/initializers/warden'
 
 module Devise
 
-  # Shortcut method for including all devise modules inside your User class
-  # Examples:
-  #   # include only authenticable module (default)
-  #   acts_as_devisable
-  #   # include authenticable + confirmable modules
-  #   acts_as_devisable :confirmable
-  #   # include authenticable + recoverable modules
-  #   acts_as_devisable :recoverable
-  #   # include authenticable + validatable modules
-  #   acts_as_devisable :validatable
-  #   # include all modules
-  #   acts_as_devisable :confirmable, :recoverable, :validatable
-  #   # shortcut to include all modules (same as above)
-  #   acts_as_devisable :all
-  #
-  def acts_as_devisable(*options)
-    include Devise::Models::Authenticable
-    include Devise::Models::Confirmable if [:all, :confirmable].any?{|o| options.include?(o) }
-    include Devise::Models::Recoverable if [:all, :recoverable].any?{|o| options.include?(o) }
-    include Devise::Models::Validatable if [:all, :validatable].any?{|o| options.include?(o) }
-  end
 end
 
 ActionView::Base.send :include, DeviseHelper
 ActionController::Base.send :include, Devise::Controllers::Authenticable
-ActiveRecord::Base.send :extend, Devise
+ActiveRecord::Base.send :extend, Devise::ActiveRecord

lib/devise/active_record.rb

@@ -0,0 +1,25 @@
+module Devise
+  module ActiveRecord
+    # Shortcut method for including all devise modules inside your User class
+    # Examples:
+    #   # include only authenticable module (default)
+    #   devise
+    #   # include authenticable + confirmable modules
+    #   devise :confirmable
+    #   # include authenticable + recoverable modules
+    #   devise :recoverable
+    #   # include authenticable + validatable modules
+    #   devise :validatable
+    #   # include all modules
+    #   devise :confirmable, :recoverable, :validatable
+    #   # shortcut to include all modules (same as above)
+    #   devise :all
+    #
+    def devise(*options)
+      include Devise::Models::Authenticable
+      include Devise::Models::Confirmable if [:all, :confirmable].any?{|o| options.include?(o) }
+      include Devise::Models::Recoverable if [:all, :recoverable].any?{|o| options.include?(o) }
+      include Devise::Models::Validatable if [:all, :validatable].any?{|o| options.include?(o) }
+    end
+  end
+end