Update Application API.

joshthecoder · joshthecoder · commit d928e96cc55e · 2010-02-09T20:44:16.000-06:00
Applications now return response bodies via Reader classes.
The application must return a Reader if it wishes to have a response body
in the request. If null is returned, no response will be sent.
diff --git a/examples/hello.ooc b/examples/hello.ooc
@@ -1,22 +1,21 @@
 use web, fastcgi
 
+import io/Reader
+import text/StringBuffer
 import web/[Application]
 import fastcgi/Server
 
 
 HelloApplication: class extends Application {
-    parseRequest: func {
+    processRequest: func -> Reader {
         "Request path: %s" format(request path) println()
         "Request method: %s" format(request method) println()
         "Request remote addr: %s port %d" format(request remoteAddress, request remotePort) println()
-    }
-
-    sendHeaders: func(headers: HeaderMap) {
-        headers["Content-type"] = "text/html"
-    }
 
-    sendResponse: func(response: ResponseWriter) {
-        response write("<html>"). write("<body>"). write("<h1>Hello!</h1>"). write("</body></html>")
+        response sendHeader("Content-type", "text/html")
+        out := BufferReader new()
+        out buffer() append("<html><body><h1>Hello world from ooc!!!</h1></body></html>")
+        return out
     }
 }
 
diff --git a/web/Application.ooc b/web/Application.ooc
@@ -1,4 +1,4 @@
-import structs/HashMap
+import io/Reader
 
 
 Request: abstract class {
@@ -11,35 +11,15 @@ Request: abstract class {
     getHeader: abstract func(name: String) -> String
 }
 
-ResponseWriter: abstract class {
-    write: abstract func(data: String) -> Int
-    flush: abstract func
+Response: abstract class {
+    sendStatus: abstract func(code: Int, message: String)
+    sendHeader: abstract func(name: String, value: String)
 }
 
-HeaderMap: class extends HashMap<String> {
-    init: func ~headermap {
-        init(1)
-    }
-
-    init: func ~headermapWithCapacity (capacity: UInt) {
-        T = String
-        super(capacity)
-    }
-}
-operator [] <T> (map: HeaderMap, key: String) -> T {
-    map get(key)
-}
-
-operator []= <T> (map: HeaderMap, key: String, value: T) {
-    map put(key, value)
-}
-
-
-Application: class {
+Application: abstract class {
     request: Request
+    response: Response
 
-    parseRequest: func {}
-    sendHeaders: func(headers: HeaderMap) {}
-    sendResponse: func(response: ResponseWriter) {}
+    processRequest: abstract func -> Reader
 }
 
