From 3432c9eef4bca1e4fb446d9588a65a44930b52ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 12 Dec 2009 22:52:48 -0200
Subject: [PATCH] Simplify autoload stack.

---
 README.rdoc               |  4 ++++
 lib/devise.rb             | 29 +++++++++++++++++++++++------
 lib/devise/controllers.rb |  7 -------
 lib/devise/encryptors.rb  |  9 ---------
 lib/devise/orm.rb         |  7 -------
 5 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 lib/devise/controllers.rb
 delete mode 100644 lib/devise/encryptors.rb
 delete mode 100644 lib/devise/orm.rb

diff --git a/README.rdoc b/README.rdoc
index bbed7c6f..4995de7f 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -42,6 +42,10 @@ Configure warden and devise gems inside your app:
   config.gem 'warden'
   config.gem 'devise'
 
+Run the generator:
+
+	ruby script/generate devise_install
+
 And you're ready to go.
 
 == Basic Usage
diff --git a/lib/devise.rb b/lib/devise.rb
index f220b576..3f4aeab1 100644
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -1,7 +1,28 @@
 module Devise
-  autoload :Schema, 'devise/schema'
-  autoload :Mapping, 'devise/mapping'
   autoload :FailureApp, 'devise/failure_app'
+  autoload :Mapping, 'devise/mapping'
+  autoload :Schema, 'devise/schema'
+  autoload :TestHelpers, 'devise/test_helpers'
+
+  module Controllers
+    autoload :Filters, 'devise/controllers/filters'
+    autoload :Helpers, 'devise/controllers/helpers'
+    autoload :UrlHelpers, 'devise/controllers/url_helpers'
+  end
+
+  module Encryptors
+    autoload :AuthlogicSha512, 'devise/encryptors/authlogic_sha512'
+    autoload :AuthlogicSha1, 'devise/encryptors/authlogic_sha1'
+    autoload :RestfulAuthenticationSha1, 'devise/encryptors/restful_authentication_sha1'
+    autoload :Sha512, 'devise/encryptors/sha512'
+    autoload :Sha1, 'devise/encryptors/sha1'
+  end
+
+  module Orm
+    autoload :ActiveRecord, 'devise/orm/active_record'
+    autoload :DataMapper, 'devise/orm/data_mapper'
+    autoload :MongoMapper, 'devise/orm/mongo_mapper'
+  end
 
   ALL = [:authenticatable, :confirmable, :recoverable, :rememberable,
          :timeoutable, :trackable, :validatable]
@@ -147,8 +168,4 @@ end
 
 # Set the default_scope to nil, so it's overwritten when the first route is declared.
 Warden::Manager.default_scope = nil
-
-require 'devise/controllers'
-require 'devise/encryptors'
-require 'devise/orm'
 require 'devise/rails'
diff --git a/lib/devise/controllers.rb b/lib/devise/controllers.rb
deleted file mode 100644
index fe80220e..00000000
--- a/lib/devise/controllers.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Devise
-  module Controllers
-    autoload :Filters, 'devise/controllers/filters' 
-    autoload :Helpers, 'devise/controllers/helpers' 
-    autoload :UrlHelpers, 'devise/controllers/url_helpers'     
-  end
-end
\ No newline at end of file
diff --git a/lib/devise/encryptors.rb b/lib/devise/encryptors.rb
deleted file mode 100644
index 737817bf..00000000
--- a/lib/devise/encryptors.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Devise
-  module Encryptors
-    autoload :AuthlogicSha512, 'devise/encryptors/authlogic_sha512' 
-    autoload :AuthlogicSha1, 'devise/encryptors/authlogic_sha1' 
-    autoload :RestfulAuthenticationSha1, 'devise/encryptors/restful_authentication_sha1' 
-    autoload :Sha512, 'devise/encryptors/sha512' 
-    autoload :Sha1, 'devise/encryptors/sha1' 
-  end
-end
\ No newline at end of file
diff --git a/lib/devise/orm.rb b/lib/devise/orm.rb
deleted file mode 100644
index 33ea6971..00000000
--- a/lib/devise/orm.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Devise
-  module Orm
-    autoload :ActiveRecord, 'devise/orm/active_record'
-    autoload :DataMapper,   'devise/orm/data_mapper'
-    autoload :MongoMapper,  'devise/orm/mongo_mapper'
-  end
-end