devise 1.5.2 → 2.0.0

data/CHANGELOG.rdoc

@@ -1,8 +1,42 @@
+== 2.0.0
+
+Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0
+
+* enhancements
+  * Add support for e-mail reconfirmation on change (by @Mandaryn and @heimidal)
+  * Redirect users to sign in page after unlock (by @nashby)
+  * Redirect to the previous URL on timeout
+  * Inherit from the same Devise parent controller (by @sj26)
+  * Allow parent_controller to be customizable via Devise.parent_controller, useful for engines
+  * Allow router_name to be customizable via Devise.router_name, useful for engines
+  * Allow alternate ORMs to run compatibility setup code before Authenticatable is included (by @jm81)
+
+* deprecation
+  * Devise now only supports Rails 3.1 forward
+  * Devise.confirm_within was deprecated in favor Devise.allow_unconfirmed_access_for
+  * Devise.stateless_token= is deprecated in favor of appending :token_auth to Devise.skip_session_storage
+  * Usage of Devise.apply_schema is deprecated
+  * Usage of Devise migration helpers are deprecated
+  * Usage of Devise.remember_across_browsers was deprecated
+  * Usage of rememberable with remember_token was removed
+  * Usage of recoverable without reset_password_sent_at was removed
+  * Usage of Devise.case_insensitive_keys equals to false was removed
+  * Move devise/shared/_links.erb to devise/_links.erb
+  * Deprecated support of nested devise_for blocks
+  * Deprecated support to devise.registrations.reasons and devise.registrations.inactive_signed_up in favor of devise.registrations.signed_up_but_*
+
+== 1.5.3
+
+* bug fix
+  * Ensure delegator converts scope to symbol (by @dmitriy-kiriyenko)
+  * Ensure passing :format => false to devise_for is not permanent
+  * Ensure path checker does not check invalid routes
+
 == 1.5.2
 
 * enhancements
-  * Add support for rails 3.1 new mass assignment conventions (by github.com/kirs)
-  * Add timeout_in method to Timeoutable, it can be overriden in a model (by github.com/lest)
+  * Add support for Rails 3.1 new mass assignment conventions (by @kirs)
+  * Add timeout_in method to Timeoutable, it can be overridden in a model (by @lest)
 
 * bug fix
   * OmniAuth error message now shows the proper option (:strategy_class instead of :klass)
@@ -17,10 +51,10 @@
 * enhancements
   * Timeoutable also skips tracking if skip_trackable is given
   * devise_for now accepts :failure_app as an option
-  * Models can select the proper mailer via devise_mailer method (by github.com/locomotivecms)
-  * Migration generator now uses the change method (by github.com/nashby)
-  * Support to markerb templates on the mailer generator (by github.com/sbounmy)
-  * Support for Omniauth 1.0 (older versions are no longer supported) (by github.com/TamiasSibiricus)
+  * Models can select the proper mailer via devise_mailer method (by @locomotivecms)
+  * Migration generator now uses the change method (by @nashby)
+  * Support to markerb templates on the mailer generator (by @sbounmy)
+  * Support for Omniauth 1.0 (older versions are no longer supported) (by @TamiasSibiricus)
 
 * bug fix
   * Allow idempotent API requests
@@ -63,7 +97,7 @@
 
 * bug fix
   * Failure app tries the root path if a session one does not exist
-  * No need to finalize Devise helpers all the time (by github.com/bradleypriest)
+  * No need to finalize Devise helpers all the time (by @bradleypriest)
   * Reset password shows proper message if user is not active
   * `clean_up_passwords` sets the accessors to nil to skip validations
 
@@ -98,7 +132,7 @@
 * enhancements
   * Add :defaults and :format support on router
   * Add simple form generators
-  * Better localization for devise_error_messages! (by github.com/zedtux)
+  * Better localization for devise_error_messages! (by @zedtux)
 
 * bug fix
   * Ensure to_xml is properly white listened
@@ -107,20 +141,20 @@
 == 1.4.0
 
 * enhancements
-  * Added authenticated and unauthenticated to the router to route the used based on his status (by github.com/sj26)
-  * Improve e-mail regexp (by github.com/rodrigoflores)
-  * Add strip_whitespace_keys and default to e-mail (by github.com/swrobel)
-  * Do not run format and uniqueness validations on e-mail if it hasn't changed (by github.com/Thibaut)
-  * Added update_without_password to update models but not allowing the password to change (by github.com/fschwahn)
-  * Added config.paranoid, check the generator for more information (by github.com/rodrigoflores)
+  * Added authenticated and unauthenticated to the router to route the used based on his status (by @sj26)
+  * Improve e-mail regexp (by @rodrigoflores)
+  * Add strip_whitespace_keys and default to e-mail (by @swrobel)
+  * Do not run format and uniqueness validations on e-mail if it hasn't changed (by @Thibaut)
+  * Added update_without_password to update models but not allowing the password to change (by @fschwahn)
+  * Added config.paranoid, check the generator for more information (by @rodrigoflores)
 
 * bug fix
   * password_required? should not affect length validation
   * User cannot access sign up and similar pages if he is already signed in through a cookie or token
-  * Do not convert booleans to strings on finders (by github.com/xavier)
-  * Run validations even if current_password fails (by github.com/crx)
-  * Devise now honors routes constraints (by github.com/macmartine)
-  * Do not return the user resource when requesting instructions (by github.com/rodrigoflores)
+  * Do not convert booleans to strings on finders (by @xavier)
+  * Run validations even if current_password fails (by @crx)
+  * Devise now honors routes constraints (by @macmartine)
+  * Do not return the user resource when requesting instructions (by @rodrigoflores)
 
 == 1.3.4
 
@@ -135,31 +169,31 @@
 == 1.3.2
 
 * bug fix
-  * Fix another regression related to reset_password_sent_at (by github.com/alexdreher)
+  * Fix another regression related to reset_password_sent_at (by @alexdreher)
 
 == 1.3.1
 
 * enhancements
-  * Improve failure_app responses (by github.com/indirect)
+  * Improve failure_app responses (by @indirect)
   * sessions/new and registrations/new also respond to xml and json now
 
 * bug fix
-  * Fix a regression that occurred if reset_password_sent_at is not present (by github.com/stevehodgkiss)
+  * Fix a regression that occurred if reset_password_sent_at is not present (by @stevehodgkiss)
 
 == 1.3.0
 
 * enhancements
-  * All controllers can now handle different mime types than html using Responders (by github.com/sikachu)
-  * Added reset_password_within as configuration option to send the token for recovery (by github.com/jdguyot)
-  * Bump password length to 128 characters (by github.com/k33l0r)
-  * Add :only as option to devise_for (by github.com/timoschilling)
-  * Allow to override path after sending password instructions (by github.com/irohiroki)
-  * require_no_authentication has its own flash message (by github.com/jackdempsey)
+  * All controllers can now handle different mime types than html using Responders (by @sikachu)
+  * Added reset_password_within as configuration option to send the token for recovery (by @jdguyot)
+  * Bump password length to 128 characters (by @k33l0r)
+  * Add :only as option to devise_for (by @timoschilling)
+  * Allow to override path after sending password instructions (by @irohiroki)
+  * require_no_authentication has its own flash message (by @jackdempsey)
 
 * bug fix
   * Fix a bug where configuration options were being included too late
-  * Ensure Devise::TestHelpers can be used to tests Devise internal controllers (by github.com/jwilger)
-  * valid_password? should not choke on empty passwords (by github.com/mikel)
+  * Ensure Devise::TestHelpers can be used to tests Devise internal controllers (by @jwilger)
+  * valid_password? should not choke on empty passwords (by @mikel)
   * Calling devise more than once does not include previously added modules anymore
   * downcase_keys before validation
 
@@ -186,16 +220,16 @@
 
 * bug fix
   * Fix an issue causing infinite redirects in production
-  * rails g destroy works properly with devise generators (by github.com/andmej)
-  * before_failure callbacks should work on test helpers (by github.com/twinge)
-  * rememberable cookie now is httponly by default (by github.com/JamesFerguson)
-  * Add missing confirmation_keys (by github.com/JohnPlummer)
+  * rails g destroy works properly with devise generators (by @andmej)
+  * before_failure callbacks should work on test helpers (by @twinge)
+  * rememberable cookie now is httponly by default (by @JamesFerguson)
+  * Add missing confirmation_keys (by @JohnPlummer)
   * Ensure after_* hooks are called on RegistrationsController
   * When using database_authenticatable Devise will now only create an email field when appropriate (if using default authentication_keys or custom authentication_keys with email included)
-  * Ensure stateless token does not trigger timeout (by github.com/pixelauthority)
+  * Ensure stateless token does not trigger timeout (by @pixelauthority)
   * Implement handle_unverified_request for Rails 3.0.4 compatibility and improve FailureApp reliance on symbols
   * Consider namespaces while generating routes
-  * Custom failure apps no longer ignored in test mode (by github.com/jaghion)
+  * Custom failure apps no longer ignored in test mode (by @jaghion)
   * Do not depend on ActiveModel::Dirty
   * Manual sign_in now triggers remember token
   * Be sure to halt strategies on failures
@@ -204,7 +238,7 @@
   * Ensure there is no Mongoid injection
 
 * deprecations
-  * Deprecated anybody_signed_in? in favor of signed_in? (by github.com/gavinhughes)
+  * Deprecated anybody_signed_in? in favor of signed_in? (by @gavinhughes)
   * Removed --haml and --slim view templates
   * Devise::OmniAuth helpers were deprecated and removed in favor of Omniauth.config.test_mode
 
@@ -217,11 +251,11 @@
 * enhancements
   * Added OmniAuth support
   * Added ORM adapter to abstract ORM iteraction
-  * sign_out_via is available in the router to configure the method used for sign out (by github.com/martinrehfeld)
-  * Improved Ajax requests handling in failure app (by github.com/spastorino)
+  * sign_out_via is available in the router to configure the method used for sign out (by @martinrehfeld)
+  * Improved Ajax requests handling in failure app (by @spastorino)
   * Added request_keys to easily use request specific values (like subdomain) in authentication
   * Increased the size of friendly_token to 60 characters (reduces the chances of a successful brute attack)
-  * Ensure the friendly token does not include "_" or "-" since some e-mails may not autolink it properly (by github.com/rymai)
+  * Ensure the friendly token does not include "_" or "-" since some e-mails may not autolink it properly (by @rymai)
   * Extracted encryptors into :encryptable for better bcrypt support
   * :rememberable is now able to use salt as token if no remember_token is provided
   * Store the salt in session and expire the session if the user changes his password
@@ -230,7 +264,7 @@
   * Sign up now check if the user is active or not and redirect him accordingly setting the inactive_signed_up message
   * Use ActiveModel#to_key instead of #id
   * sign_out_all_scopes now destroys the whole session
-  * Added case_insensitive_keys that automatically downcases the given keys, by default downcases only e-mail (by github.com/adahl)
+  * Added case_insensitive_keys that automatically downcases the given keys, by default downcases only e-mail (by @adahl)
 
 * default behavior changes
   * sign_out_all_scopes defaults to true as security measure
@@ -239,12 +273,12 @@
 
 * bugfix
   * after_sign_in_path_for always receives a resource
-  * Do not execute Warden::Callbacks on Devise::TestHelpers (by github.com/sgronblo)
-  * Allow password recovery and account unlocking to change used keys (by github.com/RStankov)
+  * Do not execute Warden::Callbacks on Devise::TestHelpers (by @sgronblo)
+  * Allow password recovery and account unlocking to change used keys (by @RStankov)
   * FailureApp now properly handles nil request.format
   * Fix a bug causing FailureApp to return with HTTP Auth Headers for IE7
   * Ensure namespaces has proper scoped views
-  * Ensure Devise does not set empty flash messages (by github.com/sxross)
+  * Ensure Devise does not set empty flash messages (by @sxross)
 
 == 1.1.6
 
@@ -269,11 +303,11 @@
 
 * bugfix
   * Add reply-to to e-mail headers by default
-  * Updated the views generator to respect the rails :template_engine option (by github.com/fredwu)
+  * Updated the views generator to respect the rails :template_engine option (by @fredwu)
   * Check the type of HTTP Authentication before using Basic headers
-  * Avoid invalid_salt errors by checking salt presence (by github.com/thibaudgg)
-  * Forget user deletes the right cookie before logout, not remembering the user anymore (by github.com/emtrane)
-  * Fix for failed first-ever logins on PostgreSQL where column default is nil (by github.com/bensie)
+  * Avoid invalid_salt errors by checking salt presence (by @thibaudgg)
+  * Forget user deletes the right cookie before logout, not remembering the user anymore (by @emtrane)
+  * Fix for failed first-ever logins on PostgreSQL where column default is nil (by @bensie)
   * :default options is now honored in migrations
 
 == 1.1.2
@@ -289,16 +323,16 @@
 == 1.1.0
 
 * enhancements
-  * Rememberable module allows user to be remembered across browsers and is enabled by default (by github.com/trevorturk)
-  * Rememberable module allows you to activate the period the remember me token is extended (by github.com/trevorturk)
+  * Rememberable module allows user to be remembered across browsers and is enabled by default (by @trevorturk)
+  * Rememberable module allows you to activate the period the remember me token is extended (by @trevorturk)
   * devise_for can now be used together with scope method in routes but with a few limitations (check the documentation)
   * Support `as` or `devise_scope` in the router to specify controller access scope
-  * HTTP Basic Auth can now be disabled/enabled for xhr(ajax) requests using http_authenticatable_on_xhr option (by github.com/pellja)
+  * HTTP Basic Auth can now be disabled/enabled for xhr(ajax) requests using http_authenticatable_on_xhr option (by @pellja)
 
 * bug fix
   * Fix a bug in Devise::TestHelpers where current_user was returning a Response object for non active accounts
   * Devise should respect script_name and path_info contracts
-  * Fix a bug when accessing a path with (.:format) (by github.com/klacointe)
+  * Fix a bug when accessing a path with (.:format) (by @klacointe)
   * Do not add unlock routes unless unlock strategy is email or both
   * Email should be case insensitive
   * Store classes as string in session, to avoid serialization and stale data issues
@@ -309,10 +343,10 @@
 == 1.1.rc2
 
 * enhancements
-  * Allow to set cookie domain for the remember token. (by github.com/mantas)
+  * Allow to set cookie domain for the remember token. (by @mantas)
   * Added navigational formats to specify when it should return a 302 and when a 401.
-  * Added authenticate(scope) support in routes (by github.com/wildchild)
-  * Added after_update_path_for to registrations controller (by github.com/thedelchop)
+  * Added authenticate(scope) support in routes (by @wildchild)
+  * Added after_update_path_for to registrations controller (by @thedelchop)
   * Allow the mailer object to be replaced through config.mailer = "MyOwnMailer"
 
 * bug fix
@@ -360,10 +394,10 @@
 
 * enhancements
   * Support for latest MongoMapper
-  * Added anybody_signed_in? helper (by github.com/SSDany)
+  * Added anybody_signed_in? helper (by @SSDany)
 
 * bug fix
-  * confirmation_required? is properly honored on active? calls. (by github.com/paulrosania)
+  * confirmation_required? is properly honored on active? calls. (by @paulrosania)
 
 == 1.0.7
 
@@ -404,7 +438,7 @@
 == 1.0.2
 
 * enhancements
-  * Allows you set mailer content type (by github.com/glennr)
+  * Allows you set mailer content type (by @glennr)
 
 * bug fix
   * Uses the same content type as request on http authenticatable 401 responses
@@ -437,12 +471,12 @@
 
 * enhancements
   * Added gemspec to repo
-  * Added token authenticatable (by github.com/grimen)
+  * Added token authenticatable (by @grimen)
 
 == 0.9.1
 
 * bug fix
-  * Allow bigger salt size (by github.com/jgeiger)
+  * Allow bigger salt size (by @jgeiger)
   * Fix relative url root
 
 == 0.9.0
@@ -452,11 +486,11 @@
   * :success and :failure flash messages are now :notice and :alert
 
 * enhancements
-  * Added devise lockable (by github.com/mhfs)
+  * Added devise lockable (by @mhfs)
   * Warden 0.9.0 compatibility
   * Mongomapper 0.6.10 compatibility
-  * Added Devise.add_module as hooks for extensions (by github.com/grimen)
-  * Ruby 1.9.1 compatibility (by github.com/grimen)
+  * Added Devise.add_module as hooks for extensions (by @grimen)
+  * Ruby 1.9.1 compatibility (by @grimen)
 
 * bug fix
   * Accept path prefix not starting with slash
@@ -465,10 +499,10 @@
 == 0.8.2
 
 * enhancements
-  * Allow Devise.mailer_sender to be a proc (by github.com/grimen)
+  * Allow Devise.mailer_sender to be a proc (by @grimen)
 
 * bug fix
-  * Fix bug with passenger, update is required to anyone deploying on passenger (by github.com/dvdpalm)
+  * Fix bug with passenger, update is required to anyone deploying on passenger (by @dvdpalm)
 
 == 0.8.1
 
@@ -485,11 +519,11 @@
 * enhancements
   * Warden 0.8.0 compatibility
   * Add an easy for map.connect "sign_in", :controller => "sessions", :action => "new" to work
-  * Added :bcrypt encryptor (by github.com/capotej)
+  * Added :bcrypt encryptor (by @capotej)
 
 * bug fix
   * sign_in_count is also increased when user signs in via password change, confirmation, etc..
-  * More DataMapper compatibility (by github.com/lancecarlson)
+  * More DataMapper compatibility (by @lancecarlson)
 
 * deprecation
   * Removed DeviseMailer.sender
@@ -529,7 +563,7 @@
 == 0.7.1
 
 * enhancements
-  * Small enhancements for other plugins compatibility (by github.com/grimen)
+  * Small enhancements for other plugins compatibility (by @grimen)
 
 == 0.7.0
 
@@ -623,9 +657,9 @@
   * Fixed a bug where remember me module was not working properly
 
 * enhancements
-  * Moved encryption strategy into the Encryptors module to allow several algorithms (by github.com/mhfs)
-  * Implemented encryptors for Clearance, Authlogic and Restful-Authentication (by github.com/mhfs)
-  * Added support for MongoMapper (by github.com/shingara)
+  * Moved encryption strategy into the Encryptors module to allow several algorithms (by @mhfs)
+  * Implemented encryptors for Clearance, Authlogic and Restful-Authentication (by @mhfs)
+  * Added support for MongoMapper (by @shingara)
 
 == 0.4.3
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2009-2011 Plataforma Tecnologia. http://blog.plataformatec.com.br
+Copyright 2009-2012 Plataforma Tecnologia. http://blog.plataformatec.com.br
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,3 +1,5 @@
+*IMPORTANT:* Devise 2.0.0 is out. If you are upgrading, please read: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0
+
 == Devise
 
 {<img src="https://secure.travis-ci.org/plataformatec/devise.png" />}[http://travis-ci.org/plataformatec/devise]
@@ -210,7 +212,7 @@ Devise allows you to set up as many roles as you want. For example, you may have
 
 We built Devise to help you quickly develop an application that uses authentication. However, we don't want to be in your way when you need to customize it.
 
-Since Devise is an engine, all its views are packaged inside the gem. These views will help you get started, but after sometime you may want to change them. If this is the case, you just need to invoke the following generator, and it will copy all views to your application:
+Since Devise is an engine, all its views are packaged inside the gem. These views will help you get started, but after some time you may want to change them. If this is the case, you just need to invoke the following generator, and it will copy all views to your application:
 
   rails generate devise:views
 
@@ -363,4 +365,4 @@ https://github.com/plataformatec/devise/contributors
 
 == License
 
-MIT License. Copyright 2011 Plataforma Tecnologia. http://blog.plataformatec.com.br
+MIT License. Copyright 2012 Plataforma Tecnologia. http://blog.plataformatec.com.br

data/app/controllers/devise/confirmations_controller.rb

@@ -1,10 +1,7 @@
-class Devise::ConfirmationsController < ApplicationController
-  include Devise::Controllers::InternalHelpers
-
+class Devise::ConfirmationsController < DeviseController
   # GET /resource/confirmation/new
   def new
     build_resource({})
-    render_with_scope :new
   end
 
   # POST /resource/confirmation
@@ -14,7 +11,7 @@ class Devise::ConfirmationsController < ApplicationController
     if successfully_sent?(resource)
       respond_with({}, :location => after_resending_confirmation_instructions_path_for(resource_name))
     else
-      respond_with_navigational(resource){ render_with_scope :new }
+      respond_with(resource)
     end
   end
 
@@ -27,7 +24,7 @@ class Devise::ConfirmationsController < ApplicationController
       sign_in(resource_name, resource)
       respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource_name, resource) }
     else
-      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render_with_scope :new }
+      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
     end
   end
 

data/app/controllers/devise/omniauth_callbacks_controller.rb

@@ -1,6 +1,4 @@
-class Devise::OmniauthCallbacksController < ApplicationController
-  include Devise::Controllers::InternalHelpers
-
+class Devise::OmniauthCallbacksController < DeviseController
   def failure
     set_flash_message :alert, :failure, :kind => failed_strategy.name.to_s.humanize, :reason => failure_message
     redirect_to after_omniauth_failure_path_for(resource_name)

data/app/controllers/devise/passwords_controller.rb

@@ -1,11 +1,9 @@
-class Devise::PasswordsController < ApplicationController
+class Devise::PasswordsController < DeviseController
   prepend_before_filter :require_no_authentication
-  include Devise::Controllers::InternalHelpers
 
   # GET /resource/password/new
   def new
     build_resource({})
-    render_with_scope :new
   end
 
   # POST /resource/password
@@ -15,7 +13,7 @@ class Devise::PasswordsController < ApplicationController
     if successfully_sent?(resource)
       respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name))
     else
-      respond_with_navigational(resource){ render_with_scope :new }
+      respond_with(resource)
     end
   end
 
@@ -23,7 +21,6 @@ class Devise::PasswordsController < ApplicationController
   def edit
     self.resource = resource_class.new
     resource.reset_password_token = params[:reset_password_token]
-    render_with_scope :edit
   end
 
   # PUT /resource/password
@@ -36,7 +33,7 @@ class Devise::PasswordsController < ApplicationController
       sign_in(resource_name, resource)
       respond_with resource, :location => after_sign_in_path_for(resource)
     else
-      respond_with_navigational(resource){ render_with_scope :edit }
+      respond_with resource
     end
   end
 

data/app/controllers/devise/registrations_controller.rb

@@ -1,12 +1,11 @@
-class Devise::RegistrationsController < ApplicationController
+class Devise::RegistrationsController < DeviseController
   prepend_before_filter :require_no_authentication, :only => [ :new, :create, :cancel ]
   prepend_before_filter :authenticate_scope!, :only => [:edit, :update, :destroy]
-  include Devise::Controllers::InternalHelpers
 
   # GET /resource/sign_up
   def new
     resource = build_resource({})
-    respond_with_navigational(resource){ render_with_scope :new }
+    respond_with resource
   end
 
   # POST /resource
@@ -19,19 +18,19 @@ class Devise::RegistrationsController < ApplicationController
         sign_in(resource_name, resource)
         respond_with resource, :location => after_sign_up_path_for(resource)
       else
-        set_flash_message :notice, :inactive_signed_up, :reason => inactive_reason(resource) if is_navigational_format?
+        set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_navigational_format?
         expire_session_data_after_sign_in!
         respond_with resource, :location => after_inactive_sign_up_path_for(resource)
       end
     else
-      clean_up_passwords(resource)
-      respond_with_navigational(resource) { render_with_scope :new }
+      clean_up_passwords resource
+      respond_with resource
     end
   end
 
   # GET /resource/edit
   def edit
-    render_with_scope :edit
+    render :edit
   end
 
   # PUT /resource
@@ -41,12 +40,17 @@ class Devise::RegistrationsController < ApplicationController
     self.resource = resource_class.to_adapter.get!(send(:"current_#{resource_name}").to_key)
 
     if resource.update_with_password(params[resource_name])
-      set_flash_message :notice, :updated if is_navigational_format?
+      if is_navigational_format?
+        if resource.respond_to?(:pending_reconfirmation?) && resource.pending_reconfirmation?
+          flash_key = :update_needs_confirmation
+        end
+        set_flash_message :notice, flash_key || :updated
+      end
       sign_in resource_name, resource, :bypass => true
       respond_with resource, :location => after_update_path_for(resource)
     else
-      clean_up_passwords(resource)
-      respond_with_navigational(resource){ render_with_scope :edit }
+      clean_up_passwords resource
+      respond_with resource
     end
   end
 
@@ -70,40 +74,34 @@ class Devise::RegistrationsController < ApplicationController
 
   protected
 
-    # Build a devise resource passing in the session. Useful to move
-    # temporary session data to the newly created user.
-    def build_resource(hash=nil)
-      hash ||= params[resource_name] || {}
-      self.resource = resource_class.new_with_session(hash, session)
-    end
-
-    # The path used after sign up. You need to overwrite this method
-    # in your own RegistrationsController.
-    def after_sign_up_path_for(resource)
-      after_sign_in_path_for(resource)
-    end
+  # Build a devise resource passing in the session. Useful to move
+  # temporary session data to the newly created user.
+  def build_resource(hash=nil)
+    hash ||= params[resource_name] || {}
+    self.resource = resource_class.new_with_session(hash, session)
+  end
 
-    # Returns the inactive reason translated.
-    def inactive_reason(resource)
-      reason = resource.inactive_message.to_s
-      I18n.t("devise.registrations.reasons.#{reason}", :default => reason)
-    end
+  # The path used after sign up. You need to overwrite this method
+  # in your own RegistrationsController.
+  def after_sign_up_path_for(resource)
+    after_sign_in_path_for(resource)
+  end
 
-    # The path used after sign up for inactive accounts. You need to overwrite
-    # this method in your own RegistrationsController.
-    def after_inactive_sign_up_path_for(resource)
-      root_path
-    end
+  # The path used after sign up for inactive accounts. You need to overwrite
+  # this method in your own RegistrationsController.
+  def after_inactive_sign_up_path_for(resource)
+    respond_to?(:root_path) ? root_path : "/"
+  end
 
-    # The default url to be used after updating a resource. You need to overwrite
-    # this method in your own RegistrationsController.
-    def after_update_path_for(resource)
-      signed_in_root_path(resource)
-    end
+  # The default url to be used after updating a resource. You need to overwrite
+  # this method in your own RegistrationsController.
+  def after_update_path_for(resource)
+    signed_in_root_path(resource)
+  end
 
-    # Authenticates the current scope and gets the current resource from the session.
-    def authenticate_scope!
-      send(:"authenticate_#{resource_name}!", :force => true)
-      self.resource = send(:"current_#{resource_name}")
-    end
+  # Authenticates the current scope and gets the current resource from the session.
+  def authenticate_scope!
+    send(:"authenticate_#{resource_name}!", :force => true)
+    self.resource = send(:"current_#{resource_name}")
+  end
 end

data/app/controllers/devise/sessions_controller.rb

@@ -1,13 +1,12 @@
-class Devise::SessionsController < ApplicationController
+class Devise::SessionsController < DeviseController
   prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
   prepend_before_filter :allow_params_authentication!, :only => :create
-  include Devise::Controllers::InternalHelpers
 
   # GET /resource/sign_in
   def new
     resource = build_resource
     clean_up_passwords(resource)
-    respond_with_navigational(resource, stub_options(resource)){ render_with_scope :new }
+    respond_with(resource, stub_options(resource))
   end
 
   # POST /resource/sign_in

data/app/controllers/devise/unlocks_controller.rb

@@ -1,11 +1,9 @@
-class Devise::UnlocksController < ApplicationController
+class Devise::UnlocksController < DeviseController
   prepend_before_filter :require_no_authentication
-  include Devise::Controllers::InternalHelpers
 
   # GET /resource/unlock/new
   def new
     build_resource({})
-    render_with_scope :new
   end
 
   # POST /resource/unlock
@@ -15,7 +13,7 @@ class Devise::UnlocksController < ApplicationController
     if successfully_sent?(resource)
       respond_with({}, :location => new_session_path(resource_name))
     else
-      respond_with_navigational(resource){ render_with_scope :new }
+      respond_with(resource)
     end
   end
 
@@ -25,10 +23,9 @@ class Devise::UnlocksController < ApplicationController
 
     if resource.errors.empty?
       set_flash_message :notice, :unlocked if is_navigational_format?
-      sign_in(resource_name, resource)
-      respond_with_navigational(resource){ redirect_to after_sign_in_path_for(resource) }
+      respond_with_navigational(resource){ redirect_to new_session_path(resource) }
     else
-      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render_with_scope :new }
+      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
     end
   end
 end