aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-05-22 22:49:14 -0700
committerJosé Valim <jose.valim@gmail.com>2012-05-22 22:49:14 -0700
commitcb92efbf0463f3b6dc0456a497556d5b414fb0e8 (patch)
treea0bb0a1bf3d776eaeaeee69c8e6fb78439ce7a96 /actionpack/lib/action_dispatch
parent41cfe17658e91a0b52cc99c849ab8a45cea13f4b (diff)
parent6ac458d3417cc3dff064ddf0167d3afff6043cf9 (diff)
downloadrails-cb92efbf0463f3b6dc0456a497556d5b414fb0e8.tar.gz
rails-cb92efbf0463f3b6dc0456a497556d5b414fb0e8.tar.bz2
rails-cb92efbf0463f3b6dc0456a497556d5b414fb0e8.zip
Merge pull request #6453 from parndt/session_keys
Added session.keys and session.values back to ActionDispatch::Request::Session
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/request/session.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/request/session.rb b/actionpack/lib/action_dispatch/request/session.rb
index 4ad7071820..d8bcc28613 100644
--- a/actionpack/lib/action_dispatch/request/session.rb
+++ b/actionpack/lib/action_dispatch/request/session.rb
@@ -87,6 +87,14 @@ module ActionDispatch
alias :key? :has_key?
alias :include? :has_key?
+ def keys
+ @delegate.keys
+ end
+
+ def values
+ @delegate.values
+ end
+
def []=(key, value)
load_for_write!
@delegate[key.to_s] = value