Renamed Clearance::App:Controller::ApplicationController to Clearance…

…::Authentication

app/controllers/confirmations_controller.rb

@@ -1,6 +1,6 @@
 class ConfirmationsController < ActionController::Base
 
-  include Clearance::App::Controllers::ApplicationController
+  include Clearance::Authentication
 
   before_filter :forbid_confirmed_user,    :only => :new
   before_filter :forbid_missing_token,     :only => :new

app/controllers/passwords_controller.rb

@@ -1,6 +1,6 @@
 class PasswordsController < ActionController::Base
 
-  include Clearance::App::Controllers::ApplicationController
+  include Clearance::Authentication
 
   before_filter :forbid_missing_token,     :only => [:edit, :update]
   before_filter :forbid_non_existant_user, :only => [:edit, :update]

app/controllers/sessions_controller.rb

@@ -1,6 +1,6 @@
 class SessionsController < ActionController::Base
 
-  include Clearance::App::Controllers::ApplicationController
+  include Clearance::Authentication
 
   protect_from_forgery :except => :create
   filter_parameter_logging :password

app/controllers/users_controller.rb

@@ -1,6 +1,6 @@
 class UsersController < ActionController::Base
 
-  include Clearance::App::Controllers::ApplicationController
+  include Clearance::Authentication
 
   before_filter :redirect_to_root, :only => [:new, :create], :if => :signed_in?
   filter_parameter_logging :password

generators/clearance/clearance_generator.rb

@@ -13,8 +13,8 @@ def manifest
         file = "app/controllers/application.rb"
       end
       if File.exists?(file)
-        m.insert_into file, "include Clearance::App::Controllers::ApplicationController"
-      else
+        m.insert_into file, "include Clearance::Authentication"
+      else # will this file ever not exist?
         m.file file, file 
       end
 

generators/clearance/templates/app/controllers/application.rb

@@ -1,5 +1,5 @@
 class ApplicationController < ActionController::Base
   helper :all
   protect_from_forgery
-  include Clearance::App::Controllers::ApplicationController
+  include Clearance::Authentication
 end

lib/clearance.rb

@@ -1,6 +1,6 @@
 require 'clearance/lib/extensions/errors'
 require 'clearance/lib/extensions/rescue'
-require 'clearance/app/controllers/application_controller'
+require 'clearance/authentication'
 require 'clearance/app/models/clearance_mailer'
 require 'clearance/app/models/user'
 require 'clearance/test/functional/confirmations_controller_test'

lib/clearance/authentication.rb

@@ -0,0 +1,80 @@
+module Clearance
+  module Authentication
+
+    def self.included(controller)
+      controller.send(:include, InstanceMethods)
+
+      controller.class_eval do
+        helper_method :current_user
+        helper_method :signed_in?
+
+        hide_action :current_user, :signed_in?
+      end
+    end
+
+    module InstanceMethods
+      def current_user
+        @_current_user ||= (user_from_cookie || user_from_session)
+      end
+
+      def signed_in?
+        ! current_user.nil?
+      end
+
+      protected
+
+      def authenticate
+        deny_access unless signed_in?
+      end
+
+      def user_from_session
+        if session[:user_id]
+          return nil  unless user = User.find_by_id(session[:user_id])
+          return user if     user.email_confirmed?
+        end
+      end
+
+      def user_from_cookie
+        if token = cookies[:remember_token]
+          return nil  unless user = User.find_by_token(token)
+          return user if     user.remember?
+        end
+      end
+
+      def sign_user_in(user)
+        sign_in(user)
+      end
+
+      def sign_in(user)
+        if user
+          session[:user_id] = user.id
+        end
+      end
+
+      def redirect_back_or(default)
+        session[:return_to] ||= params[:return_to]
+        if session[:return_to]
+          redirect_to(session[:return_to])
+        else
+          redirect_to(default)
+        end
+        session[:return_to] = nil
+      end
+
+      def redirect_to_root
+        redirect_to root_url
+      end
+
+      def store_location
+        session[:return_to] = request.request_uri if request.get?
+      end
+
+      def deny_access(flash_message = nil, opts = {})
+        store_location
+        flash[:failure] = flash_message if flash_message
+        redirect_to new_session_url
+      end
+    end
+
+  end
+end

test/rails_root/app/controllers/application_controller.rb

@@ -1,5 +1,5 @@
 class ApplicationController < ActionController::Base
   helper :all
   protect_from_forgery
-  include Clearance::App::Controllers::ApplicationController
+  include Clearance::Authentication
 end