app/extenders/controllers/application_controller_extender.rb in mtwarden-6.0.1 vs app/extenders/controllers/application_controller_extender.rb in mtwarden-6.1.0

- old
+ new

@@ -1,38 +1,38 @@ -::ApplicationController.class_eval do - def current_account - @current_account ||= env['X-Houser-Object'] - end - helper_method :current_account - - def current_user - if user_signed_in? - @current_user ||= begin - user_id = env["warden"].user(:scope => :user) - Mtwarden::User.find_by_id(user_id) - end - end - end - helper_method :current_user - - def user_signed_in? - env["warden"].authenticated?(:user) - end - helper_method :user_signed_in? - - def authenticate_user! - unless user_signed_in? - flash[:info] = "Please sign in." - redirect_to '/sign_in' - end - end - - def force_authentication!(user) - env["warden"].set_user(user, :scope => :user) - end - - def owner? - current_account.owner?(current_user) - end - helper_method :owner? - -end +::ApplicationController.class_eval do + def current_account + @current_account ||= env['X-Houser-Object'] + end + helper_method :current_account + + def current_user + if user_signed_in? + @current_user ||= begin + user_id = env["warden"].user(:scope => :user) + Mtwarden::User.find_by_id(user_id) + end + end + end + helper_method :current_user + + def user_signed_in? + env["warden"].authenticated?(:user) + end + helper_method :user_signed_in? + + def authenticate_user! + unless user_signed_in? + flash[:info] = "Please sign in." + redirect_to '/sign_in' + end + end + + def force_authentication!(user) + env["warden"].set_user(user, :scope => :user) + end + + def owner? + current_account.owner?(current_user) + end + helper_method :owner? + +end