From 43acd452a458296615a87bcaa2b5aa7ac4c8538c Mon Sep 17 00:00:00 2001 From: Adam Cooke Date: Tue, 24 Feb 2015 14:13:48 +0000 Subject: [PATCH] whitespace --- ...13115205_add_indexes_to_authie_sessions.rb | 2 +- ...144120_add_parent_id_to_authie_sessions.rb | 2 +- lib/authie/config.rb | 8 ++++---- lib/authie/controller_extension.rb | 20 +++++++++---------- lib/authie/engine.rb | 10 +++++----- lib/authie/rack_controller.rb | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/db/migrate/20141013115205_add_indexes_to_authie_sessions.rb b/db/migrate/20141013115205_add_indexes_to_authie_sessions.rb index 0cccf4d..19d59aa 100644 --- a/db/migrate/20141013115205_add_indexes_to_authie_sessions.rb +++ b/db/migrate/20141013115205_add_indexes_to_authie_sessions.rb @@ -5,4 +5,4 @@ def change add_index :authie_sessions, :browser_id add_index :authie_sessions, :user_id end -end \ No newline at end of file +end diff --git a/db/migrate/20150109144120_add_parent_id_to_authie_sessions.rb b/db/migrate/20150109144120_add_parent_id_to_authie_sessions.rb index 53218e3..eecf60e 100644 --- a/db/migrate/20150109144120_add_parent_id_to_authie_sessions.rb +++ b/db/migrate/20150109144120_add_parent_id_to_authie_sessions.rb @@ -2,4 +2,4 @@ class AddParentIdToAuthieSessions < ActiveRecord::Migration def change add_column :authie_sessions, :parent_id, :integer end -end \ No newline at end of file +end diff --git a/lib/authie/config.rb b/lib/authie/config.rb index 0526112..ee1b3bd 100644 --- a/lib/authie/config.rb +++ b/lib/authie/config.rb @@ -1,18 +1,18 @@ module Authie class Config - + def session_inactivity_timeout @session_inactivity_timeout || 12.hours end attr_writer :session_inactivity_timeout - + def persistent_session_length @persistent_session_length || 2.months end attr_writer :persistent_session_length - + end - + def self.config @config ||= Config.new end diff --git a/lib/authie/controller_extension.rb b/lib/authie/controller_extension.rb index 85fb649..a9c3b5f 100644 --- a/lib/authie/controller_extension.rb +++ b/lib/authie/controller_extension.rb @@ -1,14 +1,14 @@ module Authie module ControllerExtension - + def self.included(base) base.helper_method :logged_in?, :current_user, :auth_session base.before_filter :set_browser_id, :touch_auth_session end - + private - - # Set a random browser ID for this browser. + + # Set a random browser ID for this browser. def set_browser_id until cookies[:browser_id] proposed_browser_id = SecureRandom.uuid @@ -17,19 +17,19 @@ def set_browser_id end end end - + # Touch the auth session on each request if logged in def touch_auth_session if logged_in? auth_session.touch! end end - + # Return the currently logged in user object def current_user auth_session.user end - + # Set the currently logged in user def current_user=(user) if user @@ -42,16 +42,16 @@ def current_user=(user) @current_user = nil end end - + # Is anyone currently logged in? def logged_in? auth_session.is_a?(Session) end - + # Return the currently logged in user session def auth_session @auth_session ||= Session.get_session(self) end - + end end diff --git a/lib/authie/engine.rb b/lib/authie/engine.rb index c62d8a1..9ca2064 100644 --- a/lib/authie/engine.rb +++ b/lib/authie/engine.rb @@ -1,21 +1,21 @@ module Authie class Engine < ::Rails::Engine - + initializer 'authie.initialize' do |app| config.paths["db/migrate"].expanded.each do |expanded_path| app.config.paths["db/migrate"] << expanded_path end - + ActiveSupport.on_load :active_record do require 'authie/session' end - + ActiveSupport.on_load :action_controller do require 'authie/controller_extension' include Authie::ControllerExtension end - + end - + end end diff --git a/lib/authie/rack_controller.rb b/lib/authie/rack_controller.rb index d5ab828..4035dc1 100644 --- a/lib/authie/rack_controller.rb +++ b/lib/authie/rack_controller.rb @@ -1,9 +1,9 @@ # If you're dealing with your authentication in a middleware and you only have # access to your rack environment, this will wrap around rack and make it look # close enough to an ActionController to work with Authie -# +# # Usage: -# +# # controller = Authie::RackController.new(@env) # controller.current_user = user @@ -22,7 +22,7 @@ def cookies @request.cookie_jar end - # Set a random browser ID for this browser. + # Set a random browser ID for this browser. def set_browser_id until cookies[:browser_id] proposed_browser_id = SecureRandom.uuid