Final tidy up on removing schema helpers.

lib/devise/orm/active_record.rb

@@ -26,6 +26,12 @@ module Devise
 
         # Tell how to apply schema methods.
         def apply_devise_schema(name, type, options={})
+          @__devise_warning_raised ||= begin
+            ActiveSupport::Deprecation.warn "You are using t.database_authenticatable and others in your migration " \
+              "and this feature is deprecated. Please simply use Rails helpers instead as mentioned here: " \
+              "https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0-migration-schema-style"
+            true
+          end
           column name, type.to_s.downcase.to_sym, options
         end
       end

lib/devise/rails.rb

@@ -52,7 +52,8 @@ module Devise
       if Devise.apply_schema && defined?(Mongoid)
         puts "\n[DEVISE] Devise.apply_schema is true. This means Devise was " \
           "automatically configuring your DB. This no longer happens. You should " \
-          "set this options to false and manually set the fields used by Devise."
+          "set Devise.apply_schema to false and manually set the fields used by Devise as shown here: " \
+          "https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0-migration-schema-style"
       end
 
       # TODO: Deprecate the true value of this option as well

test/rails_app/app/mongoid/admin.rb

@@ -6,8 +6,8 @@ class Admin
   include SharedAdmin
 
   ## Database authenticatable
-  field :email,              :type => String, :null => false, :default => ""
-  field :encrypted_password, :type => String, :null => false, :default => ""
+  field :email,              :type => String, :null => true
+  field :encrypted_password, :type => String, :null => true
 
   ## Recoverable
   field :reset_password_token,   :type => String

test/rails_app/db/migrate/20100401102949_create_tables.rb

@@ -4,22 +4,62 @@ class CreateTables < ActiveRecord::Migration
       t.string :username
       t.string :facebook_token
 
-      t.database_authenticatable :null => false
-      t.confirmable
-      t.recoverable
-      t.rememberable
-      t.trackable
-      t.lockable
-      t.token_authenticatable
+      ## Database authenticatable
+      t.string :email,              :null => false, :default => ""
+      t.string :encrypted_password, :null => false, :default => ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, :default => 0
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Encryptable
+      # t.string :password_salt
+
+      ## Confirmable
+      t.string   :confirmation_token
+      t.datetime :confirmed_at
+      t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      t.string   :unlock_token # Only if unlock strategy is :email or :both
+      t.datetime :locked_at
+
+      # Token authenticatable
+      t.string :authentication_token
+
       t.timestamps
     end
 
     create_table :admins do |t|
-      t.database_authenticatable :null => true
-      t.encryptable
-      t.rememberable :use_salt => false
-      t.recoverable
-      t.lockable :lock_strategy => :none, :unlock_strateagy => :time
+      ## Database authenticatable
+      t.string :email,              :null => true
+      t.string :encrypted_password, :null => true
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Encryptable
+      t.string :password_salt
+
+      ## Lockable
+      t.datetime :locked_at
+
       t.timestamps
     end
   end

test/schema_test.rb

@@ -1,33 +0,0 @@
-if DEVISE_ORM == :mongoid
-
-  require 'test_helper'
-
-  class User2
-    include Mongoid::Document
-    devise :database_authenticatable
-  end
-
-  class User3
-    include Mongoid::Document
-    devise :database_authenticatable, :authentication_keys => [:username, :email]
-   end
-
-  class User4
-    include Mongoid::Document
-    devise :database_authenticatable, :authentication_keys => [:username]
-  end
-
-  class SchemaTest < ActiveSupport::TestCase
-    test 'should create an email field if there are no custom authentication keys' do
-      assert_not_equal User2.fields['email'], nil
-    end
-
-    test 'should create an email field if there are custom authentication keys and they include email' do
-      assert_not_equal User3.fields['email'], nil
-    end
-
-    test 'should not create an email field if there are custom authentication keys they don\'t include email' do
-      assert_equal User4.fields['email'], nil
-    end
-  end
-end