X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=f70680e752ea95e77d0f04ca043d4fd777a56b08;hb=6963e4742e2d7e5eb9f783a5fc0380e18d8e2cb6;hp=abf865e5a27585fc2521bbb483d2a8d9a48959c5;hpb=1864be32db482df017bc7dd57bbd2ccadeec4429;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index abf865e..f70680e 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -4,29 +4,39 @@ import req, dispatch, session, form, resp, proto
 def wsgiwrap(callable):
     def wrapper(env, startreq):
         return dispatch.handleenv(env, startreq, callable)
+    wrapper.__wrapped__ = callable
     return wrapper
 
 def formparams(callable):
+    spec = inspect.getargspec(callable)
     def wrapper(req):
         data = form.formdata(req)
-        spec = inspect.getargspec(callable)
         args = dict(data.items())
         args["req"] = req
         if not spec.keywords:
             for arg in list(args):
                 if arg not in spec.args:
                     del args[arg]
-        for i in xrange(len(spec.args) - len(spec.defaults)):
+        for i in xrange(len(spec.args) - (len(spec.defaults) if spec.defaults else 0)):
             if spec.args[i] not in args:
                 raise resp.httperror(400, "Missing parameter", ("The query parameter `", resp.h.code(spec.args[i]), "' is required but not supplied."))
         return callable(**args)
+    wrapper.__wrapped__ = callable
     return wrapper
 
-def funplex(*funs, **nfuns):
-    dir = {}
-    dir.update(((fun.__name__, fun) for fun in funs))
-    dir.update(nfuns)
-    def handler(req):
+class funplex(object):
+    def __init__(self, *funs, **nfuns):
+        self.dir = {}
+        self.dir.update(((self.unwrap(fun).__name__, fun) for fun in funs))
+        self.dir.update(nfuns)
+
+    @staticmethod
+    def unwrap(fun):
+        while hasattr(fun, "__wrapped__"):
+            fun = fun.__wrapped__
+        return fun
+
+    def __call__(self, req):
         if req.pathinfo == "":
             raise resp.redirect(req.uriname + "/")
         if req.pathinfo[:1] != "/":
@@ -38,12 +48,21 @@ def funplex(*funs, **nfuns):
         else:
             p = p.partition("/")[0]
             bi = len(p) + 1
-        if p in dir:
-            return dir[p](req.shift(bi))
+        if p in self.dir:
+            return self.dir[p](req.shift(bi))
         raise resp.notfound()
-    return handler
 
-def persession(data = None):
+    def add(self, fun):
+        self.dir[self.unwrap(fun).__name__] = fun
+        return fun
+
+    def name(self, name):
+        def dec(fun):
+            self.dir[name] = fun
+            return fun
+        return dec
+
+def persession(data=None):
     def dec(callable):
         def wrapper(req):
             sess = session.get(req)
@@ -55,6 +74,7 @@ def persession(data = None):
                         sess[data] = data()
                     sess[callable] = callable(data)
             return sess[callable].handle(req)
+        wrapper.__wrapped__ = callable
         return wrapper
     return dec
 
@@ -87,11 +107,12 @@ class preiter(object):
 def pregen(callable):
     def wrapper(*args, **kwargs):
         return preiter(callable(*args, **kwargs))
+    wrapper.__wrapped__ = callable
     return wrapper
 
 class sessiondata(object):
     @classmethod
-    def get(cls, req, create = True):
+    def get(cls, req, create=True):
         sess = cls.sessdb().get(req)
         with sess.lock:
             try:
@@ -237,6 +258,6 @@ class specdirty(sessiondata):
 def datecheck(req, mtime):
     if "If-Modified-Since" in req.ihead:
         rtime = proto.phttpdate(req.ihead["If-Modified-Since"])
-        if rtime >= math.floor(mtime):
+        if rtime is not None and rtime >= math.floor(mtime):
             raise resp.unmodified()
     req.ohead["Last-Modified"] = proto.httpdate(mtime)