Add Content-Length to SP responses.

[wrw.git] / wrw / sp / util.py

diff --git a/wrw/sp/util.py b/wrw/sp/util.py
index 0b31c65..e15b947 100644 (file)
--- a/wrw/sp/util.py
+++ b/wrw/sp/util.py
@@ -1,3 +1,5 @@
+import StringIO
+from wrw import dispatch
 import cons
 
 def findnsnames(el):
@@ -98,7 +100,7 @@ class formatter(object):
     def endtag(self, el):
         self.write(u'</' + self.elname(el) + u'>')
 
-    def longtag(self, el):
+    def longtag(self, el, **extra):
         self.starttag(el, **extra)
         for ch in el.children:
             self.node(ch)
@@ -142,7 +144,13 @@ class formatter(object):
 
     @classmethod
     def fragment(cls, out, el, *args, **kw):
-        cls(out=out, root=el, *args, **kw).element(el)
+        cls(out=out, root=el, *args, **kw).node(el)
+
+    @classmethod
+    def format(cls, el, *args, **kw):
+        buf = StringIO.StringIO()
+        cls.output(buf, el, *args, **kw)
+        return buf.getvalue()
 
     def update(self, **ch):
         ret = type(self).__new__(type(self))
@@ -211,3 +219,22 @@ class indenter(formatter):
     def start(self):
         super(indenter, self).start()
         self.write('\n')
+
+class response(dispatch.restart):
+    charset = "utf-8"
+    doctype = None
+    formatter = indenter
+
+    def __init__(self, root):
+        super(response, self).__init__()
+        self.root = root
+
+    @property
+    def ctype(self):
+        raise Exception("a subclass of wrw.sp.util.response must override ctype")
+
+    def handle(self, req):
+        ret = self.formatter.format(self.root, doctype=self.doctype, charset=self.charset)
+        req.ohead["Content-Type"] = self.ctype
+        req.ohead["Content-Length"] = len(ret)
+        return [ret]