Webware for Python

Author: asaddi
Date: 2005-04-04 03:58:25 -0600 (Mon, 04 Apr 2005)
New Revision: 2296

Modified:
   WSGIKit/trunk/wsgikit/lint.py
Log:
check_environ() wasn't being called. Also, allow REQUEST_METHOD to be HEAD.


Modified: WSGIKit/trunk/wsgikit/lint.py
===================================================================
--- WSGIKit/trunk/wsgikit/lint.py	2005-04-04 09:51:39 UTC (rev 2295)
+++ WSGIKit/trunk/wsgikit/lint.py	2005-04-04 09:58:25 UTC (rev 2296)
@@ -17,6 +17,8 @@
         assert not kw, "No keyword arguments allowed"
         environ, start_response = args
 
+        check_environ(environ)
+
         def start_response_wrapper(*args, **kw):
             assert len(args) == 2 or len(args) == 3, "Invalid number of arguments: %s" % args
             assert not kw, "No keyword arguments allowed"
@@ -171,7 +173,7 @@
     check_errors(environ['wsgi.errors'])
 
     # @@: these need filling out:
-    assert environ['REQUEST_METHOD'] in ('GET', 'POST'), "Unknown REQUEST_METHOD: %r" % environ['REQUEST_METHOD']
+    assert environ['REQUEST_METHOD'] in ('GET', 'HEAD', 'POST'), "Unknown REQUEST_METHOD: %r" % environ['REQUEST_METHOD']
 
     assert (not environ.get('SCRIPT_NAME')
             or environ['SCRIPT_NAME'].startswith('/')), \

Author: asaddi
Date: 2005-04-04 03:51:39 -0600 (Mon, 04 Apr 2005)
New Revision: 2295

Added:
   WSGIKit/trunk/wsgikit/server_script_template.py
Modified:
   WSGIKit/trunk/wsgikit/server.py
Log:
Implement --server=cgi option.


Modified: WSGIKit/trunk/wsgikit/server.py
===================================================================
--- WSGIKit/trunk/wsgikit/server.py	2005-04-04 09:49:01 UTC (rev 2294)
+++ WSGIKit/trunk/wsgikit/server.py	2005-04-04 09:51:39 UTC (rev 2295)
@@ -66,6 +66,9 @@
 
 reloader_environ_key = 'WSGI_RELOADER_SHOULD_RUN'
 
+default_config_fn = os.path.join(os.path.dirname(__file__),
+                                 'default_config.conf')
+
 def load_commandline(args):
     conf = Config()
     # We use conf.verbose early, so we set it now:
@@ -76,8 +79,6 @@
     if conf.get('help'):
         print help()
         return 0
-    default_config_fn = os.path.join(os.path.dirname(__file__),
-                                     'default_config.conf')
     load_conf(conf, default_config_fn)
     reloader.watch_file(default_config_fn)
     if not conf.get('no_server_conf') and os.path.exists('server.conf'):
@@ -156,9 +157,34 @@
 
 servers['wsgiutils'] = wsgiutils_serve
 
-def cgi_serve(conf):
-    raise NotImplemented
+def cgi_serve(conf, app):
+    replacements = {}
+    replacements['default_config_fn'] = os.path.abspath(default_config_fn)
 
+    # Ideally, other_conf should be any options that came from the
+    # command-line.
+    # @@: This assumes too much about the ordering of namespaces.
+    other_conf = dict(conf.namespaces[-2])
+    # Not a good idea to let 'verbose' through, but this doesn't really
+    # stop any sourced configs from setting it either...
+    if other_conf.has_key('verbose'):
+        del other_conf['verbose']
+    replacements['other_conf'] = other_conf
+
+    template_fn = os.path.join(os.path.dirname(__file__),
+                               'server_script_template.py')
+    template = open(template_fn).read()
+    for name, value in replacements.items():
+        template = template.replace('@@' + name + '@@', repr(value))
+
+    print "#!%s" % sys.executable
+    print template
+    print "if __name__ == '__main__':"
+    print "    from wsgikit.cgiserver import run_with_cgi"
+    print "    run_with_cgi(app)"
+
+servers['cgi'] = cgi_serve
+
 def make_app(conf):
     if conf.get('webkit_dir'):
         app = wsgiwebkit.webkit(conf['webkit_dir'], use_lint=conf.get('lint'))

Added: WSGIKit/trunk/wsgikit/server_script_template.py
===================================================================
--- WSGIKit/trunk/wsgikit/server_script_template.py	2005-04-04 09:49:01 UTC (rev 2294)
+++ WSGIKit/trunk/wsgikit/server_script_template.py	2005-04-04 09:51:39 UTC (rev 2295)
@@ -0,0 +1,19 @@
+import os
+from wsgikit import server
+from wsgikit.pyconfig import Config
+from wsgikit.configmiddleware import config_middleware
+from wsgikit.webkit import wsgiwebkit
+
+conf = Config()
+conf.load_dict(server.default_ops, default=True)
+conf.load_dict(@@other_conf@@)
+server.load_conf(conf, @@default_config_fn@@)
+if not conf.get('no_server_conf') and os.path.exists('server.conf'):
+    server.load_conf(conf, 'server.conf')
+if conf.get('config_file'):
+    server.load_conf(conf, conf['config_file'])
+if conf.get('sys_path'):
+    server.update_sys_path(conf['sys_path'], conf['verbose'])
+
+app = wsgiwebkit.webkit(conf['webkit_dir'], use_lint=conf.get('lint'))
+app = config_middleware(app, conf)

Author: asaddi
Date: 2005-04-04 03:49:01 -0600 (Mon, 04 Apr 2005)
New Revision: 2294

Modified:
   WSGIKit/trunk/wsgikit/cgiserver.py
Log:
Better compliance with WSGI. Also, add automatic determination of
Content-Length when possible.


Modified: WSGIKit/trunk/wsgikit/cgiserver.py
===================================================================
--- WSGIKit/trunk/wsgikit/cgiserver.py	2005-04-04 02:18:01 UTC (rev 2293)
+++ WSGIKit/trunk/wsgikit/cgiserver.py	2005-04-04 09:49:01 UTC (rev 2294)
@@ -9,9 +9,10 @@
 Typically you will write a CGI script like::
 
     #!/usr/bin/env python
-    from wsgiserver.cgi import run_with_cgi
-    import myapplication
-    run_with_cgi(myapplication)
+    from wsgikit.cgiserver import run_with_cgi
+    # Assuming app is your WSGI application object...
+    from myapplication import app
+    run_with_cgi(app)
 
 """
 
@@ -26,14 +27,15 @@
         import cgitb
         cgitb.enable()
     
-    environ = {}
-    environ.update(os.environ)
+    environ = dict(os.environ)
     environ['wsgi.input']        = sys.stdin
     environ['wsgi.errors']       = sys.stderr
     environ['wsgi.version']      = (1, 0)
     environ['wsgi.multithread']  = False
     environ['wsgi.multiprocess'] = True
-    if os.environ.get('HTTPS', '').lower() in ('on', '1'):
+    environ['wsgi.run_once']     = True
+
+    if os.environ.get('HTTPS', 'off').lower() in ('on', '1'):
         environ['wsgi.url_scheme'] = 'https'
     else:
         environ['wsgi.url_scheme'] = 'http'
@@ -41,18 +43,71 @@
     if redirect_stdout:
         sys.stdout = sys.stderr
 
-    def start_response(status, headers):
-        stdout.write("Status: %s\r\n" % status)
-        for key,val in headers:
-            stdout.write("%s: %s\r\n" % (key,val))
-        stdout.write('\r\n')
-        return stdout.write
+    headers_set = []
+    headers_sent = []
+    result = None
 
+    def write(data):
+        assert headers_set, "write() before start_response()"
+
+        if not headers_sent:
+             # Before the first output, send the stored headers
+             status, response_headers = headers_sent[:] = headers_set
+
+             # See if Content-Length is given.
+             found = False
+             for name, value in response_headers:
+                 if name.lower() == 'content-length':
+                     found = True
+                     break
+
+             # If not given, try to deduce it if the iterator implements
+             # __len__ and is of length 1. (data will be result[0] in this
+             # case.)
+             if not found and result is not None:
+                 try:
+                     if len(result) == 1:
+                         response_headers.append(('Content-Length',
+                                                  str(len(data))))
+                 except:
+                     pass
+
+             stdout.write('Status: %s\r\n' % status)
+             for header in response_headers:
+                 stdout.write('%s: %s\r\n' % header)
+             stdout.write('\r\n')
+
+        stdout.write(data)
+        stdout.flush()
+
+    def start_response(status, response_headers, exc_info=None):
+        if exc_info:
+            try:
+                if headers_sent:
+                    # Re-raise original exception if headers sent
+                    raise exc_info[0], exc_info[1], exc_info[2]
+            finally:
+                exc_info = None     # avoid dangling circular ref
+        else:
+            assert not headers_set, "Headers already set!"
+            
+        headers_set[:] = [status, response_headers]
+        return write
+
     result = application(environ, start_response)
     try:
         for data in result:
-            stdout.write(data)
+            if data:    # don't send headers until body appears
+                write(data)
+        if not headers_sent:
+            write('')   # send headers now if body was empty
     finally:
-        if hasattr(result,'close'):
+        if hasattr(result, 'close'):
             result.close()
-    stdout.close()
+
+if __name__ == '__main__':
+    def myapp(environ, start_response):
+        start_response('200 OK', [('Content-Type', 'text/plain')])
+        return ['Hello World!\n']
+
+    run_with_cgi(myapp)

Author: ianb
Date: 2005-04-03 20:18:01 -0600 (Sun, 03 Apr 2005)
New Revision: 2293

Added:
   WSGIKit/trunk/examples/todo_sql/
   WSGIKit/trunk/examples/todo_sql/__init__.py
   WSGIKit/trunk/examples/todo_sql/db.py
   WSGIKit/trunk/examples/todo_sql/server.conf
   WSGIKit/trunk/examples/todo_sql/sitepage.py
   WSGIKit/trunk/examples/todo_sql/templates/
   WSGIKit/trunk/examples/todo_sql/templates/edit_list.pt
   WSGIKit/trunk/examples/todo_sql/templates/generic_error.pt
   WSGIKit/trunk/examples/todo_sql/templates/index.pt
   WSGIKit/trunk/examples/todo_sql/templates/standard_template.pt
   WSGIKit/trunk/examples/todo_sql/templates/view_list.pt
   WSGIKit/trunk/examples/todo_sql/web/
   WSGIKit/trunk/examples/todo_sql/web/__init__.py
   WSGIKit/trunk/examples/todo_sql/web/edit_list.py
   WSGIKit/trunk/examples/todo_sql/web/index.py
   WSGIKit/trunk/examples/todo_sql/web/static/
   WSGIKit/trunk/examples/todo_sql/web/static/stylesheet.css
   WSGIKit/trunk/examples/todo_sql/web/view_list.py
Log:
Added simpler to-do example based on ZPT and SQLObject

Added: WSGIKit/trunk/examples/todo_sql/__init__.py
===================================================================
--- WSGIKit/trunk/examples/todo_sql/__init__.py	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/__init__.py	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,6 @@
+from wsgikit.util.thirdparty import add_package
+
+add_package('ZopePageTemplates')
+add_package('Component')
+add_package('ZPTKit')
+

Added: WSGIKit/trunk/examples/todo_sql/db.py
===================================================================
--- WSGIKit/trunk/examples/todo_sql/db.py	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/db.py	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,13 @@
+from sqlobject import *
+
+class TodoList(SQLObject):
+
+    description = StringCol(notNull=True)
+    items = MultipleJoin('TodoItem')
+
+class TodoItem(SQLObject):
+
+    todo_list = ForeignKey('TodoList')
+    description = StringCol(notNull=True)
+    done = BoolCol(notNull=True, default=False)
+    

Added: WSGIKit/trunk/examples/todo_sql/server.conf
===================================================================
--- WSGIKit/trunk/examples/todo_sql/server.conf	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/server.conf	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,25 @@
+# -*- python -*- Note: this file is in Python syntax
+
+import os
+
+database = 'sqlite:%s/data.db' % os.path.dirname(__file__)
+
+sys_path = [os.path.dirname(__file__), # this package
+            os.path.dirname(os.path.dirname(__file__)), #wsgikit
+            '/home/ianb/colorstudy.com/trunk/SQLObject']
+
+app_template = 'webkit_zpt'
+app_name = ''
+webkit_dir = '/home/ianb/svn.w4py.org/WSGIKit/trunk/examples/todo_sql/web'
+
+## Server options:
+
+verbose = True
+# The name of the server-type to start:
+server = 'wsgiutils'
+# If true, files will be regularly polled and the server restarted
+# if files are modified:
+reload = True
+# If true, tracebacks will be shown in the browser:
+debug = True
+

Added: WSGIKit/trunk/examples/todo_sql/sitepage.py
===================================================================
--- WSGIKit/trunk/examples/todo_sql/sitepage.py	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/sitepage.py	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,63 @@
+import os
+import urllib
+from Component import CPage
+from Component.notify import NotifyComponent
+from ZPTKit import ZPTComponent
+from todo_sql.db import *
+
+class SitePage(CPage):
+
+    components = [
+        ZPTComponent([os.path.join(os.path.dirname(__file__),
+                                   'templates')]),
+        NotifyComponent()]
+    
+    def title(self):
+        return self.options.get('title', CPage.title(self))
+
+    def awake(self, trans):
+        CPage.awake(self, trans)
+        self.baseURL = self.request().environ()['.base_url']
+        self.url = URLBuilder(self.baseURL)
+        self.baseStaticURL = self.baseURL + '/static'
+        self.options.lists = list(TodoList.select())
+        self.setup()
+
+    def setup(self):
+        pass
+
+    def sleep(self, trans):
+        self.teardown()
+        CPage.sleep(self, trans)
+
+    def teardown(self):
+        pass
+
+    def writeHTML(self):
+        self.writeTemplate()
+
+        
+class URLBuilder(object):
+
+    def __init__(self, url, kw=None):
+        self.url = url
+        self.kw = kw
+
+    def __getitem__(self, next):
+        return URLBuilder(self.url + '/' + next)
+
+    def __getattr__(self, next):
+        return self[next]
+
+    def __call__(self, *args, **kw):
+        if args:
+            new_url = self.url + '/' + '/'.join(args)
+        else:
+            new_url = self.url
+        return URLBuilder(new_url, kw)
+
+    def __str__(self):
+        if self.kw:
+            return self.url + '?' + urllib.urlencode(self.kw)
+        else:
+            return self.url

Added: WSGIKit/trunk/examples/todo_sql/templates/edit_list.pt
===================================================================
--- WSGIKit/trunk/examples/todo_sql/templates/edit_list.pt	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/templates/edit_list.pt	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,17 @@
+<html metal:use-macro="here/standard_template.pt/macros/page">
+<metal:body fill-slot="body">
+
+<form action="./edit_list" method="POST">
+<input type="hidden" name="_action_" value="save">
+<input type="hidden" name="id"
+ tal:attributes="value options/id">
+
+Description:<br>
+<input type="text" style="width: 100%" name="description"
+ tal:attributes="value options/list/description | nothing"><br>
+<input type="submit" value="Save">
+
+</form>
+
+</metal:body>
+</html>

Added: WSGIKit/trunk/examples/todo_sql/templates/generic_error.pt
===================================================================
--- WSGIKit/trunk/examples/todo_sql/templates/generic_error.pt	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/templates/generic_error.pt	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,7 @@
+<html metal:use-macro="here/standard_template.pt/macros/page">
+<metal:body fill-slot="body">
+
+<tal:block replace="structure options/error_message" />
+
+</metal:body>
+</html>
\ No newline at end of file

Added: WSGIKit/trunk/examples/todo_sql/templates/index.pt
===================================================================
--- WSGIKit/trunk/examples/todo_sql/templates/index.pt	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/templates/index.pt	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,24 @@
+<html metal:use-macro="here/standard_template.pt/macros/page">
+<metal:body fill-slot="body">
+
+
+<ul>
+ <li tal:repeat="list options/lists">
+  <a tal:attributes="href python: servlet.url.view_list(id=list.id)"
+   tal:content="list/description">list</a></li>
+</ul>
+
+<p tal:condition="not: options/lists">
+  There are no lists to display
+</p>
+
+<form action="./edit_list" method="POST">
+ Create a new list:<br>
+ <input type="hidden" name="id" value="new">
+ <input type="hidden" name="_action_" value="save">
+ <input type="text" name="description">
+ <input type="submit" value="Create">
+</form>
+
+</metal:body>
+</html>

Added: WSGIKit/trunk/examples/todo_sql/templates/standard_template.pt
===================================================================
--- WSGIKit/trunk/examples/todo_sql/templates/standard_template.pt	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/templates/standard_template.pt	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,42 @@
+<metal:tpl define-macro="page">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+        "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html lang="en-US">
+<head>
+<title tal:content="servlet/title">title</title>
+<link rel="stylesheet" type="text/css"
+      tal:attributes="href python: servlet.baseStaticURL + '/stylesheet.css'">
+
+<metal:slot define-slot="extra_head"></metal:slot>
+
+</head>
+<body>
+
+<h1 id="header"><tal:mark replace="servlet/title"/></h1>
+
+<table width="100%">
+<tr>
+<td id="sidenav" width="20%">
+<a tal:attributes="href servlet/baseURL">Home</a><br>
+<tal:for repeat="list options/lists">
+ <a tal:attributes="href python: servlet.url.view_list(id=list.id)"
+  tal:content="list/description">link</a><br>
+</tal:for>
+</td>
+
+<td>
+<span tal:replace="structure servlet/messageText">
+This is where the notification messages go.
+</span>
+
+<div id="content">
+<metal:tpl define-slot="body">
+[This page has not customized its "body" slot]
+</metal:tpl>
+</div>
+
+</td></tr></table>
+
+</body>
+</html>
+</metal:tpl>

Added: WSGIKit/trunk/examples/todo_sql/templates/view_list.pt
===================================================================
--- WSGIKit/trunk/examples/todo_sql/templates/view_list.pt	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/templates/view_list.pt	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,54 @@
+<html metal:use-macro="here/standard_template.pt/macros/page">
+<metal:body fill-slot="body">
+
+<form action="view_list?_action_=check" method="POST">
+<input type="hidden" name="id"
+ tal:attributes="value options/list/id">
+
+<table>
+<tr>
+  <th>Done?</th>
+  <th>Description</th>
+</tr>
+
+<tr tal:repeat="item options/list_items">
+ <tal:let define="name python: 'item_%s' % item.id">
+ <td>
+  <input type="checkbox"
+   tal:attributes="name name;
+                   id name;
+                   checked item/done">
+ </td>
+ <td>
+  <label tal:attributes="for name"
+   tal:content="item/description">description</label>
+ </td>
+ </tal:let>
+</tr>
+
+<tr tal:condition="not: options/list_items">
+ <td colspan=2>No items to display</td>
+</tr>
+
+</table>
+
+<input type="submit" value="Update item status">
+</form>
+
+<form action="view_list?_action_=add" method="POST">
+<input type="hidden" name="id"
+ tal:attributes="value options/list/id">
+Add item:<br>
+<input type="text" style="width: 100%" name="description"><br>
+<input type="submit" value="Add">
+</form>
+
+<form action="edit_list?_action_=destroy" method="POST">
+<input type="hidden" name="id"
+ tal:attributes="value options/list/id">
+<input type="submit" value="Delete this list"
+ onclick="return window.confirm('Really delete this list?')">
+</form>
+
+</metal:body>
+</html>

Added: WSGIKit/trunk/examples/todo_sql/web/__init__.py
===================================================================
--- WSGIKit/trunk/examples/todo_sql/web/__init__.py	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/web/__init__.py	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,16 @@
+import os
+from wsgikit import wsgilib
+import sqlobject
+
+sql_set = False
+
+def urlparser_hook(environ):
+    global sql_set
+    if not environ.has_key('.base_url'):
+        environ['.base_url'] = environ['SCRIPT_NAME']
+    if not sql_set:
+        sql_set = True
+        db_uri = environ['wsgikit.config']['database']
+        sqlobject.sqlhub.processConnection = sqlobject.connectionForURI(
+            db_uri)
+

Added: WSGIKit/trunk/examples/todo_sql/web/edit_list.py
===================================================================
--- WSGIKit/trunk/examples/todo_sql/web/edit_list.py	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/web/edit_list.py	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,29 @@
+from todo_sql.sitepage import SitePage
+from todo_sql.db import *
+
+class edit_list(SitePage):
+
+    def setup(self):
+        self.list_id = self.request().field('id')
+        if self.list_id != 'new':
+            self.list = TodoList.get(int(self.list_id))
+        self.options.title = 'Edit list '
+
+    def actions(self):
+        return ['save', 'destroy']
+
+    def save(self):
+        desc = self.request().field('description')
+        if self.list_id == 'new':
+            self.list = TodoList(description=desc)
+            self.message('List created')
+        else:
+            self.list.description = desc
+            self.message('List updated')
+        self.sendRedirectAndEnd(self.url.view_list(id=self.list.id))
+
+    def destroy(self):
+        desc = self.list.description
+        self.list.destroySelf()
+        self.message('List %s deleted' % desc)
+        self.sendRedirectAndEnd(self.url)

Added: WSGIKit/trunk/examples/todo_sql/web/index.py
===================================================================
--- WSGIKit/trunk/examples/todo_sql/web/index.py	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/web/index.py	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,8 @@
+from todo_sql.sitepage import SitePage
+from todo_sql.db import *
+
+class index(SitePage):
+
+    def setup(self):
+        self.options.title = 'List of Lists'
+        

Added: WSGIKit/trunk/examples/todo_sql/web/static/stylesheet.css
===================================================================
--- WSGIKit/trunk/examples/todo_sql/web/static/stylesheet.css	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/web/static/stylesheet.css	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,22 @@
+body { 
+    font-family: Helvetica, Arial, sans-serif;
+}
+
+pre {
+    overflow: auto;
+}
+
+div.notifyMessage { 
+    border: 2px solid black;
+    background-color: #007700;
+    color: #ffffff;
+}
+
+td#sidenav { 
+    background-color: #eeeeee;
+}
+
+h1#header { 
+    display: block;
+    background-color: #dddddd;
+}
\ No newline at end of file

Added: WSGIKit/trunk/examples/todo_sql/web/view_list.py
===================================================================
--- WSGIKit/trunk/examples/todo_sql/web/view_list.py	2005-04-04 02:17:38 UTC (rev 2292)
+++ WSGIKit/trunk/examples/todo_sql/web/view_list.py	2005-04-04 02:18:01 UTC (rev 2293)
@@ -0,0 +1,39 @@
+from todo_sql.sitepage import SitePage
+from todo_sql.db import *
+
+class view_list(SitePage):
+
+    def setup(self):
+        self.options.list = TodoList.get(int(self.request().field('id')))
+        self.options.title = 'List: %s' % self.options.list.description
+        self.options.list_items = list(self.options.list.items)
+
+    def actions(self):
+        return ['check', 'add', 'destroy']
+
+    def check(self):
+        field = self.request().field
+        for item in self.options.list.items:
+            checked = field('item_%s' % item.id, False)
+            if not checked and item.done:
+                self.message('Item %s marked not done'
+                             % item.description)
+                item.done = False
+            if checked and not item.done:
+                self.message('Item %s marked done'
+                             % item.description)
+                item.done = True
+        self.sendRedirectAndEnd(
+            self.url.view_list(id=self.options.list.id))
+    
+    def add(self):
+        desc = self.request().field('description')
+        if not desc:
+            self.message('You must give a description')
+        else:
+            TodoItem(todo_list=self.options.list,
+                     description=desc)
+            self.message('Item added')
+        self.sendRedirectAndEnd(
+            self.url.view_list(id=self.options.list.id))
+

Author: echuck
Date: 2005-04-03 20:17:38 -0600 (Sun, 03 Apr 2005)
New Revision: 2292

Modified:
   Webware/trunk/MiddleKit/Docs/RelNotes-X.Y.html
Log:
- Added note about recent checkin.


Modified: Webware/trunk/MiddleKit/Docs/RelNotes-X.Y.html
===================================================================
--- Webware/trunk/MiddleKit/Docs/RelNotes-X.Y.html	2005-04-04 02:17:34 UTC (rev 2291)
+++ Webware/trunk/MiddleKit/Docs/RelNotes-X.Y.html	2005-04-04 02:17:38 UTC (rev 2292)
@@ -121,6 +121,8 @@
 	<li>A new setting, <b>UseHashForClassIds</b>, can be set to true to cause internal class ids to be hashed from the class name, instead of numbered serially (1, 2, 3, ...). <a href=UsersGuide.html#Configuration_UseHashForClassIds>docs</a>
 
 	<li>There are good instructions on how to run the test suite in MiddleKit/Tests/ReadMe.text.
+
+	<li>MiddleObject.isDeleted() returns true for objects that have been marked for deletion. You cannot refresh such an object from the database.
 </ul>

Author: ianb
Date: 2005-04-03 20:17:34 -0600 (Sun, 03 Apr 2005)
New Revision: 2291

Modified:
   WSGIKit/trunk/build-pkg
Log:
Fixed Component download; Updated WSGIUtils to 0.5

Modified: WSGIKit/trunk/build-pkg
===================================================================
--- WSGIKit/trunk/build-pkg	2005-04-04 02:17:08 UTC (rev 2290)
+++ WSGIKit/trunk/build-pkg	2005-04-04 02:17:34 UTC (rev 2291)
@@ -41,8 +41,8 @@
 echo "Building into $BASE"
 read x
 
-get_file z WSGI\ Utils-0.4.tar.gz \
-    http://www.owlfish.com/software/wsgiutils/downloads/WSGI%20Utils-0.4.tar.gz z
+get_file z WSGI\ Utils-0.5.tar.gz \
+    http://www.owlfish.com/software/wsgiutils/downloads/WSGI%20Utils-0.5.tar.gz z
 installer wsgiutils
 
 #get_file z ZopeInterface-3.0.1 \
@@ -73,11 +73,11 @@
 
 echo done.
 
-get_file z http://webwareforpython.org/downloads/Component-0.1.tar.gz
+get_file z Component-0.1.tar.gz http://webwareforpython.org/downloads/Component-0.1.tar.gz
 mkdir -p "$THIRD/Component-files"
 DEST="$THIRD/Component-files/Component"
 rm -rf $DEST
-mv $TMP/ZPTKit-0.1 $DEST
+mv $TMP/Component-0.1 $DEST
 echo done.
 
 get_file z ZPTKit-0.1.tar.gz http://imagescape.com/software/ZPTKit/ZPTKit-0.1.tar.gz

Author: ianb
Date: 2005-04-03 20:17:08 -0600 (Sun, 03 Apr 2005)
New Revision: 2290

Modified:
   WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/template/web/static/stylesheet.css
Log:
Added style for notification messages (Component.notify)

Modified: WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/template/web/static/stylesheet.css
===================================================================
--- WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/template/web/static/stylesheet.css	2005-04-04 02:16:44 UTC (rev 2289)
+++ WSGIKit/trunk/wsgikit/app_templates/webkit_zpt/template/web/static/stylesheet.css	2005-04-04 02:17:08 UTC (rev 2290)
@@ -4,4 +4,10 @@
 
 pre {
     overflow: auto;
-}
\ No newline at end of file
+}
+
+div.notifyMessage { 
+    border: 2px solid black;
+    background-color: #007700;
+    color: #ffffff;
+}

Author: ianb
Date: 2005-04-03 20:16:44 -0600 (Sun, 03 Apr 2005)
New Revision: 2289

Modified:
   WSGIKit/trunk/wsgikit/server.py
Log:
Added sys_path configuration parameter

Modified: WSGIKit/trunk/wsgikit/server.py
===================================================================
--- WSGIKit/trunk/wsgikit/server.py	2005-04-04 02:16:20 UTC (rev 2288)
+++ WSGIKit/trunk/wsgikit/server.py	2005-04-04 02:16:44 UTC (rev 2289)
@@ -102,6 +102,8 @@
                 return restart_with_reloader(conf)
             except KeyboardInterrupt:
                 return 0
+    if conf.get('sys_path'):
+        update_sys_path(conf['sys_path'], conf['verbose'])
     server = servers[conf['server']]
     app = make_app(conf)
     if conf['verbose']:
@@ -123,6 +125,16 @@
             print 'Loading configuration from %s' % filename
         conf.load(filename, default=default)
 
+def update_sys_path(paths, verbose):
+    if isinstance(paths, (str, unicode)):
+        paths = [paths]
+    for path in paths:
+        path = os.path.abspath(path)
+        if path not in sys.path:
+            if verbose:
+                print 'Adding %s to path' % path
+            sys.path.append(path)
+            
 def help():
     program = sys.argv[0]
     return help_message % {'program': program}

Author: ianb
Date: 2005-04-03 20:16:20 -0600 (Sun, 03 Apr 2005)
New Revision: 2288

Modified:
   WSGIKit/trunk/wsgikit/pyconfig.py
Log:
Added __file__ attribute for config files to use

Modified: WSGIKit/trunk/wsgikit/pyconfig.py
===================================================================
--- WSGIKit/trunk/wsgikit/pyconfig.py	2005-04-04 02:15:01 UTC (rev 2287)
+++ WSGIKit/trunk/wsgikit/pyconfig.py	2005-04-04 02:16:20 UTC (rev 2288)
@@ -14,6 +14,7 @@
 """
 
 import types
+import os
 from wsgikit.util import thirdparty
 UserDict = thirdparty.load_new_module('UserDict', (2, 3))
 
@@ -64,6 +65,7 @@
         for key in self:
             namespace[key] = self[key]
         orig = namespace.copy()
+        namespace['__file__'] = os.path.abspath(filename)
         exec content in namespace
         for name in namespace.keys():
             if (hasattr(__builtins__, name)

Author: echuck
Date: 2005-04-03 20:15:01 -0600 (Sun, 03 Apr 2005)
New Revision: 2287

Modified:
   Webware/trunk/MiscUtils/Docs/RelNotes-X.Y.html
   Webware/trunk/MiscUtils/NamedValueAccess.py
Log:
NamedValueAccess.py can now grab values out of classes, not just instances and dictionaries.


Modified: Webware/trunk/MiscUtils/Docs/RelNotes-X.Y.html
===================================================================
--- Webware/trunk/MiscUtils/Docs/RelNotes-X.Y.html	2005-04-04 02:11:55 UTC (rev 2286)
+++ Webware/trunk/MiscUtils/Docs/RelNotes-X.Y.html	2005-04-04 02:15:01 UTC (rev 2287)
@@ -9,22 +9,22 @@
 	-->
 	</style>
 
-	<!-- 
+	<!--
 		Auto versioning is handled by Webware/bin/setversion.py.
-		This will automatically update version and release date 
+		This will automatically update version and release date
 		information embedded within HTML comment tags.
 
 		Note however that comment tags within a title block seem to
-		not be interpreted as comments in Mozilla 1.2.1 
+		not be interpreted as comments in Mozilla 1.2.1
 	-->
-	<title>CGIWrapper Release Notes</title>
+	<title>MiscUtils Release Notes</title>
 </head>
 
 <body>
 
-<h1>CGIWrapper Release Notes</h1>
+<h1>MiscUtils Release Notes</h1>
 Version  <!-- version --> X.Y <!-- /version --> <br>
-Webware for Python  <!-- version --> X.Y <!-- /version --> 
+Webware for Python  <!-- version --> X.Y <!-- /version -->
 Released on <!-- relDate --> @@/@@/@@ <!-- /relDate -->
 
 
@@ -65,7 +65,7 @@
 
 <h2>Bugfixes</h2>
 <ul>
-	<li> *
+	<li>NamedValueAccess.py can now grab values out of classes, not just instances and dictionaries. </li>
 </ul>
 
 

Modified: Webware/trunk/MiscUtils/NamedValueAccess.py
===================================================================
--- Webware/trunk/MiscUtils/NamedValueAccess.py	2005-04-04 02:11:55 UTC (rev 2286)
+++ Webware/trunk/MiscUtils/NamedValueAccess.py	2005-04-04 02:15:01 UTC (rev 2287)
@@ -482,25 +482,30 @@
 		else:
 			return obj.get(key, default)
 	else:
+
 		try:
-			klass    = obj.__class__
+			klass = obj.__class__
 		except AttributeError:
-			raise AttributeError, '__class__ obj type=%r, obj=%r' % (type(obj), obj)
-		method   = getattr(klass, key, None)
+			# happens for classes themselves
+			klass = None
+			method = None
+		else:
+			method   = getattr(klass, key, None)
 		if not method:
 			underKey = '_' + key
-			method = getattr(klass, underKey, None)
+			method = klass and getattr(klass, underKey, None) or None
 			if not method:
 				attr = getattr(obj, key, NoDefault)
 				if attr is NoDefault:
 					attr = getattr(obj, underKey, NoDefault)
 					if attr is NoDefault:
-						getitem = getattr(obj.__class__, '__getitem__', None)
-						if getitem:
-							try:
-								value = getitem(obj, key)
-							except KeyError:
-								unknown = 1
+						if klass is not None:
+							getitem = getattr(klass, '__getitem__', None)
+							if getitem:
+								try:
+									value = getitem(obj, key)
+								except KeyError:
+									unknown = 1
 
 #	if value is not NoDefault:
 #		return value
@@ -531,7 +536,6 @@
 
 	Example: valueForName(obj, 'department.manager.salary')
 	"""
-
 	names = string.split(name, '.')
 	for name in names:
 		obj = valueForKey(obj, name, default)

Author: echuck
Date: 2005-04-03 20:11:55 -0600 (Sun, 03 Apr 2005)
New Revision: 2286

Modified:
   Webware/trunk/MiscUtils/Configurable.py
Log:
- Add setSetting(name, value) util method.
- Add a couple @@ to do comments based on a recent experience.


Modified: Webware/trunk/MiscUtils/Configurable.py
===================================================================
--- Webware/trunk/MiscUtils/Configurable.py	2005-04-04 02:11:10 UTC (rev 2285)
+++ Webware/trunk/MiscUtils/Configurable.py	2005-04-04 02:11:55 UTC (rev 2286)
@@ -70,6 +70,9 @@
 		else:
 			return self.config().get(name, default)
 
+	def setSetting(self, name, value):
+		self.config()[name] = value
+
 	def hasSetting(self, name):
 		return self.config().has_key(name)
 
@@ -83,7 +86,7 @@
 		configuration. Subclasses must override to specify a
 		name. Returning None is valid, in which case no user
 		config file will be loaded."""
-		
+
 		raise AbstractError, self.__class__
 
 	def configName(self):
@@ -129,8 +132,10 @@
 			try:
 				if isDict:
 					config = eval(contents, evalContext)
+					# @@ 2005-04-03 ce: to do: catch syntax error and convert to native line endings
 				else:
 					exec contents in evalContext
+					# @@ 2005-04-03 ce: to do: catch syntax error and convert to native line endings
 					config = evalContext
 					for name in config.keys():
 						if name.startswith('_'):

Author: echuck
Date: 2005-04-03 20:11:10 -0600 (Sun, 03 Apr 2005)
New Revision: 2285

Modified:
   Webware/trunk/MiddleKit/Core/Model.py
Log:
- Give a better error message in allKlassesInDependencyOrder() when it fails due to a cycle in the dependencies.


Modified: Webware/trunk/MiddleKit/Core/Model.py
===================================================================
--- Webware/trunk/MiddleKit/Core/Model.py	2005-04-04 02:10:17 UTC (rev 2284)
+++ Webware/trunk/MiddleKit/Core/Model.py	2005-04-04 02:11:10 UTC (rev 2285)
@@ -309,7 +309,11 @@
 			if not klass.dependents:
 				#print '>>', klass.name()
 				klass.recordDependencyOrder(allKlasses, visited)
-		assert len(allKlasses)==len(self._allKlassesInOrder)
+		# The above loop fails to capture classes that are in cycles,
+		# but in that case there really is no dependency order.
+		if len(allKlasses)<len(self._allKlassesInOrder):
+			raise ModelError('Cannot determine a dependency order among the classes due to a cycle. Try setting Ref=0 for one of the attributes to break the cycle.')
+		assert len(allKlasses)==len(self._allKlassesInOrder), '%r, %r, %r' % (len(allKlasses), len(self._allKlassesInOrder), allKlasses)
 		#print '>> allKlassesInDependencyOrder() =', ' '.join([klass.name() for klass in allKlasses])
 		return allKlasses

Author: echuck
Date: 2005-04-03 20:10:17 -0600 (Sun, 03 Apr 2005)
New Revision: 2284

Modified:
   Webware/trunk/MiddleKit/Run/MiddleObject.py
   Webware/trunk/MiddleKit/Run/ObjectStore.py
Log:
- Mark objects that are deleted. Access with obj.isDeleted().
- Assert not isDeleted() when reading in data from db.


Modified: Webware/trunk/MiddleKit/Run/MiddleObject.py
===================================================================
--- Webware/trunk/MiddleKit/Run/MiddleObject.py	2005-04-03 09:08:01 UTC (rev 2283)
+++ Webware/trunk/MiddleKit/Run/MiddleObject.py	2005-04-04 02:10:17 UTC (rev 2284)
@@ -34,6 +34,9 @@
 	"""
 
 
+	_mk_isDeleted = False
+
+
 	## Init ##
 
 	def __init__(self):
@@ -62,6 +65,7 @@
 					assert 0, "attempted to refresh changed object %s.%d\nchanges=%r\nYour app needs to call store.saveChanges() before doing anything which can cause objects to be refreshed from the database (i.e. calling store.deleteObject()), otherwise your changes will be lost." % (self.klass().name(), self.serialNum(), self._mk_changedAttrs)
 		else:
 			self.setStore(store)
+		assert not self._mk_isDeleted, 'Cannot refresh a deleted object.'
 		if store.setting('UseBigIntObjRefColumns', False):
 			fullClassName = self.__class__.__module__ + '.' + self.__class__.__name__
 			cache = self._mk_setCache.setdefault(fullClassName, [])
@@ -146,6 +150,8 @@
 		"""
 		return self._mk_serialNum<1
 
+	def isDeleted(self):
+		return self._mk_isDeleted;
 
 	## Keys ##
 

Modified: Webware/trunk/MiddleKit/Run/ObjectStore.py
===================================================================
--- Webware/trunk/MiddleKit/Run/ObjectStore.py	2005-04-03 09:08:01 UTC (rev 2283)
+++ Webware/trunk/MiddleKit/Run/ObjectStore.py	2005-04-04 02:10:17 UTC (rev 2284)
@@ -165,12 +165,11 @@
 			if not objectsToDel.has_key(id(obj)):
 				obj.setValueForAttr(attr, None)
 
-		# deleted objects
+		# process final list of objects
 		objectsToDel = objectsToDel.values()
-		self._deletedObjects.extend(objectsToDel)
-
-		# remove deleted objects from main list of objects
 		for obj in objectsToDel:
+			obj._mk_isDeleted = True
+			self._deletedObjects.append(obj)
 			obj.updateReferencingListAttrs()
 			del self._objects[obj.key()]