Merge pull request #6453 from parndt/session_keys

Added session.keys and session.values back to ActionDispatch::Request::Session
rails · May 23, 2012 · cb92efb · cb92efb
2 parents 41cfe17 + 6ac458d
commit cb92efb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/actionpack/lib/action_dispatch/request/session.rb b/actionpack/lib/action_dispatch/request/session.rb
@@ -87,6 +87,14 @@ def has_key?(key)
       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

diff --git a/actionpack/test/dispatch/request/session_test.rb b/actionpack/test/dispatch/request/session_test.rb
@@ -36,6 +36,22 @@ def test_find
         assert_equal s, Session.find(env)
       end
 
+      def test_keys
+        env = {}
+        s = Session.create(store, env, {})
+        s['rails'] = 'ftw'
+        s['adequate'] = 'awesome'
+        assert_equal %w[rails adequate], s.keys
+      end
+
+      def test_values
+        env = {}
+        s = Session.create(store, env, {})
+        s['rails'] = 'ftw'
+        s['adequate'] = 'awesome'
+        assert_equal %w[ftw awesome], s.values
+      end
+
       private
       def store
         Class.new {