Skip to content

update gem for rails5 #8

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.

Sign up for GitHub

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
rekero wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update gem for rails5 #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 10 additions & 15 deletions lib/session_off.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ def self.included(base)
clazz.send(:remove_method, 'session') if clazz

include InstanceMethods

alias_method_chain(:process, :session_off)
# yet another Rails 2.3 specific hook :
alias_method_chain(:assign_shortcuts, :session_off) rescue NameError

end
end

Expand Down Expand Up @@ -164,43 +159,43 @@ def disable_session
if defined? AbstractController::Base # Rails 3+

if defined? ActionDispatch::Request::Session::Options # Rails 4.x
def process_with_session_off(action, *args)

def process(action, *args)
session_options = self.class.session_options_for(request, action)
request_session_options = request.session_options
if request_session_options.is_a?(ActionDispatch::Request::Session::Options)
request_session_options = request_session_options.instance_variable_get(:@delegate)
end
request_session_options.merge! session_options
disable_session if session_options[:disabled]
process_without_session_off(action, *args)
super(action, *args)
end

else

def process_with_session_off(action, *args)
def process(action, *args)
session_options = self.class.session_options_for(request, action)
request.session_options.merge! session_options
disable_session if session_options[:disabled]
process_without_session_off(action, *args)
super(action, *args)
end

end

else # Rails 2.3.x

def process_with_session_off(request, response, method = :perform_action, *args)
def process(request, response, method = :perform_action, *args)
action = request.parameters["action"] || :index
session_options = self.class.session_options_for(request, action)
request.session_options.merge! session_options
#@_session = false if session_options[:disabled]
process_without_session_off(request, response, method, *args)
super(request, response, method, *args)
end

private

def assign_shortcuts_with_session_off(request, response)
assign_shortcuts_without_session_off(request, response)
def assign_shortcuts(request, response)
super(request, response) rescue NameError
disable_session if request.session_options[:disabled]
end

Expand All @@ -211,4 +206,4 @@ def assign_shortcuts_with_session_off(request, response)
end

require 'action_controller/base'
ActionController::Base.send :include, SessionOff
ActionController::Base.send :include, SessionOff