Skip to content

Add skip options #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/auto/session/timeout/version.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Auto
module Session
module Timeout
VERSION = "0.9.5"
VERSION = "0.9.6"
end
end
end
34 changes: 18 additions & 16 deletions lib/auto_session_timeout.rb
Original file line number Diff line number Diff line change
@@ -1,47 +1,49 @@
module AutoSessionTimeout

def self.included(controller)
controller.extend ClassMethods
controller.hide_action :render_auto_session_timeout
end

module ClassMethods
def auto_session_timeout(seconds=nil)
def auto_session_timeout(seconds=nil, **options)
prepend_before_filter do |c|
if c.session[:auto_session_expires_at] && c.session[:auto_session_expires_at] < Time.now
c.send :reset_session
else
unless c.request.original_url.start_with?(c.send(:active_url))
offset = seconds || (current_user.respond_to?(:auto_timeout) ? current_user.auto_timeout : nil)
c.session[:auto_session_expires_at] = Time.now + offset if offset && offset > 0
unless options[:skip].present? && options[:skip].respond_to?(:call) ? options[:skip].call(c) : options[:skip]
if c.session[:auto_session_expires_at] && c.session[:auto_session_expires_at] < Time.now
c.send :reset_session
else
unless c.request.original_url.start_with?(c.send(:active_url))
offset = seconds || (current_user.respond_to?(:auto_timeout) ? current_user.auto_timeout : nil)
c.session[:auto_session_expires_at] = Time.now + offset if offset && offset > 0
end
end
end
end
end

def auto_session_timeout_actions
define_method(:active) { render_session_status }
define_method(:timeout) { render_session_timeout }
end
end

def render_session_status(options={})
devise_model = options[:devise_model] || "user"
devise_model = eval("current_#{devise_model}")
devise_model = eval("current_#{devise_model}")
# clear etags to prevent caching
response.headers["Etag"] = ""
response.headers["Etag"] = ""
render text: !!devise_model, status: 200
end

def render_session_timeout(options={})
path = options[:path] || "/login"
flash_name = options[:flash_name] || "notice"
flash_message = options[:flash_message] || "Your session has timed out."

eval("flash[:#{flash_name}] = \"#{flash_message}\"")
redirect_to path
redirect_to path
end

end

ActionController::Base.send :include, AutoSessionTimeout