Fix warden configuration.

lib/devise.rb

@@ -230,12 +230,8 @@ module Devise
 
   # A method used internally to setup warden manager from the Rails initialize
   # block.
-  def self.configure_warden(config) #:nodoc:
-    config.failure_app   = Devise::FailureApp
-    config.default_scope = Devise.default_scope
-
-    @@warden_config = config
-    @@warden_config_block.try :call, config
+  def self.configure_warden! #:nodoc:
+    @@warden_config_block.try :call, Devise.warden_config
   end
 
   # Generate a friendly string randomically to be used as token.

lib/devise/rails.rb

@@ -7,7 +7,9 @@ module Devise
 
     initializer "devise.add_middleware" do |app|
       app.config.middleware.use Warden::Manager do |config|
-        Devise.configure_warden(config)
+        Devise.warden_config = config
+        config.failure_app   = Devise::FailureApp
+        config.default_scope = Devise.default_scope
       end
     end
 

lib/devise/rails/routes.rb

@@ -4,11 +4,9 @@ module ActionDispatch::Routing
     # need devise_for mappings already declared to create filters and helpers.
     def finalize_with_devise!
       finalize_without_devise!
-      return if Devise.mappings.empty?
-
+      Devise.configure_warden!
       ActionController::Base.send :include, Devise::Controllers::Helpers
       ActionController::Base.send :include, Devise::Controllers::UrlHelpers
-
       ActionView::Base.send :include, Devise::Controllers::UrlHelpers
     end
     alias_method_chain :finalize!, :devise

lib/generators/devise_install/templates/devise.rb

@@ -108,6 +108,6 @@ Devise.setup do |config|
   #     twitter.consumer_key  = <YOUR CONSUMER KEY>
   #     twitter.options :site => 'http://twitter.com'
   #   end
-  #   manager.default_strategies.unshift :twitter_oauth
+  #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
   # end
 end

test/devise_test.rb

@@ -23,14 +23,9 @@ class DeviseTest < ActiveSupport::TestCase
     end
   end
 
-  test 'warden manager configuration' do
-    Devise.yield_and_restore do
-      config = Warden::Config.new
-      Devise.configure_warden(config)
-
-      assert_equal Devise::FailureApp, config.failure_app
-      assert_equal :user, config.default_scope
-    end
+  test 'stores warden configuration' do
+    assert_equal Devise::FailureApp, Devise.warden_config.failure_app
+    assert_equal :user, Devise.warden_config.default_scope
   end
 
   test 'warden manager user configuration through a block' do
@@ -41,7 +36,7 @@ class DeviseTest < ActiveSupport::TestCase
         assert_kind_of Warden::Config, config
       end
 
-      Devise.configure_warden(Warden::Config.new)
+      Devise.configure_warden!
       assert @executed
     end
   end