Extract settings/application controller

app/controllers/settings/accounts_controller.rb

@@ -1,11 +1,9 @@
-class Settings::AccountsController < ApplicationController
-  before_filter :login_required
-
+class Settings::AccountsController < Settings::ApplicationController
   def show
   end
 
   def update
-    if current_user.update_attributes params.require(:user).permit(:username, :email, :name, :bio, :avatar, :remove_avatar)
+    if @user.update_attributes params.require(:user).permit(:username, :email, :name, :bio, :avatar, :remove_avatar)
       redirect_to settings_account_path
     else
       render :show

app/controllers/settings/application_controller.rb

@@ -0,0 +1,9 @@
+class Settings::ApplicationController < ApplicationController
+  before_filter :login_required, :set_user
+
+  private
+
+  def set_user
+    @user = current_user
+  end
+end

app/controllers/settings/passwords_controller.rb

@@ -1,13 +1,8 @@
-class Settings::PasswordsController < ApplicationController
-  before_filter :login_required
-
+class Settings::PasswordsController < Settings::ApplicationController
   def show
-    @user = current_user
   end
 
   def update
-    @user = current_user
-
     if @user.authenticate params[:current_password]
       if @user.update_attributes params.require(:user).permit(:password, :password_confirmation)
         redirect_to settings_password_url

app/views/settings/accounts/show.html.slim

@@ -5,7 +5,7 @@
         h3.panel-title
           | Account
       .panel-body
-        = form_for current_user, url: settings_account_path, html: { multipart: true, class: 'form-horizontal user-form' } do |f|
+        = form_for @user, url: settings_account_path, html: { multipart: true, class: 'form-horizontal user-form' } do |f|
           .form-group
             label.control-label.col-sm-3 Avatar
             .col-sm-6.user-image-uploader

test/controllers/settings/application_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class Settings::ApplicationControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end