github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-26 14:58:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Speed improvement for session_options. #2287. [skaes@web.de]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2527 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck
2005-10-11 01:53:31 +00:00
parent 9025e5d47f
commit 0efeeba780
2 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* Speed improvement for session_options. #2287. [skaes@web.de]
* Make cacheing binary files friendly with Windows. #1975. [Rich Olson]
* Convert boolean form options form the tag_helper. #809. [Michael Schuerig <michael@schuerig.de>]

49
actionpack/lib/action_controller/session_management.rb
View File

@@ -77,26 +77,36 @@ module ActionController #:nodoc:
write_inheritable_array("session_options", [options])
end
def session_options_for(request, action) #:nodoc:
options = {}
def cached_session_options
@session_options ||= read_inheritable_attribute("session_options") || []
end
action = action.to_s
(read_inheritable_attribute("session_options") || []).each do |opts|
next if opts[:if] && !opts[:if].call(request)
if opts[:only] && opts[:only].include?(action)
options.merge!(opts)
elsif opts[:except] && !opts[:except].include?(action)
options.merge!(opts)
elsif !opts[:only] && !opts[:except]
options.merge!(opts)
def session_options_for(request, action) #:nodoc:
if (session_options = cached_session_options).empty?
{}
else
options = {}
action = action.to_s
session_options.each do |opts|
next if opts[:if] && !opts[:if].call(request)
if opts[:only] && opts[:only].include?(action)
options.merge!(opts)
elsif opts[:except] && !opts[:except].include?(action)
options.merge!(opts)
elsif !opts[:only] && !opts[:except]
options.merge!(opts)
end
end
if options.empty? then options
else
options.delete :only
options.delete :except
options.delete :if
options[:disabled] ? false : options
end
end
options.delete :only
options.delete :except
options.delete :if
options[:disabled] ? false : options
end
end
@@ -108,8 +118,9 @@ module ActionController #:nodoc:
private
def clear_persistant_model_associations #:doc:
session = @session.instance_variable_get("@data")
session.each { |key, obj| obj.clear_association_cache if obj.respond_to?(:clear_association_cache) } if session
if session = @session.instance_variable_get("@data")
session.each { |key, obj| obj.clear_association_cache if obj.respond_to?(:clear_association_cache) }
end
end
end
end