[Checkins] SVN: cipher.session/ initial upload
Adam Groszer
cvs-admin at zope.org
Thu Apr 5 11:36:48 UTC 2012
Log message for revision 124962:
initial upload
Changed:
A cipher.session/branches/
A cipher.session/tags/
A cipher.session/trunk/
A cipher.session/trunk/CHANGES.txt
A cipher.session/trunk/COPYRIGHT.txt
A cipher.session/trunk/LICENSE.txt
A cipher.session/trunk/README.txt
A cipher.session/trunk/bootstrap.py
A cipher.session/trunk/buildout.cfg
A cipher.session/trunk/setup.py
A cipher.session/trunk/src/
A cipher.session/trunk/src/cipher/
A cipher.session/trunk/src/cipher/__init__.py
A cipher.session/trunk/src/cipher/session/
A cipher.session/trunk/src/cipher/session/__init__.py
A cipher.session/trunk/src/cipher/session/bootstrap.py
A cipher.session/trunk/src/cipher/session/bootstrap.zcml
A cipher.session/trunk/src/cipher/session/configure.zcml
A cipher.session/trunk/src/cipher/session/credentials.py
A cipher.session/trunk/src/cipher/session/interfaces.py
A cipher.session/trunk/src/cipher/session/session.py
A cipher.session/trunk/src/cipher/session/session.zcml
A cipher.session/trunk/src/cipher/session/tests/
A cipher.session/trunk/src/cipher/session/tests/__init__.py
A cipher.session/trunk/src/cipher/session/tests/test_appendict.py
A cipher.session/trunk/src/cipher/session/tests/test_data.py
A cipher.session/trunk/src/cipher/session/tests/test_session.py
A cipher.session/trunk/ztk-versions-1.1.2.cfg
-=-
Property changes on: cipher.session/trunk
___________________________________________________________________
Added: svn:ignore
+ .installed.cfg
bin
develop-eggs
parts
Added: cipher.session/trunk/CHANGES.txt
===================================================================
--- cipher.session/trunk/CHANGES.txt (rev 0)
+++ cipher.session/trunk/CHANGES.txt 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,26 @@
+=======
+CHANGES
+=======
+
+1.0.3 (unreleased)
+------------------
+
+- Initial release on pypi.
+
+
+1.0.2 (2012-03-19)
+------------------
+
+- Nothing changed yet.
+
+
+1.0.1 (2012-03-13)
+------------------
+
+- Added SessionCredentials
+
+
+1.0.0 (2012-03-13)
+------------------
+
+- Initial release as a separate package.
Property changes on: cipher.session/trunk/CHANGES.txt
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/COPYRIGHT.txt
===================================================================
--- cipher.session/trunk/COPYRIGHT.txt (rev 0)
+++ cipher.session/trunk/COPYRIGHT.txt 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1 @@
+Zope Foundation and Contributors
\ No newline at end of file
Property changes on: cipher.session/trunk/COPYRIGHT.txt
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/LICENSE.txt
===================================================================
--- cipher.session/trunk/LICENSE.txt (rev 0)
+++ cipher.session/trunk/LICENSE.txt 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,44 @@
+Zope Public License (ZPL) Version 2.1
+
+A copyright notice accompanies this license document that identifies the
+copyright holders.
+
+This license has been certified as open source. It has also been designated as
+GPL compatible by the Free Software Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions in source code must retain the accompanying copyright
+notice, this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying copyright
+notice, this list of conditions, and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to endorse or promote
+products derived from this software without prior written permission from the
+copyright holders.
+
+4. The right to distribute this software or to use it for any purpose does not
+give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+copyright
+holders. Use of them is covered by separate agreement with the copyright
+holders.
+
+5. If any files are modified, you must cause the modified files to carry
+prominent notices stating that you changed the files and the date of any
+change.
+
+Disclaimer
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Property changes on: cipher.session/trunk/LICENSE.txt
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/README.txt
===================================================================
--- cipher.session/trunk/README.txt (rev 0)
+++ cipher.session/trunk/README.txt 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1 @@
+A package to solve ZODB conflict problems of sessions for high traffic sites
\ No newline at end of file
Property changes on: cipher.session/trunk/README.txt
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/bootstrap.py
===================================================================
--- cipher.session/trunk/bootstrap.py (rev 0)
+++ cipher.session/trunk/bootstrap.py 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,259 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+The script accepts buildout command-line options, so you can
+use the -c option to specify an alternate configuration file.
+"""
+SETUPTOOLS_VERSION = '0.6c11'
+
+import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
+from optparse import OptionParser
+
+if sys.platform == 'win32':
+ def quote(c):
+ if ' ' in c:
+ return '"%s"' % c # work around spawn lamosity on windows
+ else:
+ return c
+else:
+ quote = str
+
+# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
+stdout, stderr = subprocess.Popen(
+ [sys.executable, '-Sc',
+ 'try:\n'
+ ' import ConfigParser\n'
+ 'except ImportError:\n'
+ ' print 1\n'
+ 'else:\n'
+ ' print 0\n'],
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+has_broken_dash_S = bool(int(stdout.strip()))
+
+# In order to be more robust in the face of system Pythons, we want to
+# run without site-packages loaded. This is somewhat tricky, in
+# particular because Python 2.6's distutils imports site, so starting
+# with the -S flag is not sufficient. However, we'll start with that:
+if not has_broken_dash_S and 'site' in sys.modules:
+ # We will restart with python -S.
+ args = sys.argv[:]
+ args[0:0] = [sys.executable, '-S']
+ args = map(quote, args)
+ os.execv(sys.executable, args)
+# Now we are running with -S. We'll get the clean sys.path, import site
+# because distutils will do it later, and then reset the path and clean
+# out any namespace packages from site-packages that might have been
+# loaded by .pth files.
+clean_path = sys.path[:]
+import site
+sys.path[:] = clean_path
+for k, v in sys.modules.items():
+ if (hasattr(v, '__path__') and
+ len(v.__path__)==1 and
+ not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
+ # This is a namespace package. Remove it.
+ sys.modules.pop(k)
+
+is_jython = sys.platform.startswith('java')
+
+setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
+distribute_source = 'http://python-distribute.org/distribute_setup.py'
+
+# parsing arguments
+def normalize_to_url(option, opt_str, value, parser):
+ if value:
+ if '://' not in value: # It doesn't smell like a URL.
+ value = 'file://%s' % (
+ urllib.pathname2url(
+ os.path.abspath(os.path.expanduser(value))),)
+ if opt_str == '--download-base' and not value.endswith('/'):
+ # Download base needs a trailing slash to make the world happy.
+ value += '/'
+ else:
+ value = None
+ name = opt_str[2:].replace('-', '_')
+ setattr(parser.values, name, value)
+
+usage = '''\
+[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
+
+Bootstraps a buildout-based project.
+
+Simply run this script in a directory containing a buildout.cfg, using the
+Python that you want bin/buildout to use.
+
+Note that by using --setup-source and --download-base to point to
+local resources, you can keep this script from going over the network.
+'''
+
+parser = OptionParser(usage=usage)
+parser.add_option("-v", "--version", dest="version",
+ help="use a specific zc.buildout version")
+parser.add_option("-d", "--distribute",
+ action="store_true", dest="use_distribute", default=False,
+ help="Use Distribute rather than Setuptools.")
+parser.add_option("--setup-source", action="callback", dest="setup_source",
+ callback=normalize_to_url, nargs=1, type="string",
+ help=("Specify a URL or file location for the setup file. "
+ "If you use Setuptools, this will default to " +
+ setuptools_source + "; if you use Distribute, this "
+ "will default to " + distribute_source +"."))
+parser.add_option("--download-base", action="callback", dest="download_base",
+ callback=normalize_to_url, nargs=1, type="string",
+ help=("Specify a URL or directory for downloading "
+ "zc.buildout and either Setuptools or Distribute. "
+ "Defaults to PyPI."))
+parser.add_option("--eggs",
+ help=("Specify a directory for storing eggs. Defaults to "
+ "a temporary directory that is deleted when the "
+ "bootstrap script completes."))
+parser.add_option("-t", "--accept-buildout-test-releases",
+ dest='accept_buildout_test_releases',
+ action="store_true", default=False,
+ help=("Normally, if you do not specify a --version, the "
+ "bootstrap script and buildout gets the newest "
+ "*final* versions of zc.buildout and its recipes and "
+ "extensions for you. If you use this flag, "
+ "bootstrap and buildout will get the newest releases "
+ "even if they are alphas or betas."))
+parser.add_option("-c", None, action="store", dest="config_file",
+ help=("Specify the path to the buildout configuration "
+ "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout's main function
+if options.config_file is not None:
+ args += ['-c', options.config_file]
+
+if options.eggs:
+ eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
+else:
+ eggs_dir = tempfile.mkdtemp()
+
+if options.setup_source is None:
+ if options.use_distribute:
+ options.setup_source = distribute_source
+ else:
+ options.setup_source = setuptools_source
+
+if options.accept_buildout_test_releases:
+ args.append('buildout:accept-buildout-test-releases=true')
+args.append('bootstrap')
+
+try:
+ import pkg_resources
+ import setuptools # A flag. Sometimes pkg_resources is installed alone.
+ if not hasattr(pkg_resources, '_distribute'):
+ raise ImportError
+except ImportError:
+ ez_code = urllib2.urlopen(
+ options.setup_source).read().replace('\r\n', '\n')
+ ez = {}
+ exec ez_code in ez
+ setup_args = dict(version=SETUPTOOLS_VERSION, to_dir=eggs_dir, download_delay=0)
+ if options.download_base:
+ setup_args['download_base'] = options.download_base
+ if options.use_distribute:
+ setup_args['no_fake'] = True
+ ez['use_setuptools'](**setup_args)
+ reload(sys.modules['pkg_resources'])
+ import pkg_resources
+ # This does not (always?) update the default working set. We will
+ # do it.
+ for path in sys.path:
+ if path not in pkg_resources.working_set.entries:
+ pkg_resources.working_set.add_entry(path)
+
+cmd = [quote(sys.executable),
+ '-c',
+ quote('from setuptools.command.easy_install import main; main()'),
+ '-mqNxd',
+ quote(eggs_dir)]
+
+if not has_broken_dash_S:
+ cmd.insert(1, '-S')
+
+find_links = options.download_base
+if not find_links:
+ find_links = os.environ.get('bootstrap-testing-find-links')
+if find_links:
+ cmd.extend(['-f', quote(find_links)])
+
+if options.use_distribute:
+ setup_requirement = 'distribute'
+else:
+ setup_requirement = 'setuptools'
+ws = pkg_resources.working_set
+setup_requirement_path = ws.find(
+ pkg_resources.Requirement.parse(setup_requirement)).location
+env = dict(
+ os.environ,
+ PYTHONPATH=setup_requirement_path)
+
+requirement = 'zc.buildout'
+version = options.version
+if version is None and not options.accept_buildout_test_releases:
+ # Figure out the most recent final version of zc.buildout.
+ import setuptools.package_index
+ _final_parts = '*final-', '*final'
+ def _final_version(parsed_version):
+ for part in parsed_version:
+ if (part[:1] == '*') and (part not in _final_parts):
+ return False
+ return True
+ index = setuptools.package_index.PackageIndex(
+ search_path=[setup_requirement_path])
+ if find_links:
+ index.add_find_links((find_links,))
+ req = pkg_resources.Requirement.parse(requirement)
+ if index.obtain(req) is not None:
+ best = []
+ bestv = None
+ for dist in index[req.project_name]:
+ distv = dist.parsed_version
+ if _final_version(distv):
+ if bestv is None or distv > bestv:
+ best = [dist]
+ bestv = distv
+ elif distv == bestv:
+ best.append(dist)
+ if best:
+ best.sort()
+ version = best[-1].version
+if version:
+ requirement = '=='.join((requirement, version))
+cmd.append(requirement)
+
+if is_jython:
+ import subprocess
+ exitcode = subprocess.Popen(cmd, env=env).wait()
+else: # Windows prefers this, apparently; otherwise we would prefer subprocess
+ exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
+if exitcode != 0:
+ sys.stdout.flush()
+ sys.stderr.flush()
+ print ("An error occurred when trying to install zc.buildout. "
+ "Look above this message for any errors that "
+ "were output by easy_install.")
+ sys.exit(exitcode)
+
+ws.add_entry(eggs_dir)
+ws.require(requirement)
+import zc.buildout.buildout
+zc.buildout.buildout.main(args)
+if not options.eggs: # clean up temporary egg directory
+ shutil.rmtree(eggs_dir)
Property changes on: cipher.session/trunk/bootstrap.py
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/buildout.cfg
===================================================================
--- cipher.session/trunk/buildout.cfg (rev 0)
+++ cipher.session/trunk/buildout.cfg 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,59 @@
+[buildout]
+extends = ztk-versions-1.1.2.cfg
+develop = .
+parts = test coverage coverage-test coverage2-test coverage-report python
+versions = versions
+newest = false
+include-site-packages = false
+unzip = true
+
+[python]
+recipe = z3c.recipe.scripts
+eggs = cipher.session [test]
+interpreter = python
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = ${python:eggs}
+defaults = ['--tests-pattern', '^f?tests$$', '-v']
+
+[coverage]
+recipe = z3c.recipe.scripts
+eggs = coverage
+
+[coverage-test]
+recipe = zc.recipe.testrunner
+eggs = ${python:eggs}
+defaults = ['--tests-pattern', '^f?tests$$', '-v']
+initialization =
+ # haaaaack because zc.testrunner 1.4.0 produces an _insane_ bin/test
+ # that cannot be run with bin/coverage run bin/test, or even
+ # bin/python bin/test
+ import coverage, atexit
+ c = coverage.coverage(data_file='../../../.coverage')
+ def _when_done(c=c): c.stop(), c.save()
+ atexit.register(_when_done)
+ c.start()
+
+[coverage2-test]
+recipe = zc.recipe.testrunner
+eggs = ${python:eggs}
+defaults = ['--coverage', '${buildout:directory}/coverage']
+
+[coverage-report]
+recipe = z3c.recipe.scripts
+eggs = z3c.coverage
+scripts = coveragereport=coverage-report
+arguments = ('${buildout:directory}/coverage',
+ '${buildout:directory}/coverage/report')
+
+
+[versions]
+# we're getting buildout 1.5.0 anyway from our bootstrap
+zc.buildout = 1.5.0
+
+# required by zc.buildout 1.5.0
+zc.recipe.egg = 1.3.0
+
+# required by zc.buildout 1.5.0 for include-site-packages=false to work
+zc.recipe.testrunner = 1.4.0
Property changes on: cipher.session/trunk/buildout.cfg
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/setup.py
===================================================================
--- cipher.session/trunk/setup.py (rev 0)
+++ cipher.session/trunk/setup.py 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,74 @@
+##############################################################################
+#
+# Copyright (c) Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Setup for cipher.session package
+"""
+import os
+from setuptools import setup, find_packages
+
+
+def read(*rnames):
+ return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+
+setup(
+ name='cipher.session',
+ version='1.0.3.dev0',
+ url="http://pypi.python.org/pypi/cipher.session/",
+ author='Zope Foundation and Contributors',
+ author_email='zope-dev at zope.org',
+ description="A ZODB Session handling implementation",
+ long_description=(
+ read('README.txt')
+ + '\n\n' +
+ read('CHANGES.txt')
+ ),
+ license='ZPL 2.1',
+ keywords="CipherHealth session",
+ classifiers=[
+ 'Development Status :: 4 - Beta',
+ 'Environment :: Web Environment',
+ 'Intended Audience :: Developers',
+ 'Programming Language :: Python',
+ 'Natural Language :: English',
+ 'Operating System :: OS Independent',
+ 'Topic :: Internet :: WWW/HTTP',
+ 'Framework :: Zope3'],
+ packages=find_packages('src'),
+ package_dir={'': 'src'},
+ extras_require=dict(
+ test=['zope.app.testing',
+ 'coverage',
+ ],
+ # ZODB bootstrap helper
+ bootstrap=[
+ 'transaction',
+ 'zope.processlifetime',
+ 'zope.app.appsetup',
+ ],
+ # conflict aware / comparable credentials
+ credentials=[
+ 'zope.pluggableauth',
+ ]
+ ),
+ install_requires=[
+ 'setuptools',
+ 'zope.interface',
+ 'zope.component',
+ 'zope.session',
+ 'zope.publisher',
+ 'repoze.session',
+
+ ],
+ include_package_data=True,
+ zip_safe=False
+ )
Property changes on: cipher.session/trunk/setup.py
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Property changes on: cipher.session/trunk/src
___________________________________________________________________
Added: svn:ignore
+ cipher.session.egg-info
Added: cipher.session/trunk/src/cipher/__init__.py
===================================================================
--- cipher.session/trunk/src/cipher/__init__.py (rev 0)
+++ cipher.session/trunk/src/cipher/__init__.py 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,2 @@
+import pkg_resources
+pkg_resources.declare_namespace(__name__)
Property changes on: cipher.session/trunk/src/cipher/__init__.py
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/src/cipher/session/__init__.py
===================================================================
--- cipher.session/trunk/src/cipher/session/__init__.py (rev 0)
+++ cipher.session/trunk/src/cipher/session/__init__.py 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1 @@
+#
\ No newline at end of file
Property changes on: cipher.session/trunk/src/cipher/session/__init__.py
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/src/cipher/session/bootstrap.py
===================================================================
--- cipher.session/trunk/src/cipher/session/bootstrap.py (rev 0)
+++ cipher.session/trunk/src/cipher/session/bootstrap.py 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,65 @@
+##############################################################################
+#
+# Copyright (c) Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""ZODB bootstrap helper
+"""
+
+# include bootstrap.zcml and off you go
+
+import transaction
+
+import zope.component
+from zope.app.appsetup.bootstrap import getInformationFromEvent
+from zope.app.appsetup.bootstrap import addConfigureUtility
+from zope.processlifetime import IDatabaseOpenedWithRoot
+
+from cipher.session import interfaces
+from cipher.session.session import SessionDataManager
+
+ at zope.component.adapter(IDatabaseOpenedWithRoot)
+def bootStrapSessionDataManager(event):
+ """Subscriber to the IDatabaseOpenedWithRoot
+
+ Constraints: this subscriber must be run after
+ zope.app.appsetup.session.bootStrapSubscriber
+
+ Adds/replaces the stock zope ISessionDataManager with our custom one.
+ """
+
+ db, connection, root, root_folder = getInformationFromEvent(event)
+ try:
+ sm = root_folder.getSiteManager()
+ utils = [reg for reg in sm.registeredUtilities()
+ if reg.provided.isOrExtends(interfaces.ISessionDataManager)
+ and reg.name == '']
+ if utils:
+ # check our assumptions: there's only one, registered as a component
+ assert len(utils) == 1
+ assert utils[0].factory is None
+ utility = utils[0].component
+ if isinstance(utility, SessionDataManager):
+ return # nothing to do
+ sm.unregisterUtility(utility, interfaces.ISessionDataManager)
+
+ addConfigureUtility(
+ root_folder,
+ interfaces.ISessionDataManager, 'SessionDataManager',
+ SessionDataManager,
+ )
+
+ transaction.commit()
+ except:
+ transaction.abort()
+ raise
+ finally:
+ connection.close()
Property changes on: cipher.session/trunk/src/cipher/session/bootstrap.py
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/src/cipher/session/bootstrap.zcml
===================================================================
--- cipher.session/trunk/src/cipher/session/bootstrap.zcml (rev 0)
+++ cipher.session/trunk/src/cipher/session/bootstrap.zcml 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,8 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:zcml="http://namespaces.zope.org/zcml">
+
+ <subscriber
+ handler=".bootstrap.bootStrapSessionDataManager"
+ />
+
+</configure>
Property changes on: cipher.session/trunk/src/cipher/session/bootstrap.zcml
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/src/cipher/session/configure.zcml
===================================================================
--- cipher.session/trunk/src/cipher/session/configure.zcml (rev 0)
+++ cipher.session/trunk/src/cipher/session/configure.zcml 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,6 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:zcml="http://namespaces.zope.org/zcml">
+
+ <include file="session.zcml" />
+
+</configure>
Property changes on: cipher.session/trunk/src/cipher/session/configure.zcml
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/src/cipher/session/credentials.py
===================================================================
--- cipher.session/trunk/src/cipher/session/credentials.py (rev 0)
+++ cipher.session/trunk/src/cipher/session/credentials.py 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,31 @@
+##############################################################################
+#
+# Copyright (c) Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""A SessionCredentials class that is comparable
+"""
+
+from zope.pluggableauth.plugins import session
+
+
+class SessionCredentials(session.SessionCredentials):
+ # this is for session.SessionData._p_resolveConflict
+ def __cmp__(self, other):
+ if isinstance(other, SessionCredentials):
+ if self.login == other.login and self.password == other.password:
+ return 0
+ return 1
+
+ # I want to be able to see in zodbbrowser the login+password
+ def __repr__(self):
+ return '%s (%s, %s)' % (self.__class__.__name__,
+ self.login, self.password)
Property changes on: cipher.session/trunk/src/cipher/session/credentials.py
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/src/cipher/session/interfaces.py
===================================================================
--- cipher.session/trunk/src/cipher/session/interfaces.py (rev 0)
+++ cipher.session/trunk/src/cipher/session/interfaces.py 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,35 @@
+##############################################################################
+#
+# Copyright (c) Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+import zope.schema
+
+import repoze.session.interfaces
+
+
+class ISessionDataManager(repoze.session.interfaces.ISessionDataManager):
+ timeout = zope.schema.Int(
+ title=u"Timeout (seconds)",
+ description=u"Number of seconds before data becomes stale and may "
+ u"be removed.",
+ default=1 * 60 * 60,
+ required=True,
+ min=1)
+ period = zope.schema.Int(
+ title=u"Timeout resolution (in seconds)",
+ default=10 * 60,
+ required=True,
+ min=0)
+
+ def clear():
+ """Clear all session data"""
Property changes on: cipher.session/trunk/src/cipher/session/interfaces.py
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/src/cipher/session/session.py
===================================================================
--- cipher.session/trunk/src/cipher/session/session.py (rev 0)
+++ cipher.session/trunk/src/cipher/session/session.py 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,199 @@
+##############################################################################
+#
+# Copyright (c) Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Session handling
+"""
+
+import pprint
+from types import InstanceType
+
+import zope.interface
+import zope.component
+from persistent import Persistent
+from persistent.mapping import PersistentMapping
+from ZODB.POSException import ConflictError
+from zope.publisher.interfaces import IRequest
+from zope.session.interfaces import ISession
+from zope.session.interfaces import IClientId
+
+from repoze.session import data
+from repoze.session import manager
+
+from cipher.session import interfaces
+
+
+class AppendOnlyDict(PersistentMapping):
+ # taken from Products.faster.appendict by Tres Seaver
+ def __setitem__(self, key, value):
+ if key in self.data:
+ raise TypeError("Can't update key in AppendOnlyDict!")
+ if isinstance(value, (dict, list)):
+ raise TypeError("Can't add non-persistent mutable subobjects!")
+ if type(value) is InstanceType:
+ if not isinstance(value, Persistent):
+ raise TypeError("Can't add non-persistent mutable subobjects!")
+ PersistentMapping.__setitem__(self, key, value)
+
+ def __delitem__(self, key):
+ if key in self.data:
+ raise TypeError("Can't delete from AppendOnlyDict!")
+ PersistentMapping.__delitem__(self, key)
+
+ def _p_resolveConflict(self, old, committed, new):
+ """ Resolve competing inserts.
+
+ o Return the resolved state.
+
+ o Raise ConflictError if deltas from old to old->committed collide
+ with those from old->new.
+ """
+ if not committed or not new:
+ raise ConflictError("Can't resolve 'clear'")
+
+ result = old.copy()
+ c_new = {}
+
+ for k, v in committed.items():
+ if k not in result:
+ c_new[k] = 1
+ result[k] = v
+
+ for k, v in new.items():
+ if k in old:
+ continue
+ if k in c_new:
+ raise ConflictError("Conflicting insert")
+ result[k] = v
+
+ return result
+
+
+class SessionData(data.SessionData):
+
+ # ZODB conflict resolution (to prevent write conflicts)
+ # parts/inspiration taken from repoze.session
+
+ def _getData(self, state):
+ # happens that PersistentMapping was refactored to 'data' instead
+ # of '_container', be forgiving about which item we use
+ try:
+ return state['_container']
+ except KeyError:
+ return state['data']
+
+ def _p_resolveConflict(self, old, committed, new):
+ # dict modifiers set '_lm'.
+ if committed['_lm'] != new['_lm']:
+ # we are operating against the PersistentMapping.__getstate__
+ # representation, which aliases '_container' to self.data.
+
+ # for this to work perfectly, you better put comparable items
+ # into the session
+ # if they don't compare naturally, add a __cmp__ method
+ cd = self._getData(committed)
+ nd = self._getData(new)
+
+ try:
+ neq = (cd != nd)
+ except ValueError:
+ neq = True
+ if neq:
+ msg = "Competing writes to session data: \n%s\n----\n%s" % (
+ pprint.pformat(cd),
+ pprint.pformat(nd))
+ raise ConflictError(msg)
+
+ resolved = dict(new)
+ invalid = committed.get('_iv') or new.get('_iv')
+ if invalid:
+ resolved['_iv'] = True
+ resolved['_lm'] = max(committed['_lm'], new['_lm'])
+ return resolved
+
+
+class SessionDataManager(manager.SessionDataManager):
+
+ zope.interface.implements(interfaces.ISessionDataManager)
+
+ # We have the option of using an OOBTree as a bucket type or an
+ # AppendOnlyDict as a bucket type. With an AppendDict in place,
+ # zero conflicts are generated when bucket nodes are mutated
+ # because we can resolve all conflicts. With an OOBTree in place,
+
+ _BUCKET_TYPE = AppendOnlyDict
+
+ # Make the data type replaceable for unit tests.
+ _DATA_TYPE = SessionData
+
+ def __init__(self):
+ # some init values from zope.session
+ super(SessionDataManager, self).__init__(1 * 60 * 60, 10 * 60)
+ # houston, we got a problem with ftests
+ self.nonlazy = True
+
+ def clear(self):
+ self.head = self.new_head(None)
+
+ def __getitem__(self, key):
+ return self.get(key)
+
+
+class Session(object):
+ """See zope.session.interfaces.ISession"""
+ zope.interface.implements(ISession)
+ zope.component.adapts(IRequest)
+
+ def __init__(self, request):
+ self.client_id = str(IClientId(request))
+
+ def _sdc(self, pkg_id):
+ return zope.component.getUtility(interfaces.ISessionDataManager)
+
+ def get(self, pkg_id, default=None):
+ sdc = self._sdc(pkg_id)
+
+ # flat SessionDataManager/SessionData structure
+ # still have a feeling that updating leaf objects won't update
+ # last_modified time
+ ident = (self.client_id, pkg_id)
+
+ return sdc.query(ident, default)
+
+ def __getitem__(self, pkg_id):
+ sdc = self._sdc(pkg_id)
+ ident = (self.client_id, pkg_id)
+ return sdc.get(ident)
+
+
+class TransientSession(object):
+ """Session data stored on the request
+ """
+
+ # handy if you do not want to store any session data at all
+ # for e.g. zope.Public views
+
+ def __init__(self, request):
+ self.client_id = str(IClientId(request))
+ self.request = request
+
+ def get(self, pkg_id, default=None):
+ sdc = self.request.annotations.get(pkg_id)
+ if sdc is None:
+ return default
+ ident = (self.client_id, pkg_id)
+ return sdc.get(ident, default)
+
+ def __getitem__(self, pkg_id):
+ sdc = self.request.annotations.setdefault(pkg_id, {})
+ ident = (self.client_id, pkg_id)
+ return sdc.setdefault(ident, {})
Property changes on: cipher.session/trunk/src/cipher/session/session.py
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/src/cipher/session/session.zcml
===================================================================
--- cipher.session/trunk/src/cipher/session/session.zcml (rev 0)
+++ cipher.session/trunk/src/cipher/session/session.zcml 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,84 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:zcml="http://namespaces.zope.org/zcml">
+
+ <!--XXX: split this into smaller parts? who knows who is using what?-->
+
+ <class class=".session.Session">
+ <allow interface="zope.session.interfaces.ISession" />
+ <implements interface="zope.traversing.interfaces.IPathAdapter" />
+ </class>
+
+ <class class=".session.TransientSession">
+ <allow interface="zope.session.interfaces.ISession" />
+ <implements interface="zope.traversing.interfaces.IPathAdapter" />
+ </class>
+
+ <class class="zope.session.http.CookieClientIdManager">
+ <implements
+ zcml:condition="installed zope.annotation"
+ interface="zope.annotation.interfaces.IAttributeAnnotatable"
+ />
+ <require
+ interface="zope.session.http.ICookieClientIdManager"
+ permission="zope.Public"
+ />
+ <require
+ set_schema="zope.session.http.ICookieClientIdManager"
+ permission="zope.ManageServices"
+ />
+ <require
+ interface="zope.location.ILocation"
+ permission="zope.Public"
+ />
+ <require
+ set_schema="zope.location.ILocation"
+ permission="zope.ManageServices"
+ />
+ </class>
+
+ <class class=".session.SessionDataManager">
+ <implements
+ zcml:condition="installed zope.annotation"
+ interface="zope.annotation.interfaces.IAttributeAnnotatable"
+ />
+ <require
+ interface=".interfaces.ISessionDataManager"
+ permission="zope.Public"
+ />
+ <require
+ set_schema=".interfaces.ISessionDataManager"
+ permission="zope.ManageServices"
+ />
+ <require
+ interface="zope.location.ILocation"
+ permission="zope.Public"
+ />
+ <require
+ set_schema="zope.location.ILocation"
+ permission="zope.ManageServices"
+ />
+ </class>
+
+ <class class="repoze.session.data.SessionData">
+ <allow interface="repoze.session.interfaces.ISessionData" />
+ </class>
+
+ <adapter
+ factory="zope.session.session.ClientId"
+ provides="zope.session.interfaces.IClientId"
+ permission="zope.Public"
+ />
+
+ <adapter
+ factory=".session.Session"
+ provides="zope.session.interfaces.ISession"
+ permission="zope.Public"
+ />
+
+ <adapter
+ factory=".session.Session"
+ provides="zope.traversing.interfaces.IPathAdapter"
+ name="session"
+ />
+
+</configure>
Property changes on: cipher.session/trunk/src/cipher/session/session.zcml
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Property changes on: cipher.session/trunk/src/cipher/session/tests/__init__.py
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/src/cipher/session/tests/test_appendict.py
===================================================================
--- cipher.session/trunk/src/cipher/session/tests/test_appendict.py (rev 0)
+++ cipher.session/trunk/src/cipher/session/tests/test_appendict.py 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,115 @@
+""" Unit tests for AppendOnlyDict taken from Products.faster.appendict
+"""
+import unittest
+
+
+class ApppendOnlyDictTests(unittest.TestCase):
+
+ def _getTargetClass(self):
+ from cipher.session.session import AppendOnlyDict
+ return AppendOnlyDict
+
+ def _makeOne(self, *args, **kw):
+ return self._getTargetClass()(*args, **kw)
+
+ def test___setitem__new_key_succeeds(self):
+ aod = self._makeOne()
+ self.assertEqual(len(aod.keys()), 0)
+ aod['somekey'] = 'somevalue'
+ self.assertEqual(len(aod.keys()), 1)
+ self.failUnless('somekey' in aod)
+
+ def test___setitem__existing_key_raises_TypeError(self):
+ aod = self._makeOne()
+ aod['somekey'] = 'somevalue'
+ self.assertRaises(TypeError, aod.__setitem__, 'somekey', 'anyvalue')
+
+ def test___delitem__non_existing_key_raises_KeyError(self):
+ aod = self._makeOne()
+ self.assertRaises(KeyError, aod.__delitem__, 'somekey')
+
+ def test___setitem__dict_value_raises_TypeError(self):
+ aod = self._makeOne()
+ mutable = {'a': 'A'}
+ self.assertRaises(TypeError, aod.__setitem__, 'somekey', mutable)
+
+ def test___setitem__list_value_raises_TypeError(self):
+ aod = self._makeOne()
+ mutable = ['A', 'B']
+ self.assertRaises(TypeError, aod.__setitem__, 'somekey', mutable)
+
+ def test___setitem__non_perssistent_inst_value_raises_TypeError(self):
+ aod = self._makeOne()
+ class Mutable:
+ pass
+ mutable = Mutable()
+ self.assertRaises(TypeError, aod.__setitem__, 'somekey', mutable)
+
+ def test___delitem__existing_key_raises_TypeError(self):
+ aod = self._makeOne()
+ aod['somekey'] = 'somevalue'
+ self.assertRaises(TypeError, aod.__delitem__, 'somekey')
+
+ def test__p_resolveConflict_wo_collistions(self):
+ old = {'a': 'A', 'b': 'B'}
+ committed = old.copy()
+ committed['c'] = 'C'
+ new = old.copy()
+ new['d'] = 'D'
+
+ merged = old.copy()
+ merged.update(committed)
+ merged.update(new)
+
+ aod = self._makeOne()
+ resolved = aod._p_resolveConflict(old, committed, new)
+ self.assertEqual(resolved, merged)
+
+ def test__p_resolveConflict_with_committed_clear(self):
+ from ZODB.POSException import ConflictError
+
+ old = {'a': 'A', 'b': 'B'}
+ committed = {}
+ new = old.copy()
+ new['c'] = 'C'
+ new['d'] = 'D'
+
+ aod = self._makeOne()
+ self.assertRaises(ConflictError,
+ aod._p_resolveConflict, old, committed, new)
+
+ def test__p_resolveConflict_with_new_clear(self):
+ from ZODB.POSException import ConflictError
+
+ old = {'a': 'A', 'b': 'B'}
+ committed = old.copy()
+ committed['c'] = 'C'
+ committed['d'] = 'D'
+ new = {}
+
+ aod = self._makeOne()
+ self.assertRaises(ConflictError,
+ aod._p_resolveConflict, old, committed, new)
+
+ def test__p_resolveConflict_with_collistions(self):
+ from ZODB.POSException import ConflictError
+
+ old = {'a': 'A', 'b': 'B'}
+ committed = old.copy()
+ committed['c'] = 'C'
+ new = old.copy()
+ new['c'] = 'ccc'
+ new['d'] = 'D'
+ aod = self._makeOne()
+
+ self.assertRaises(ConflictError,
+ aod._p_resolveConflict, old, committed, new)
+
+
+def test_suite():
+ return unittest.TestSuite((
+ unittest.makeSuite(ApppendOnlyDictTests),
+ ))
+
+if __name__ == '__main__':
+ unittest.main(defaultTest='test_suite')
Property changes on: cipher.session/trunk/src/cipher/session/tests/test_appendict.py
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/src/cipher/session/tests/test_data.py
===================================================================
--- cipher.session/trunk/src/cipher/session/tests/test_data.py (rev 0)
+++ cipher.session/trunk/src/cipher/session/tests/test_data.py 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,94 @@
+#tests taken from repoze.session
+
+import unittest
+
+
+class TestSessionData(unittest.TestCase):
+ def _getTargetClass(self):
+ from cipher.session.session import SessionData
+ return SessionData
+
+ def _makeOne(self, data=None):
+ return self._getTargetClass()(data)
+
+ def test_instance_implements_ISessionData(self):
+ from zope.interface.verify import verifyObject
+ from repoze.session.interfaces import ISessionData
+ verifyObject(ISessionData, self._makeOne())
+
+ def test_class_implements_ISessionData(self):
+ from zope.interface.verify import verifyClass
+ from repoze.session.interfaces import ISessionData
+ verifyClass(ISessionData, self._getTargetClass())
+
+ def test_p_resolveConflict_different_lm_different_container(self):
+ from ZODB.POSException import ConflictError
+ sdo = self._makeOne()
+ old = {}
+ committed = {'_lm':1, '_container':1}
+ new = {'_lm':2, '_container':2}
+ self.assertRaises(ConflictError, sdo._p_resolveConflict, old,
+ committed, new)
+
+ def test_p_resolveConflict_different_lm_same_container(self):
+ sdo = self._makeOne()
+ old = {}
+ committed = {'_lm':1, '_container':1, '_la':1, '_iv':1}
+ new = {'_lm':2, '_container':1, '_la':1, '_iv':1}
+ result = sdo._p_resolveConflict(old, committed, new)
+ self.assertEqual(
+ result,
+ {'_la': 1, '_container': 1, '_lm': 2, '_iv': True}
+ )
+
+ def test_p_resolveConflict_same_lm(self):
+ sdo = self._makeOne()
+ old = {}
+ committed = {'_lm':1, '_container':1}
+ new = {'_lm':1, '_container':1}
+ result = sdo._p_resolveConflict(old, committed, new)
+ self.assertEqual(result, {'_container': 1, '_lm': 1})
+
+
+ def test_p_resolveConflict_different_lm_different_data(self):
+ from ZODB.POSException import ConflictError
+ sdo = self._makeOne()
+ old = {}
+ committed = {'_lm':1, 'data':1}
+ new = {'_lm':2, 'data':2}
+ self.assertRaises(ConflictError, sdo._p_resolveConflict, old,
+ committed, new)
+
+ def test_p_resolveConflict_different_lm_same_data(self):
+ sdo = self._makeOne()
+ old = {}
+ committed = {'_lm':1, 'data':1, '_la':1, '_iv':1}
+ new = {'_lm':2, 'data':1, '_la':1, '_iv':1}
+ result = sdo._p_resolveConflict(old, committed, new)
+ self.assertEqual(
+ result,
+ {'_la': 1, 'data': 1, '_lm': 2, '_iv': True}
+ )
+
+ def test_p_resolveConflict_same_lm_data(self):
+ sdo = self._makeOne()
+ old = {}
+ committed = {'_lm':1, 'data':1}
+ new = {'_lm':1, 'data':1}
+ result = sdo._p_resolveConflict(old, committed, new)
+ self.assertEqual(result, {'data': 1, '_lm': 1})
+
+
+ def test_p_resolveConflict_different_lm_different_persistent(self):
+ from ZODB.POSException import ConflictError
+ from ZODB.ConflictResolution import PersistentReference
+
+ ref1 = PersistentReference('my_oid')
+ ref2 = PersistentReference(('another_oid', 'my_class'))
+
+ sdo = self._makeOne()
+ old = {}
+ committed = {'_lm':1, 'data':ref1}
+ new = {'_lm':2, 'data':ref2}
+ self.assertRaises(ConflictError, sdo._p_resolveConflict, old,
+ committed, new)
Property changes on: cipher.session/trunk/src/cipher/session/tests/test_data.py
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/src/cipher/session/tests/test_session.py
===================================================================
--- cipher.session/trunk/src/cipher/session/tests/test_session.py (rev 0)
+++ cipher.session/trunk/src/cipher/session/tests/test_session.py 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,158 @@
+"""`session` module tests"""
+
+from pprint import pprint
+import doctest
+import zope.component
+from zope.app.testing import setup
+from zope.publisher.browser import TestRequest
+from zope.publisher.interfaces import IRequest
+from zope.session.http import CookieClientIdManager
+from zope.session.interfaces import IClientId, IClientIdManager
+from zope.session.session import ClientId
+
+from cipher.session import interfaces
+from cipher.session import session
+
+
+class ClientIdStub(object):
+ zope.interface.implements(IClientId)
+ zope.component.adapts(IRequest)
+
+ def __init__(self, request):
+ pass
+
+ def __str__(self):
+ return 'foobar'
+
+
+class SessionDataStub(dict):
+ pass
+
+
+class SessionDataManagerStub(object):
+ zope.interface.implements(interfaces.ISessionDataManager)
+
+ def __init__(self):
+ self._data = {}
+
+ def query(self, key, default=None):
+ return self._data.get(key, default)
+
+ def get(self, key):
+ if key in self._data:
+ return self._data[key]
+ else:
+ new = SessionDataStub()
+ self._data[key] = new
+ return new
+
+ def __getitem__(self, key):
+ self.get(key)
+
+
+def doctest_TransientSession():
+ """class TransientSession: A session that stores data in the request
+ annotations.
+
+ >>> req = TestRequest()
+ >>> ses = session.TransientSession(req)
+
+ >>> ses.get('foo', 'DEFAULT')
+ 'DEFAULT'
+ >>> req.annotations
+ {}
+
+ >>> foo_data = ses['foo']
+ >>> foo_data['one'] = 1
+ >>> req.annotations
+ {'foo': {('...', 'foo'): {'one': 1}}}
+ """
+
+
+def doctest_Session():
+ r"""Test for utils.Session
+
+ >>> sdm = SessionDataManagerStub()
+ >>> zope.component.provideUtility(sdm)
+
+ >>> request = TestRequest()
+ >>> session = session.Session(request)
+
+ >>> data = session.get('a-package')
+ >>> data is None
+ True
+
+ >>> data = session['a-package']
+
+ >>> data['foo'] = 'bar'
+
+ >>> data2 = session.get('b-package')
+ >>> data2 is None
+ True
+
+ >>> session['a-package']
+ {'foo': 'bar'}
+
+ >>> pprint(sdm._data)
+ {('foobar', 'a-package'): {'foo': 'bar'}}
+
+ """
+
+
+def doctest_SessionDataManager():
+ r"""Test for utils.SessionDataManager
+
+ >>> sdc = session.SessionDataManager()
+
+ >>> sdc.timeout
+ 3600
+
+ >>> sdc.period
+ 600
+
+ >>> sdc.nonlazy
+ True
+
+ >>> sdc.head
+ <ListNode object at ... for ob (..., {}) with next None>
+
+ >>> data = sdc.get('foobar')
+ >>> data
+ {}
+
+ >>> data['foo'] = 'bar'
+
+ >>> sdc['foobar']
+ {'foo': 'bar'}
+
+ >>> sdc.head
+ <ListNode object at ... for ob (..., {'foobar': {'foo': 'bar'}}) with next None>
+
+ >>> sdc.clear()
+
+ >>> sdc.head
+ <ListNode object at ... for ob (..., {}) with next None>
+
+ """
+
+
+def setUp(test):
+ setup.placelessSetUp()
+ zope.component.provideAdapter(ClientIdStub)
+ #zope.component.provideAdapter(ClientId, (IRequest,), IClientId)
+ zope.component.provideUtility(CookieClientIdManager(), IClientIdManager)
+
+
+def tearDown(test):
+ setup.placelessTearDown()
+
+
+def test_suite():
+ return doctest.DocTestSuite(
+ setUp=setUp,
+ tearDown=tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|
+ doctest.ELLIPSIS|
+ doctest.REPORT_ONLY_FIRST_FAILURE
+ #|doctest.REPORT_NDIFF
+ )
Property changes on: cipher.session/trunk/src/cipher/session/tests/test_session.py
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
Added: cipher.session/trunk/ztk-versions-1.1.2.cfg
===================================================================
--- cipher.session/trunk/ztk-versions-1.1.2.cfg (rev 0)
+++ cipher.session/trunk/ztk-versions-1.1.2.cfg 2012-04-05 11:36:44 UTC (rev 124962)
@@ -0,0 +1,110 @@
+[versions]
+# ZTK
+zope.annotation = 3.5.0
+zope.applicationcontrol = 3.5.5
+zope.authentication = 3.7.1
+zope.broken = 3.6.0
+zope.browser = 1.3
+zope.browsermenu = 3.9.1
+zope.browserpage = 3.12.2
+zope.browserresource = 3.12.0
+zope.cachedescriptors = 3.5.1
+zope.catalog = 3.8.1
+zope.component = 3.10.0
+zope.componentvocabulary = 1.0.1
+zope.configuration = 3.7.4
+zope.container = 3.12.0
+zope.contentprovider = 3.7.2
+zope.contenttype = 3.5.3
+zope.copy = 3.5.0
+zope.copypastemove = 3.8.0
+zope.datetime = 3.4.0
+zope.deferredimport = 3.5.3
+zope.deprecation = 3.4.1
+zope.dottedname = 3.4.6
+zope.dublincore = 3.8.2
+zope.error = 3.7.2
+zope.event = 3.5.0-1
+zope.exceptions = 3.6.1
+zope.filerepresentation = 3.6.0
+zope.formlib = 4.0.5
+zope.hookable = 3.4.1
+zope.i18n = 3.7.4
+zope.i18nmessageid = 3.5.3
+zope.index = 3.6.1
+zope.interface = 3.6.3
+zope.intid = 3.7.2
+zope.keyreference = 3.6.2
+zope.lifecycleevent = 3.6.2
+zope.location = 3.9.0
+zope.login = 1.0.0
+zope.mimetype = 1.3.1
+zope.minmax = 1.1.2
+zope.pagetemplate = 3.5.2
+zope.password = 3.6.1
+zope.pluggableauth = 1.2
+zope.principalannotation = 3.6.1
+zope.principalregistry = 3.7.1
+zope.processlifetime = 1.0
+zope.proxy = 3.6.1
+zope.ptresource = 3.9.0
+zope.publisher = 3.12.6
+zope.ramcache = 1.0
+zope.schema = 3.7.1
+zope.security = 3.8.2
+zope.securitypolicy = 3.7.0
+zope.sendmail = 3.7.4
+zope.sequencesort = 3.4.0
+zope.server = 3.8.4
+zope.session = 3.9.4
+zope.site = 3.9.2
+zope.size = 3.4.1
+zope.structuredtext = 3.5.1
+zope.tal = 3.5.2
+zope.tales = 3.5.1
+zope.testing = 3.10.2
+zope.testrunner = 4.0.3
+zope.traversing = 3.14.0
+zope.viewlet = 3.7.2
+
+# Deprecating
+
+# Dependencies
+distribute = 0.6.19
+docutils = 0.7
+Jinja2 = 2.5.5
+mechanize = 0.2.5
+Paste = 1.7.5.1
+PasteDeploy = 1.3.4
+PasteScript = 1.7.3
+py = 1.4.3
+Pygments = 1.4
+python-gettext = 1.0
+python-subunit = 0.0.6
+pytz = 2011g
+RestrictedPython = 3.6.0
+setuptools = 0.6c11
+Sphinx = 1.0.7
+testtools = 0.9.10
+transaction = 1.1.1
+z3c.recipe.sphinxdoc = 0.0.8
+zc.buildout = 1.5.2
+zc.lockfile = 1.0.0
+ZConfig = 2.8.0
+zc.recipe.egg = 1.3.2
+zc.recipe.testrunner = 1.4.0
+zc.resourcelibrary = 1.3.2
+zdaemon = 2.0.4
+ZODB3 = 3.10.3
+zope.mkzeoinstance = 3.9.4
+
+# toolchain
+argparse = 1.1
+lxml = 2.2.8
+mr.developer = 1.17
+tl.eggdeps = 0.4
+z3c.checkversions = 0.4.1
+z3c.recipe.compattest = 0.13.1
+z3c.recipe.depgraph = 0.5
+z3c.recipe.scripts = 1.0.1
+zope.kgs = 1.2.0
\ No newline at end of file
Property changes on: cipher.session/trunk/ztk-versions-1.1.2.cfg
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision
Added: svn:eol-style
+ native
More information about the checkins
mailing list