gofmt

hoisie · hoisie · commit 0b255516b9e7 · 2013-06-29T08:46:02.000-06:00
diff --git a/helpers.go b/helpers.go
@@ -91,7 +91,7 @@ func NewCookie(name string, value string, age int64) *http.Cookie {
     return &http.Cookie{Name: name, Value: value, Expires: utctime}
 }
 
-// GetBasicAuth is a helper method of *Context that returns the decoded 
+// GetBasicAuth is a helper method of *Context that returns the decoded
 // user and password from the *Context's authorization header
 func (ctx *Context) GetBasicAuth() (string, string, error) {
     authHeader := ctx.Request.Header["Authorization"][0]
diff --git a/server.go b/server.go
@@ -2,6 +2,7 @@ package web
 
 import (
     "bytes"
+    "code.google.com/p/go.net/websocket"
     "crypto/tls"
     "fmt"
     "log"
@@ -15,7 +16,6 @@ import (
     "runtime"
     "strconv"
     "time"
-    "code.google.com/p/go.net/websocket"
 )
 
 // ServerConfig is configuration for server objects.
@@ -72,14 +72,14 @@ func (s *Server) addRoute(r string, method string, handler interface{}) {
     }
 
     switch handler.(type) {
-        case http.Handler:
-            s.routes = append(s.routes, route{r: r, cr: cr, method: method, httpHandler: handler.(http.Handler)})
-        case reflect.Value:
-            fv := handler.(reflect.Value)
-            s.routes = append(s.routes, route{r: r, cr: cr, method: method, handler: fv})
-        default:
-            fv := reflect.ValueOf(handler)
-            s.routes = append(s.routes, route{r: r, cr: cr, method: method, handler: fv})
+    case http.Handler:
+        s.routes = append(s.routes, route{r: r, cr: cr, method: method, httpHandler: handler.(http.Handler)})
+    case reflect.Value:
+        fv := handler.(reflect.Value)
+        s.routes = append(s.routes, route{r: r, cr: cr, method: method, handler: fv})
+    default:
+        fv := reflect.ValueOf(handler)
+        s.routes = append(s.routes, route{r: r, cr: cr, method: method, handler: fv})
     }
 }
 
diff --git a/web.go b/web.go
@@ -4,6 +4,7 @@ package web
 
 import (
     "bytes"
+    "code.google.com/p/go.net/websocket"
     "crypto/hmac"
     "crypto/sha1"
     "crypto/tls"
@@ -19,7 +20,6 @@ import (
     "strconv"
     "strings"
     "time"
-    "code.google.com/p/go.net/websocket"
 )
 
 // A Context object is created for every incoming HTTP request, and is
diff --git a/web_test.go b/web_test.go
@@ -531,8 +531,8 @@ func TestDuplicateHeader(t *testing.T) {
 }
 
 func BuildBasicAuthCredentials(user string, pass string) string {
-   s := user + ":" + pass
-   return "Basic "+base64.StdEncoding.EncodeToString([]byte(s))
+    s := user + ":" + pass
+    return "Basic " + base64.StdEncoding.EncodeToString([]byte(s))
 }
 
 func BenchmarkProcessGet(b *testing.B) {

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ func NewCookie(name string, value string, age int64) *http.Cookie {`
`91`	`91`	`return &http.Cookie{Name: name, Value: value, Expires: utctime}`
`92`	`92`	`}`
`93`	`93`
`94`		`-// GetBasicAuth is a helper method of *Context that returns the decoded`
	`94`	`+// GetBasicAuth is a helper method of *Context that returns the decoded`
`95`	`95`	`// user and password from the *Context's authorization header`
`96`	`96`	`func (ctx *Context) GetBasicAuth() (string, string, error) {`
`97`	`97`	`authHeader := ctx.Request.Header["Authorization"][0]`
Original file line number	Diff line number	Diff line change
`@@ -531,8 +531,8 @@ func TestDuplicateHeader(t *testing.T) {`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`func BuildBasicAuthCredentials(user string, pass string) string {`
`534`		`- s := user + ":" + pass`
`535`		`- return "Basic "+base64.StdEncoding.EncodeToString([]byte(s))`
	`534`	`+ s := user + ":" + pass`
	`535`	`+ return "Basic " + base64.StdEncoding.EncodeToString([]byte(s))`
`536`	`536`	`}`
`537`	`537`
`538`	`538`	`func BenchmarkProcessGet(b *testing.B) {`