@@ -20,7 +20,7 @@ module TwitterAuth end def current_user - @current_user = + @current_user ||= if session[:user_id] User.find_by_id(session[:user_id]) elsif cookies[:remember_token] @@ -62,8 +62,8 @@ module TwitterAuth end def logout_keeping_session! - @current_user = nil session[:user_id] = nil + @current_user = nil cookies.delete(:remember_token) end end lib/twitter_auth/controller_extensions.rb @@ -151,7 +151,7 @@ describe TwitterAuthTestController do it 'should unset current_user' do controller.send(:current_user).should == @user get :logout_keeping_session_action - controller.send(:current_user).should be_nil + controller.send(:current_user).should be_false end it 'should unset the cookie' do spec/controllers/controller_extensions_spec.rb f5c1d1dae480e6ee1fb30438d994c7c487253199 Michael Bleigh michael@intridea.com http://github.com/mbleigh/twitter-auth/commit/bee8cfb78cb99a411622ee40018d0dff033e3a7e bee8cfb78cb99a411622ee40018d0dff033e3a7e 2009-05-07T09:52:32-07:00 2009-05-07T09:52:32-07:00 Small change to fix a broken logout spec. 730d33fae95d39377b44aad1697cd6a6bc31bfef Michael Bleigh michael@intridea.com