From 80619928a8b15c8b76190b145abb8eec9af53c62 Mon Sep 17 00:00:00 2001
From: Marcin Kulik <marcin.kulik@gmail.com>
Date: Sat, 8 Dec 2012 20:39:08 +0100
Subject: [PATCH] Decorate current_user

---
 app/controllers/application_controller.rb | 10 ++++------
 app/views/layouts/_session_info.html.erb  |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7e29e47..d54601c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -10,14 +10,12 @@ class ApplicationController < ActionController::Base
   rescue_from Unauthorized, :with => :unauthorized
   rescue_from Forbidden, :with => :forbidden
 
-  helper_method :current_user, :current_user_decorated
+  helper_method :current_user
 
   def current_user
-    @current_user ||= User.find_by_id(session[:user_id]) if session[:user_id]
-  end
-
-  def current_user_decorated
-    @current_user_decorated ||= UserDecorator.new(current_user)
+    if session[:user_id]
+      @current_user ||= UserDecorator.find_by_id(session[:user_id])
+    end
   end
 
   def current_user=(user)
diff --git a/app/views/layouts/_session_info.html.erb b/app/views/layouts/_session_info.html.erb
index bcb6042..7500abf 100644
--- a/app/views/layouts/_session_info.html.erb
+++ b/app/views/layouts/_session_info.html.erb
@@ -1,7 +1,7 @@
 <ul class="session-info">
   <% if current_user %>
     <li class="username">
-      <%= current_user_decorated.avatar_profile_link(:title => '') %>
+      <%= current_user.avatar_profile_link(:title => '') %>
       <%= link_to "~#{current_user.nickname}", profile_path(current_user) %>
 
       <ul class="menu">