Instead of having web.Conn be a menber of web.Context, it's now embedded. This lets you do ctx.Write(), ctx.StartResponse, etc, without having to use ctx.Conn. This makes things simpler and fits the go paradigm better. Now you can use ctx as a io.Writer and write to it directly.

Michael Hoisie · Michael Hoisie · commit 848e472dcba8 · 2010-01-05T06:21:49.000-08:00
diff --git a/fcgi.go b/fcgi.go
@@ -150,12 +150,6 @@ func (conn *fcgiConn) Write(data []byte) (n int, err os.Error) {
     return len(data), nil
 }
 
-func (conn *fcgiConn) WriteString(data string) {
-    var buf bytes.Buffer
-    buf.WriteString(data)
-    conn.Write(buf.Bytes())
-}
-
 func (conn *fcgiConn) StartResponse(status int) {
     var buf bytes.Buffer
     text := statusText[status]
diff --git a/scgi.go b/scgi.go
@@ -57,12 +57,6 @@ func (conn *scgiConn) Write(data []byte) (n int, err os.Error) {
     return conn.fd.Write(data)
 }
 
-func (conn *scgiConn) WriteString(data string) {
-    var buf bytes.Buffer
-    buf.WriteString(data)
-    conn.Write(buf.Bytes())
-}
-
 func (conn *scgiConn) Close() { conn.fd.Close() }
 
 func readScgiRequest(buf *bytes.Buffer) *Request {
diff --git a/servefile.go b/servefile.go
@@ -54,18 +54,18 @@ func serveFile(ctx *Context, name string) {
     ext := path.Ext(name)
 
     if ctype, ok := contentByExt[ext]; ok {
-        ctx.Conn.SetHeader("Content-Type", ctype, true)
+        ctx.SetHeader("Content-Type", ctype, true)
     } else {
         // read first chunk to decide between utf-8 text and binary
         var buf [1024]byte
         n, _ := io.ReadFull(f, &buf)
         b := buf[0:n]
         if isText(b) {
-            ctx.Conn.SetHeader("Content-Type", "text-plain; charset=utf-8", true)
+            ctx.SetHeader("Content-Type", "text-plain; charset=utf-8", true)
         } else {
-            ctx.Conn.SetHeader("Content-Type", "application/octet-stream", true) // generic binary
+            ctx.SetHeader("Content-Type", "application/octet-stream", true) // generic binary
         }
-        ctx.Conn.Write(b)
+        ctx.Write(b)
     }
-    io.Copy(ctx.Conn, f)
+    io.Copy(ctx, f)
 }
diff --git a/web.go b/web.go
@@ -11,39 +11,52 @@ import (
     "rand"
     "reflect"
     "regexp"
+    "strings"
     "time"
 )
 
-var rgen = rand.New( rand.NewSource( time.Nanoseconds() ) )
+var rgen = rand.New(rand.NewSource(time.Nanoseconds()))
 
-type Conn interface {
+type conn interface {
     StartResponse(status int)
     SetHeader(hdr string, val string, unique bool)
     Write(data []byte) (n int, err os.Error)
-    WriteString(content string)
     Close()
 }
 
 type Context struct {
     *Request
-    Session *session
-    Conn
+    *conn
+    Session         *session
     responseStarted bool
 }
 
-func (ctx *Context) Abort(status int, body string) {
-    ctx.Conn.StartResponse(status)
-    ctx.Conn.WriteString(body)
+func (ctx *Context) StartResponse(status int) {
+    ctx.conn.StartResponse(status)
     ctx.responseStarted = true
 }
 
+func (ctx *Context) Write(data []byte) (n int, err os.Error) {
+    if !ctx.responseStarted {
+        ctx.StartResponse(200)
+    }
+    return ctx.conn.Write(data)
+}
+func (ctx *Context) WriteString(content string) {
+    ctx.Write(strings.Bytes(content))
+}
+
+func (ctx *Context) Abort(status int, body string) {
+    ctx.StartResponse(status)
+    ctx.WriteString(body)
+}
+
 func (ctx *Context) Redirect(status int, url string) {
     //note := "<a href=\"%v\">" + statusText[code] + "</a>.\n"
 
-    ctx.Conn.SetHeader("Location", url, true)
-    ctx.Conn.StartResponse(status)
-    ctx.Conn.WriteString("")
-    ctx.responseStarted = true
+    ctx.SetHeader("Location", url, true)
+    ctx.StartResponse(status)
+    ctx.WriteString("")
 }
 //Sets a cookie -- duration is the amount of time in seconds. 0 = forever
 func (ctx *Context) SetCookie(name string, value string, duration int64) {
@@ -56,7 +69,7 @@ func (ctx *Context) SetCookie(name string, value string, duration int64) {
     expires := utc1.RFC1123()
     expires = expires[0:len(expires)-3] + "GMT"
     cookie := fmt.Sprintf("%s=%s; expires=%s", name, value, expires)
-    ctx.Conn.SetHeader("Set-Cookie", cookie, false)
+    ctx.SetHeader("Set-Cookie", cookie, false)
 }
 
 var sessionMap = make(map[string]*session)
@@ -158,7 +171,7 @@ func httpHandler(c *http.Conn, req *http.Request) {
     routeHandler(wreq, &conn)
 }
 
-func routeHandler(req *Request, conn Conn) {
+func routeHandler(req *Request, c conn) {
     requestPath := req.URL.Path
 
     //log the request
@@ -190,7 +203,7 @@ func routeHandler(req *Request, conn Conn) {
         }
     }
 
-    ctx := Context{req, s, conn, false}
+    ctx := Context{req, &c, s, false}
 
     //try to serve a static file
     staticFile := path.Join(staticDir, requestPath)
@@ -200,8 +213,8 @@ func routeHandler(req *Request, conn Conn) {
     }
 
     //set default encoding
-    conn.SetHeader("Content-Type", "text/html; charset=utf-8", true)
-    conn.SetHeader("Server", "web.go", true)
+    ctx.SetHeader("Content-Type", "text/html; charset=utf-8", true)
+    ctx.SetHeader("Server", "web.go", true)
 
     for cr, route := range routes {
         if req.Method != route.method {
@@ -245,19 +258,25 @@ func routeHandler(req *Request, conn Conn) {
         for i, j := range (args) {
             valArgs[i] = j.(reflect.Value)
         }
-        ret := route.handler.Call(valArgs)[0].(*reflect.StringValue).Get()
 
-        if !ctx.responseStarted {
+        ret := route.handler.Call(valArgs)
+
+        if len(ret) == 0 {
+            return
+        }
+
+        sval, ok := ret[0].(*reflect.StringValue)
+
+        if ok && !ctx.responseStarted {
             //check if session data is stored
             if len(s.Data) > 0 {
                 s.save()
                 //set the session for half an hour
                 ctx.SetCookie(sessionKey, s.Id, 1800)
             }
 
-            conn.StartResponse(200)
-            ctx.responseStarted = true
-            conn.WriteString(ret)
+            ctx.StartResponse(200)
+            ctx.WriteString(sval.Get())
         }
 
         return
diff --git a/web_test.go b/web_test.go
@@ -123,6 +123,8 @@ func init() {
         ctx.Abort(n, message)
         return ""
     })
+
+    Get("/writetest", func(ctx *Context) { ctx.WriteString("hello") })
 }
 
 var tests = []Test{
@@ -134,7 +136,7 @@ var tests = []Test{
     //long url
     Test{"GET", "/echo/" + strings.Repeat("0123456789", 100), "", 200, strings.Repeat("0123456789", 100)},
 
-    Test{"GET", "/", "", 200, "index"},
+    Test{"GET", "/writetest", "", 200, "hello"},
     Test{"GET", "/doesnotexist", "", 404, "Page not found"},
     Test{"POST", "/doesnotexist", "", 404, "Page not found"},
     Test{"GET", "/error/code/500", "", 500, statusText[500]},
