X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Futil.py;h=ed32cc6a3f3de4a98a3ea00942c2065856ae97ca;hp=f70de0da7ee82077a27b32141aeb5a2b1aae37ed;hb=ca3dce3812e3fc65f4c021aa76ee1430b47ad3af;hpb=8d8d1f703090499006efeb51299b8a267b00aa09

diff --git a/wrw/util.py b/wrw/util.py
index f70de0d..ed32cc6 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -33,15 +33,19 @@ def formparams(callable):
     wrapper.__wrapped__ = callable
     return wrapper
 
-def funplex(*funs, **nfuns):
+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
-    dir = {}
-    dir.update(((unwrap(fun).__name__, fun) for fun in funs))
-    dir.update(nfuns)
-    def handler(req):
+
+    def __call__(self, req):
         if req.pathinfo == "":
             raise resp.redirect(req.uriname + "/")
         if req.pathinfo[:1] != "/":
@@ -53,10 +57,19 @@ 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 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):