made underlying session.id accessible

CHANGES.txt

@@ -1,3 +1,9 @@
+Unreleased
+------------------
+[jvanasco]
+- add .id attribute to proxy underlying session id
+
+
 0.6.1 (2011-11-19)
 ------------------
 

CONTRIBUTORS.txt

@@ -121,3 +121,5 @@ Contributors
 - Blaise Laflamme, 2011/10/22
 
 - Michael Merickel, 2011/11/13
+
+- Jonathan Vanasco, 2013/03/26

pyramid_beaker/__init__.py

@@ -19,6 +19,7 @@ class PyramidBeakerSessionObject(SessionObject):
         _cookie_on_exception = _options.pop('cookie_on_exception', True)
         def __init__(self, request):
             SessionObject.__init__(self, request.environ, **self._options)
+
             def session_callback(request, response):
                 exception = getattr(request, 'exception', None)
                 if (exception is None or self._cookie_on_exception
@@ -29,6 +30,13 @@ def session_callback(request, response):
                         response.headerlist.append(
                             ('Set-Cookie', headers['cookie_out']))
             request.add_response_callback(session_callback)
+
+        @property
+        def id(self):
+            # this is as inspected in SessionObject.__init__
+            if self.__dict__['_params'].get('type') != 'cookie':
+                return self._session().id
+            return None
 
         # ISession API
 

pyramid_beaker/tests.py

@@ -163,6 +163,19 @@ def test_get_csrf_token_new(self):
         self.failUnless(token)
         self.assertEqual(session['_csrft_'], token)
 
+    def test_id_none_on_cookie_session(self):
+        request = DummyRequest()
+        session = self._makeOne(request,type='cookie')
+        session_id = session.id
+        self.assertIsNone(session_id)
+
+    def test_id_on_noncookie_session(self):
+        request = DummyRequest()
+        session = self._makeOne(request)
+        session_id = session.id
+        self.assertIsNotNone(session_id)
+
+
 class Test_session_factory_from_settings(unittest.TestCase):
     def _callFUT(self, settings):
         from pyramid_beaker import session_factory_from_settings