Release 2.0.4

CHANGELOG.rdoc

@@ -1,4 +1,11 @@
-== 2.0.3
+== 2.0.4
+
+Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0
+
+* bug fix
+  * Fix a regression that caused Warden to be initialized too late
+
+== 2.0.3 (yanked)
 
 * bug fix
   * Ensure warning is not shown by mistake on apps with mounted engines
@@ -8,8 +15,6 @@
 
 == 2.0.2
 
-Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0
-
 * enhancements
   * Add devise_i18n_options to customize I18n message
 
@@ -114,7 +119,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
   * Fix backward incompatible change from 1.4.6 for those using custom controllers
 
-== 1.4.6
+== 1.4.6 (yanked)
 
 * enhancements
   * Allow devise_for :skip => :all

lib/devise/rails.rb

@@ -87,8 +87,6 @@ module Devise
       end
 
       config.after_initialize do
-        Devise.configure_warden!
-
         example = <<-YAML
 en:
   devise:

lib/devise/rails/routes.rb

@@ -7,11 +7,8 @@ module ActionDispatch::Routing
     def finalize_with_devise!
       result = finalize_without_devise!
 
-      # If @devise_finalized was defined, it means devise_for was invoked
-      # in this router, so we proceed to generate devise helpers unless
-      # they were already defined (which then @devise_finalizd would be true).
-      if defined?(@devise_finalized) && !@devise_finalized
-        if Devise.router_name.nil? && self != Rails.application.try(:routes)
+      @devise_finalized ||= begin
+        if Devise.router_name.nil? && defined?(@devise_finalized) && self != Rails.application.try(:routes)
           warn "[DEVISE] We have detected that you are using devise_for inside engine routes. " \
             "In this case, you probably want to set Devise.router_name = MOUNT_POINT, where "   \
             "MOUNT_POINT is a symbol representing where this engine will be mounted at. For "   \
@@ -19,8 +16,9 @@ module ActionDispatch::Routing
             " to :main_app as well in case you want to keep the current behavior."
         end
 
+        Devise.configure_warden!
         Devise.regenerate_helpers!
-        @devise_finalized = true
+        true
       end
 
       result

lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "2.0.3".freeze
+  VERSION = "2.0.4".freeze
 end