@@ -14,7 +14,7 @@ class Clearance::ConfirmationsController < ApplicationController @user = ::User.find_by_id_and_token(params[:user_id], params[:token]) @user.confirm_email! - sign_user_in(@user) + sign_in(@user) flash_success_after_create redirect_to(url_after_create) end app/controllers/clearance/confirmations_controller.rb @@ -32,7 +32,7 @@ class Clearance::PasswordsController < ApplicationController if @user.update_password(params[:user][:password], params[:user][:password_confirmation]) @user.confirm_email! - sign_user_in(@user) + sign_in(@user) flash_success_after_update redirect_to(url_after_update) else app/controllers/clearance/passwords_controller.rb @@ -16,7 +16,7 @@ class Clearance::SessionsController < ApplicationController render :template => 'sessions/new', :status => :unauthorized else if @user.email_confirmed? - sign_user_in(@user) + sign_in(@user) remember(@user) if remember? flash_success_after_create redirect_back_or(url_after_create) app/controllers/clearance/sessions_controller.rb @@ -42,6 +42,7 @@ module Clearance end def sign_user_in(user) + warn "[DEPRECATION] sign_user_in: unnecessary. use sign_in(user) instead." sign_in(user) end @@ -78,7 +79,7 @@ module Clearance end def redirect_to_root - redirect_to root_url + redirect_to(root_url) end def store_location @@ -88,7 +89,7 @@ module Clearance def deny_access(flash_message = nil, opts = {}) store_location flash[:failure] = flash_message if flash_message - redirect_to new_session_url + redirect_to(new_session_url) end end lib/clearance/authentication.rb 1b494fadd06cfe9d58e364c2fbddf20761839c40 Dan Croak dcroak@thoughtbot.com http://github.com/thoughtbot/clearance/commit/4195760bedc0ecf08e38004db85e136b5f31dd1f 4195760bedc0ecf08e38004db85e136b5f31dd1f 2009-06-07T08:35:19-07:00 2009-06-07T08:35:19-07:00 deprecated sign_user_in. telling developers to use sign_in instead. 9a02e6549b9b251d196f57cd7e4e8da747c4d658 Dan Croak dcroak@thoughtbot.com