Merge branch 'hotfix/0.2.10'

Author: takama

README.md

@@ -109,6 +109,9 @@ Content-Length: 102
 
 - Use timer to calculate duration of request handling:
 ```go
+// Data is helper to construct JSON
+type Data map[string]interface{}
+
 func main() {
 	r := router.New()
 	r.GET("/api/v1/settings/database/:db", func(c *router.Control) {
@@ -152,10 +155,14 @@ Content-Length: 143
 }
 ```
 
-- Custom handler with "Access-Control-Allow":
+- Custom handler with "Access-Control-Allow" options and compact JSON:
 ```go
+// Data is helper to construct JSON
+type Data map[string]interface{}
+
 func baseHandler(handle router.Handle) router.Handle {
 	return func(c *router.Control) {
+		c.CompactJSON(true)
 		if origin := c.Request.Header.Get("Origin"); origin != "" {
 			c.Writer.Header().Set("Access-Control-Allow-Origin", origin)
 			c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
@@ -164,14 +171,18 @@ func baseHandler(handle router.Handle) router.Handle {
 	}
 }
 
-func Hello(c *router.Control) {
-	c.Body("Hello world")
+func Info(c *router.Control) {
+	data := Data{
+		"debug": true,
+		"error": false,
+	}
+	c.Body(data)
 }
 
 func main() {
 	r := router.New()
 	r.CustomHandler = baseHandler
-	r.GET("/hello", Hello)
+	r.GET("/info", Info)
 
 	// Listen and serve on 0.0.0.0:8888
 	r.Listen(":8888")
@@ -180,16 +191,16 @@ func main() {
 
 - Check it:
 ```sh
-curl -i -H 'Origin: http://foo.com' http://localhost:8888/hello/
+curl -i -H 'Origin: http://foo.com' http://localhost:8888/info/
 
 HTTP/1.1 200 OK
 Access-Control-Allow-Credentials: true
 Access-Control-Allow-Origin: http://foo.com
 Content-Type: text/plain
 Date: Sun, 17 Aug 2014 13:27:10 GMT
-Content-Length: 11
+Content-Length: 28
 
-Hello world
+{"debug":true,"error":false}
 ```
 
 ## Author

control.go

@@ -30,6 +30,9 @@ type Control struct {
 	// Code of HTTP status
 	code int
 
+	// CompactJSON propery defines JSON output format (default is not compact)
+	compactJSON bool
+
 	// Params is set of parameters
 	Params []Param
 
@@ -75,6 +78,11 @@ func (c *Control) Code(code int) *Control {
 	return c
 }
 
+// CompactJSON change JSON output format (default mode is false)
+func (c *Control) CompactJSON(mode bool) {
+	c.compactJSON = mode
+}
+
 // UseTimer allow caalculate elapsed time of request handling
 func (c *Control) UseTimer() {
 	c.timer = time.Now()
@@ -91,13 +99,17 @@ func (c *Control) Body(data interface{}) {
 			took := time.Now()
 			data = &Header{Duration: took.Sub(c.timer), Took: took.Sub(c.timer).String(), Data: data}
 		}
-		jsn, err := json.MarshalIndent(data, "", "  ")
+		var err error
+		if c.compactJSON {
+			content, err = json.Marshal(data)
+		} else {
+			content, err = json.MarshalIndent(data, "", "  ")
+		}
 		if err != nil {
 			c.Writer.WriteHeader(http.StatusInternalServerError)
 			return
 		}
 		c.Writer.Header().Add("Content-type", MIMEJSON)
-		content = jsn
 	}
 	if c.code > 0 {
 		c.Writer.WriteHeader(c.code)

router.go

@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 /*
-Package router 0.2.9 provides fast HTTP request router.
+Package router 0.2.10 provides fast HTTP request router.
 
 The router matches incoming requests by the request method and the path.
 If a handle is registered for this path and method, the router delegates the
@@ -51,6 +51,9 @@ Serve dynamic route with parameter:
 
 Checks JSON Content-Type automatically:
 
+	// Data is helper to construct JSON
+	type Data map[string]interface{}
+
 	func main() {
 		r := router.New()
 		r.GET("/settings/database/:db", func(c *router.Control) {
@@ -67,10 +70,14 @@ Checks JSON Content-Type automatically:
 		r.Listen(":8888")
 	}
 
-Custom handler with "Access-Control-Allow":
+Custom handler with "Access-Control-Allow" options and compact JSON:
+
+	// Data is helper to construct JSON
+	type Data map[string]interface{}
 
 	func baseHandler(handle router.Handle) router.Handle {
 		return func(c *router.Control) {
+			c.CompactJSON(true)
 			if origin := c.Request.Header.Get("Origin"); origin != "" {
 				c.Writer.Header().Set("Access-Control-Allow-Origin", origin)
 				c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
@@ -79,14 +86,18 @@ Custom handler with "Access-Control-Allow":
 		}
 	}
 
-	func Hello(c *router.Control) {
-		c.Body("Hello world")
+	func Info(c *router.Control) {
+		data := Data{
+			"debug": true,
+			"error": false,
+		}
+		c.Body(data)
 	}
 
 	func main() {
 		r := router.New()
 		r.CustomHandler = baseHandler
-		r.GET("/hello", Hello)
+		r.GET("/info", Info)
 
 		// Listen and serve on 0.0.0.0:8888
 		r.Listen(":8888")