Commits

Lynn Rees  committed 746e559

- refactor

  • Participants
  • Parent commits 0a25016

Comments (0)

Files changed (10)

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>wsgize</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>

File .pydevproject

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.4</pydev_property>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/wsgize/dev</path>
+</pydev_pathproperty>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+</pydev_project>

File wsgize/__init__.py

+# Copyright (c) 2005, the Lawrence Journal-World
+# Copyright (c) 2006 L. C. Rees
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#    1. Redistributions of source code must retain the above copyright notice, 
+#       this list of conditions and the following disclaimer.
+#    
+#    2. Redistributions in binary form must reproduce the above copyright 
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#
+#    3. Neither the name of Django nor the names of its contributors may be used
+#       to endorse or promote products derived from this software without
+#       specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS 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 OWNER OR CONTRIBUTORS 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.
+
+'''Middleware for WSGI-enabling Python callables including:
+
+* An WSGI-compliant HTTP response generator
+* A wrapper and decorator for making non-WSGI Python functions, callable
+classes or methods into WSGI callables
+* A secondary WSGI dispatcher.
+* A decorator for autogenerating HTTP response codes, headers, and
+  compliant iterators for WSGI callables
+'''
+
+__author__ = 'L.C. Rees (lcrees-at-gmail.com)'
+__revision__ = '0.4'
+
+import sys
+from BaseHTTPServer import BaseHTTPRequestHandler as _bhrh
+
+__all__ = ['response', 'Wsgize', 'WsgiWrap', 'WsgiRoute', 'wsgize',
+    'wsgiwrap', 'route', 'register']
+
+# Secondary dispatcher routing table
+routes = dict()
+
+def register(name, application):
+    '''Registers a mapping of a name to an WSGI application.
+
+    @param pattern URL pattern
+    @param application WSGI application
+    '''
+    routes[name] = application
+
+def response(code):
+    '''Returns a WSGI response string.
+
+    code HTTP response (integer)
+    '''
+    return '%i %s' % (code, _bhrh.responses[code][0])
+
+def route(name):
+    '''Callable decorator for an application with the secondary dispatcher.'''
+    def decorator(application):
+        register(name, application)
+        return application
+    return decorator
+
+def wsgize(**kw):
+    '''Decorator for Wsgize.
+
+    @param application Application to decorate.
+    '''
+    def decorator(application):
+        return Wsgize(application, **kw)
+    return decorator
+
+def wsgiwrap(**kw):
+    '''Decorator for WsgiWrap.
+
+    @param application Application to decorate.
+    '''    
+    def decorator(application):
+        return WsgiWrap(application, **kw)
+    return decorator     
+
+    
+class Wsgize(object):
+
+    '''Autogenerates WSGI start_response callables, headers, and iterators for
+    a WSGI application.
+    '''    
+
+    def __init__(self, app, **kw):
+        self.application = app
+        # Get HTTP response
+        self.response = response(kw.get('response', 200))
+        # Generate headers
+        exheaders = kw.get('headers', dict())
+        headers = list((key, exheaders[key]) for key in exheaders)
+        self.headers = [('Content-type', kw.get('mime', 'text/html'))] + headers
+        self.exc_info = kw.get('exc_info', None)
+        # Key for kwargs passed through environ dictionary
+        self.kwargkey = kw.get('kwargs', 'wsgize.kwargs')
+        # Key for kargs passed through environ dictionary
+        self.argkey = kw.get('args', 'wsgize.args')
+        # Single URL vars key
+        self.key = kw.get('routing_args', 'wsgiorg.routing_args')
+
+    def __call__(self, environ, start_response):
+        '''Passes WSGI params to a callable and autogenrates the start_response.'''
+        data = self.application(environ, start_response)
+        start_response(self.response, self.headers, self.exc_info)
+        # Wrap strings in non-string iterator, ensuring its a normal ASCII string
+        if isinstance(data, basestring): data = [str(data)]
+        if hasattr(data, '__iter__'): return data
+        raise TypeError('Data returned by callable must be iterable.')        
+
+
+class WsgiWrap(Wsgize):
+
+    '''Makes arbitrary Python callables WSGI applications.'''     
+
+    def __call__(self, environ, start_response):
+        '''Makes a Python callable a WSGI callable.'''
+        # Try unified WSGI URL vars keyword
+        try:
+            args, kw = environ.get(self.key)
+        except ValueError:
+            # Get any arguments
+            args = environ.get(self.argkey, ())
+            # Get any keyword arguments
+            kw = environ.get(self.kwargkey, {})
+        # Pass args/kwargs to non-WSGI callable
+        if args and kw:
+            data = self.application(*args, **kw)
+        elif args:
+            data = self.application(*args)
+        elif kw:
+            data = self.application(**kw)        
+        start_response(self.response, self.headers, self.exc_info)
+        # Wrap strings in non-string iterator, ensuring its a normal ASCII string
+        if isinstance(data, basestring): data = [str(data)]
+        if hasattr(data, '__iter__'): return data
+        raise TypeError('Data returned by callable must be iterable.')
+
+
+class WsgiRoute(object):
+
+    '''Secondary WSGI dispatcher.'''
+
+    def __init__(self, table=None, **kw):
+        '''@param table Dictionary of names and callables.'''
+        # Secondary dispatcher routing table
+        if table is not None:
+            self.table = table
+        # Use external routing table
+        else:
+            self.table = routes
+        # Default module path
+        self.modpath = kw.get('modpath', '')
+        # Get key for callable
+        self.key = kw.get('key', 'wsgize.callable')
+
+    def __call__(self, environ, start_response):
+        '''Passes WSGI params to a callable based on a keyword.'''
+        callback = self.lookup(environ[self.key])
+        return callback(environ, start_response)
+
+    def getapp(self, app):
+        '''Loads a callable based on its name
+
+        @param app An WSGI application's name'''
+        # Add shortcut to module if present
+        if self.modpath != '': app = '.'.join([self.modpath, app])
+        dot = app.rindex('.')
+        # Import module
+        return getattr(__import__(app[:dot], '', '', ['']), app[dot+1:])
+
+    def lookup(self, kw):
+        '''Fetches an application based on keyword.
+
+        @param kw Keyword
+        '''
+        callback = self.table[kw]
+        if hasattr(callback, '__call__'):
+            return callback
+        else:
+            return self.getapp(callback)

File wsgize/ez_setup.py

-#!python
-"""Bootstrap setuptools installation
-
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
-
-    from ez_setup import use_setuptools
-    use_setuptools()
-
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
-the appropriate options to ``use_setuptools()``.
-
-This file can also be run as a script to install or upgrade setuptools.
-"""
-import sys
-DEFAULT_VERSION = "0.6c7"
-DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
-
-md5_data = {
-    'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
-    'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
-    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
-    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
-    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
-    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
-    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
-    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
-    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
-    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
-    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
-    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
-    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
-    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
-    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
-    'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
-    'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
-    'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
-    'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
-    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
-    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
-    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
-    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
-    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
-    'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
-    'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
-    'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
-}
-
-import sys, os
-
-def _validate_md5(egg_name, data):
-    if egg_name in md5_data:
-        from md5 import md5
-        digest = md5(data).hexdigest()
-        if digest != md5_data[egg_name]:
-            print >>sys.stderr, (
-                "md5 validation of %s failed!  (Possible download problem?)"
-                % egg_name
-            )
-            sys.exit(2)
-    return data
-
-
-def use_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    download_delay=15
-):
-    """Automatically find/download setuptools and make it available on sys.path
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end with
-    a '/').  `to_dir` is the directory where setuptools will be downloaded, if
-    it is not already available.  If `download_delay` is specified, it should
-    be the number of seconds that will be paused before initiating a download,
-    should one be required.  If an older version of setuptools is installed,
-    this routine will print a message to ``sys.stderr`` and raise SystemExit in
-    an attempt to abort the calling script.
-    """
-    try:
-        import setuptools
-        if setuptools.__version__ == '0.0.1':
-            print >>sys.stderr, (
-            "You have an obsolete version of setuptools installed.  Please\n"
-            "remove it from your system entirely before rerunning this script."
-            )
-            sys.exit(2)
-    except ImportError:
-        egg = download_setuptools(version, download_base, to_dir, download_delay)
-        sys.path.insert(0, egg)
-        import setuptools; setuptools.bootstrap_install_from = egg
-
-    import pkg_resources
-    try:
-        pkg_resources.require("setuptools>="+version)
-
-    except pkg_resources.VersionConflict, e:
-        # XXX could we install in a subprocess here?
-        print >>sys.stderr, (
-            "The required version of setuptools (>=%s) is not available, and\n"
-            "can't be installed while this script is running. Please install\n"
-            " a more recent version first.\n\n(Currently using %r)"
-        ) % (version, e.args[0])
-        sys.exit(2)
-
-def download_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    delay = 15
-):
-    """Download setuptools from a specified location and return its filename
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end
-    with a '/'). `to_dir` is the directory where the egg will be downloaded.
-    `delay` is the number of seconds to pause before an actual download attempt.
-    """
-    import urllib2, shutil
-    egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
-    url = download_base + egg_name
-    saveto = os.path.join(to_dir, egg_name)
-    src = dst = None
-    if not os.path.exists(saveto):  # Avoid repeated downloads
-        try:
-            from distutils import log
-            if delay:
-                log.warn("""
----------------------------------------------------------------------------
-This script requires setuptools version %s to run (even to display
-help).  I will attempt to download it for you (from
-%s), but
-you may need to enable firewall access for this script first.
-I will start the download in %d seconds.
-
-(Note: if this machine does not have network access, please obtain the file
-
-   %s
-
-and place it in this directory before rerunning this script.)
----------------------------------------------------------------------------""",
-                    version, download_base, delay, url
-                ); from time import sleep; sleep(delay)
-            log.warn("Downloading %s", url)
-            src = urllib2.urlopen(url)
-            # Read/write all in one block, so we don't create a corrupt file
-            # if the download is interrupted.
-            data = _validate_md5(egg_name, src.read())
-            dst = open(saveto,"wb"); dst.write(data)
-        finally:
-            if src: src.close()
-            if dst: dst.close()
-    return os.path.realpath(saveto)
-
-def main(argv, version=DEFAULT_VERSION):
-    """Install or upgrade setuptools and EasyInstall"""
-
-    try:
-        import setuptools
-    except ImportError:
-        egg = None
-        try:
-            egg = download_setuptools(version, delay=0)
-            sys.path.insert(0,egg)
-            from setuptools.command.easy_install import main
-            return main(list(argv)+[egg])   # we're done here
-        finally:
-            if egg and os.path.exists(egg):
-                os.unlink(egg)
-    else:
-        if setuptools.__version__ == '0.0.1':
-            # tell the user to uninstall obsolete version
-            use_setuptools(version)
-
-    req = "setuptools>="+version
-    import pkg_resources
-    try:
-        pkg_resources.require(req)
-    except pkg_resources.VersionConflict:
-        try:
-            from setuptools.command.easy_install import main
-        except ImportError:
-            from easy_install import main
-        main(list(argv)+[download_setuptools(delay=0)])
-        sys.exit(0) # try to force an exit
-    else:
-        if argv:
-            from setuptools.command.easy_install import main
-            main(argv)
-        else:
-            print "Setuptools version",version,"or greater has been installed."
-            print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
-
-
-
-def update_md5(filenames):
-    """Update our built-in md5 registry"""
-
-    import re
-    from md5 import md5
-
-    for name in filenames:
-        base = os.path.basename(name)
-        f = open(name,'rb')
-        md5_data[base] = md5(f.read()).hexdigest()
-        f.close()
-
-    data = ["    %r: %r,\n" % it for it in md5_data.items()]
-    data.sort()
-    repl = "".join(data)
-
-    import inspect
-    srcfile = inspect.getsourcefile(sys.modules[__name__])
-    f = open(srcfile, 'rb'); src = f.read(); f.close()
-
-    match = re.search("\nmd5_data = {\n([^}]+)}", src)
-    if not match:
-        print >>sys.stderr, "Internal error!"
-        sys.exit(2)
-
-    src = src[:match.start(1)] + repl + src[match.end(1):]
-    f = open(srcfile,'w')
-    f.write(src)
-    f.close()
-
-
-if __name__=='__main__':
-    if len(sys.argv)>2 and sys.argv[1]=='--md5update':
-        update_md5(sys.argv[2:])
-    else:
-        main(sys.argv[1:])
-
-
-
-
-

File wsgize/setup.py

-# Copyright (c) 2006 L. C. Rees.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1.  Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3.  Neither the name of the Portable Site Information Project nor the names
-# of its contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS 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 OWNER OR CONTRIBUTORS 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.
-
-'''setup - setuptools based setup for wsgize.'''
-
-import ez_setup
-ez_setup.use_setuptools()
-
-try:
-    from setuptools import setup
-except:
-    from distutils.core import setup
-
-setup(name='wsgize',
-      version='0.4',
-      description='''WSGI without the WSGI''',
-      long_description=''''Middleware for WSGI-enabling Python callables
-including:
-
-* Middleware that makes non-WSGI Python functions, callable classes, or
-methods into WSGI applications
-* Middleware that automatically handles generating WSGI-compliant HTTP
-response codes, headers, and compliant iterators
-* An HTTP response generator
-* A secondary WSGI dispatcher
-
-Examples:
-
-# Automatically handle HTTP response, header, and iterator generation
-
-@wsgize()
-def app(environ, start_response):
-    return 'Hello World'
-
-# Make a normal Python function into a WSGI application
-
-@wsgiwrap()
-def app(name):
-    return 'Hello ' % name
-''',
-      author='L. C. Rees',
-      author_email='lcrees@gmail.com',
-      license='BSD',
-      packages = ['wsgize'],
-      zip_safe = True,
-      keywords='WSGI dispatch middleware web HTTP decorators',
-      classifiers=['Development Status :: 4 - Beta',
-                   'Environment :: Web Environment',
-                   'Intended Audience :: Developers', 
-                   'License :: OSI Approved :: BSD License',
-                   'Natural Language :: English',
-                   'Operating System :: OS Independent',
-                   'Programming Language :: Python',
-                   'Topic :: Internet :: WWW/HTTP',
-                   'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
-                   'Topic :: Internet :: WWW/HTTP :: WSGI',
-                   'Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware'])

File wsgize/tests/__init__.py

Empty file added.

File wsgize/tests/test_wsgize.py

+# Copyright (c) 2005, the Lawrence Journal-World
+# Copyright (c) 2006 L. C. Rees
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#    1. Redistributions of source code must retain the above copyright notice, 
+#       this list of conditions and the following disclaimer.
+#    
+#    2. Redistributions in binary form must reproduce the above copyright 
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#
+#    3. Neither the name of Django nor the names of its contributors may be used
+#       to endorse or promote products derived from this software without
+#       specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS 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 OWNER OR CONTRIBUTORS 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.
+
+import unittest
+from wsgize import *
+
+
+class TestWsize(unittest.TestCase):
+
+    def test_wsgize_default(self):
+        def sr(start, hdr, exc=None): pass
+        @wsgize()
+        def app(environ, start_response):
+            return 'Test'
+        self.assertEqual(app({}, sr), ['Test'])
+
+    def test_wsgize_custom(self):
+        def sr(start, hdr, exc=None): pass
+        @wsgize(response=404, mime='text/plain')
+        def app(environ, start_response):
+            return 'Test'
+        self.assertEqual(app({}, sr), ['Test'])
+
+    def test_wsgiwrap_default(self):
+        def sr(start, hdr, exc=None): pass
+        @wsgiwrap()
+        def app(*arg, **kw):
+            return '%s %s%s' % (arg[0], kw['kw'], arg[1])
+        env = {'wsgiorg.routing_args':(('Hello', '!'), {'kw':'world'})}
+        self.assertEqual(app(env, sr), ['Hello world!'])
+
+    def test_wsgiwrap_both(self):
+        def sr(start, hdr, exc=None): pass
+        @wsgiwrap(response=404, mime='text/plain')
+        def app(*arg, **kw):
+            return '%s %s%s' % (arg[0], kw['kw'], arg[1])
+        env = {'wsgiorg.routing_args':(('Hello', '!'), {'kw':'world'})}
+        self.assertEqual(app(env, sr), ['Hello world!'])
+
+    def test_wsgiwrap_args(self):
+        def sr(start, hdr, exc=None): pass
+        @wsgiwrap(response=404, mime='text/plain')
+        def app(*arg):
+            return '%s world%s' % (arg[0], arg[1])
+        env = {'wsgiorg.routing_args':(('Hello', '!'), {})}
+        self.assertEqual(app(env, sr), ['Hello world!'])        
+            
+    def test_wsgiwrap_kwargs(self):
+        def sr(start, hdr, exc=None): pass
+        @wsgiwrap(response=404, mime='text/plain')
+        def app(**kw):
+            return 'Hello %s!' % kw['kw']
+        env = {'wsgiorg.routing_args':((), {'kw':'world'})}
+        self.assertEqual(app(env, sr), ['Hello world!'])
+
+    def test_route(self):
+        def sr(start, hdr, exc=None): pass
+        @route('next')        
+        @wsgiwrap()
+        def app2(**kw):
+            return 'Hello %s!' % kw['kw']
+        @wsgize()
+        def app1(env, start):
+            env['wsgiorg.routing_args'] = ((), {'kw':'world'})
+            env['wsgize.callable'] = 'next'
+            return WsgiRoute()(env, start)            
+        self.assertEqual(app1({}, sr), ['Hello world!']) 
+
+
+if __name__ == '__main__': unittest.main()    

File wsgize/wsgize/__init__.py

-# Copyright (c) 2005, the Lawrence Journal-World
-# Copyright (c) 2006 L. C. Rees
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-#    1. Redistributions of source code must retain the above copyright notice, 
-#       this list of conditions and the following disclaimer.
-#    
-#    2. Redistributions in binary form must reproduce the above copyright 
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#
-#    3. Neither the name of Django nor the names of its contributors may be used
-#       to endorse or promote products derived from this software without
-#       specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS 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 OWNER OR CONTRIBUTORS 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.
-
-'''Middleware for WSGI-enabling Python callables including:
-
-* An WSGI-compliant HTTP response generator
-* A wrapper and decorator for making non-WSGI Python functions, callable
-classes or methods into WSGI callables
-* A secondary WSGI dispatcher.
-* A decorator for autogenerating HTTP response codes, headers, and
-  compliant iterators for WSGI callables
-'''
-
-__author__ = 'L.C. Rees (lcrees-at-gmail.com)'
-__revision__ = '0.4'
-
-import sys
-from BaseHTTPServer import BaseHTTPRequestHandler as _bhrh
-
-__all__ = ['response', 'Wsgize', 'WsgiWrap', 'WsgiRoute', 'wsgize',
-    'wsgiwrap', 'route', 'register']
-
-# Secondary dispatcher routing table
-routes = dict()
-
-def register(name, application):
-    '''Registers a mapping of a name to an WSGI application.
-
-    @param pattern URL pattern
-    @param application WSGI application
-    '''
-    routes[name] = application
-
-def response(code):
-    '''Returns a WSGI response string.
-
-    code HTTP response (integer)
-    '''
-    return '%i %s' % (code, _bhrh.responses[code][0])
-
-def route(name):
-    '''Callable decorator for an application with the secondary dispatcher.'''
-    def decorator(application):
-        register(name, application)
-        return application
-    return decorator
-
-def wsgize(**kw):
-    '''Decorator for Wsgize.
-
-    @param application Application to decorate.
-    '''
-    def decorator(application):
-        return Wsgize(application, **kw)
-    return decorator
-
-def wsgiwrap(**kw):
-    '''Decorator for WsgiWrap.
-
-    @param application Application to decorate.
-    '''    
-    def decorator(application):
-        return WsgiWrap(application, **kw)
-    return decorator     
-
-    
-class Wsgize(object):
-
-    '''Autogenerates WSGI start_response callables, headers, and iterators for
-    a WSGI application.
-    '''    
-
-    def __init__(self, app, **kw):
-        self.application = app
-        # Get HTTP response
-        self.response = response(kw.get('response', 200))
-        # Generate headers
-        exheaders = kw.get('headers', dict())
-        headers = list((key, exheaders[key]) for key in exheaders)
-        self.headers = [('Content-type', kw.get('mime', 'text/html'))] + headers
-        self.exc_info = kw.get('exc_info', None)
-        # Key for kwargs passed through environ dictionary
-        self.kwargkey = kw.get('kwargs', 'wsgize.kwargs')
-        # Key for kargs passed through environ dictionary
-        self.argkey = kw.get('args', 'wsgize.args')
-        # Single URL vars key
-        self.key = kw.get('routing_args', 'wsgiorg.routing_args')
-
-    def __call__(self, environ, start_response):
-        '''Passes WSGI params to a callable and autogenrates the start_response.'''
-        data = self.application(environ, start_response)
-        start_response(self.response, self.headers, self.exc_info)
-        # Wrap strings in non-string iterator, ensuring its a normal ASCII string
-        if isinstance(data, basestring): data = [str(data)]
-        if hasattr(data, '__iter__'): return data
-        raise TypeError('Data returned by callable must be iterable.')        
-
-
-class WsgiWrap(Wsgize):
-
-    '''Makes arbitrary Python callables WSGI applications.'''     
-
-    def __call__(self, environ, start_response):
-        '''Makes a Python callable a WSGI callable.'''
-        # Try unified WSGI URL vars keyword
-        try:
-            args, kw = environ.get(self.key)
-        except ValueError:
-            # Get any arguments
-            args = environ.get(self.argkey, ())
-            # Get any keyword arguments
-            kw = environ.get(self.kwargkey, {})
-        # Pass args/kwargs to non-WSGI callable
-        if args and kw:
-            data = self.application(*args, **kw)
-        elif args:
-            data = self.application(*args)
-        elif kw:
-            data = self.application(**kw)        
-        start_response(self.response, self.headers, self.exc_info)
-        # Wrap strings in non-string iterator, ensuring its a normal ASCII string
-        if isinstance(data, basestring): data = [str(data)]
-        if hasattr(data, '__iter__'): return data
-        raise TypeError('Data returned by callable must be iterable.')
-
-
-class WsgiRoute(object):
-
-    '''Secondary WSGI dispatcher.'''
-
-    def __init__(self, table=None, **kw):
-        '''@param table Dictionary of names and callables.'''
-        # Secondary dispatcher routing table
-        if table is not None:
-            self.table = table
-        # Use external routing table
-        else:
-            self.table = routes
-        # Default module path
-        self.modpath = kw.get('modpath', '')
-        # Get key for callable
-        self.key = kw.get('key', 'wsgize.callable')
-
-    def __call__(self, environ, start_response):
-        '''Passes WSGI params to a callable based on a keyword.'''
-        callback = self.lookup(environ[self.key])
-        return callback(environ, start_response)
-
-    def getapp(self, app):
-        '''Loads a callable based on its name
-
-        @param app An WSGI application's name'''
-        # Add shortcut to module if present
-        if self.modpath != '': app = '.'.join([self.modpath, app])
-        dot = app.rindex('.')
-        # Import module
-        return getattr(__import__(app[:dot], '', '', ['']), app[dot+1:])
-
-    def lookup(self, kw):
-        '''Fetches an application based on keyword.
-
-        @param kw Keyword
-        '''
-        callback = self.table[kw]
-        if hasattr(callback, '__call__'):
-            return callback
-        else:
-            return self.getapp(callback)

File wsgize/wsgize/tests/__init__.py

Empty file removed.

File wsgize/wsgize/tests/test_wsgize.py

-# Copyright (c) 2005, the Lawrence Journal-World
-# Copyright (c) 2006 L. C. Rees
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-#    1. Redistributions of source code must retain the above copyright notice, 
-#       this list of conditions and the following disclaimer.
-#    
-#    2. Redistributions in binary form must reproduce the above copyright 
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#
-#    3. Neither the name of Django nor the names of its contributors may be used
-#       to endorse or promote products derived from this software without
-#       specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS 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 OWNER OR CONTRIBUTORS 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.
-
-import unittest
-from wsgize import *
-
-
-class TestWsize(unittest.TestCase):
-
-    def test_wsgize_default(self):
-        def sr(start, hdr, exc=None): pass
-        @wsgize()
-        def app(environ, start_response):
-            return 'Test'
-        self.assertEqual(app({}, sr), ['Test'])
-
-    def test_wsgize_custom(self):
-        def sr(start, hdr, exc=None): pass
-        @wsgize(response=404, mime='text/plain')
-        def app(environ, start_response):
-            return 'Test'
-        self.assertEqual(app({}, sr), ['Test'])
-
-    def test_wsgiwrap_default(self):
-        def sr(start, hdr, exc=None): pass
-        @wsgiwrap()
-        def app(*arg, **kw):
-            return '%s %s%s' % (arg[0], kw['kw'], arg[1])
-        env = {'wsgiorg.routing_args':(('Hello', '!'), {'kw':'world'})}
-        self.assertEqual(app(env, sr), ['Hello world!'])
-
-    def test_wsgiwrap_both(self):
-        def sr(start, hdr, exc=None): pass
-        @wsgiwrap(response=404, mime='text/plain')
-        def app(*arg, **kw):
-            return '%s %s%s' % (arg[0], kw['kw'], arg[1])
-        env = {'wsgiorg.routing_args':(('Hello', '!'), {'kw':'world'})}
-        self.assertEqual(app(env, sr), ['Hello world!'])
-
-    def test_wsgiwrap_args(self):
-        def sr(start, hdr, exc=None): pass
-        @wsgiwrap(response=404, mime='text/plain')
-        def app(*arg):
-            return '%s world%s' % (arg[0], arg[1])
-        env = {'wsgiorg.routing_args':(('Hello', '!'), {})}
-        self.assertEqual(app(env, sr), ['Hello world!'])        
-            
-    def test_wsgiwrap_kwargs(self):
-        def sr(start, hdr, exc=None): pass
-        @wsgiwrap(response=404, mime='text/plain')
-        def app(**kw):
-            return 'Hello %s!' % kw['kw']
-        env = {'wsgiorg.routing_args':((), {'kw':'world'})}
-        self.assertEqual(app(env, sr), ['Hello world!'])
-
-    def test_route(self):
-        def sr(start, hdr, exc=None): pass
-        @route('next')        
-        @wsgiwrap()
-        def app2(**kw):
-            return 'Hello %s!' % kw['kw']
-        @wsgize()
-        def app1(env, start):
-            env['wsgiorg.routing_args'] = ((), {'kw':'world'})
-            env['wsgize.callable'] = 'next'
-            return WsgiRoute()(env, start)            
-        self.assertEqual(app1({}, sr), ['Hello world!']) 
-
-
-if __name__ == '__main__': unittest.main()