Merge branch 'release-0.1.1'

router.go

@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 /*
-Package router 0.1.0 provides fast HTTP request router.
+Package router 0.1.1 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

router_test.go

@@ -5,19 +5,46 @@
 package router
 
 import (
+	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"strings"
 	"testing"
 )
 
-func TestRouterSimplestUsing(t *testing.T) {
+func TestRouterRegisterHandlers(t *testing.T) {
 	r := New()
 	r.GET("/hello", func(c *Control) {
 		c.Body("Hello")
 	})
 	r.GET("/hello/:name", func(c *Control) {
 		c.Body("Hello " + c.Get(":name"))
 	})
+	r.GET("/users/:name", func(c *Control) {
+		c.Body("Users: " + c.Get(":name") + " " + c.Get("name"))
+	})
+	r.POST("/users", func(c *Control) {
+		body, err := ioutil.ReadAll(c.Request.Body)
+		if err != nil {
+			t.Error(err)
+		}
+		var values map[string]string
+		if err := json.Unmarshal(body, &values); err != nil {
+			t.Error(err)
+		}
+		c.Body("User: " + values["name"])
+	})
+	r.PUT("/users", func(c *Control) {
+		body, err := ioutil.ReadAll(c.Request.Body)
+		if err != nil {
+			t.Error(err)
+		}
+		var values map[string]string
+		if err := json.Unmarshal(body, &values); err != nil {
+			t.Error(err)
+		}
+		c.Body("Users: " + values["name1"] + " " + values["name2"])
+	})
 	go r.Listen(":8888")
 	if handle, params, ok := r.Lookup("GET", "/hello"); ok {
 		if handle == nil {
@@ -45,6 +72,9 @@ func TestRouterSimplestUsing(t *testing.T) {
 	} else {
 		t.Error("Path not fouund: /hello/John")
 	}
+}
+
+func TestRouterGetStatic(t *testing.T) {
 	response, err := http.Get("http://localhost:8888/hello")
 	if err != nil {
 		t.Error(err)
@@ -57,11 +87,14 @@ func TestRouterSimplestUsing(t *testing.T) {
 	if string(body) != "Hello" {
 		t.Error("Expected", "Hello", "got", string(body))
 	}
-	response, err = http.Get("http://localhost:8888/hello/John")
+}
+
+func TestRouterGetParameter(t *testing.T) {
+	response, err := http.Get("http://localhost:8888/hello/John")
 	if err != nil {
 		t.Error(err)
 	}
-	body, err = ioutil.ReadAll(response.Body)
+	body, err := ioutil.ReadAll(response.Body)
 	response.Body.Close()
 	if err != nil {
 		t.Error(err)
@@ -70,3 +103,56 @@ func TestRouterSimplestUsing(t *testing.T) {
 		t.Error("Expected", "Hello John", "got", string(body))
 	}
 }
+
+func TestRouterGetParameterFromClassicUrl(t *testing.T) {
+	response, err := http.Get("http://localhost:8888/users/Jane/?name=Joe")
+	if err != nil {
+		t.Error(err)
+	}
+	body, err := ioutil.ReadAll(response.Body)
+	response.Body.Close()
+	if err != nil {
+		t.Error(err)
+	}
+	if string(body) != "Users: Jane Joe" {
+		t.Error("Expected", "Users: Jane Joe", "got", string(body))
+	}
+}
+
+func TestRouterPostJSONData(t *testing.T) {
+	reader := strings.NewReader(`{"name": "Tom"}`)
+	response, err := http.Post("http://localhost:8888/users/", MIMEJSON, reader)
+	if err != nil {
+		t.Error(err)
+	}
+	body, err := ioutil.ReadAll(response.Body)
+	response.Body.Close()
+	if err != nil {
+		t.Error(err)
+	}
+	if string(body) != "User: Tom" {
+		t.Error("Expected", "User: Tom", "got", string(body))
+	}
+
+}
+
+func TestRouterPutJSONData(t *testing.T) {
+	reader := strings.NewReader(`{"name1": "user1", "name2": "user2"}`)
+	client := new(http.Client)
+	req, err := http.NewRequest("PUT", "http://localhost:8888/users/", reader)
+	if err != nil {
+		t.Error(err)
+	}
+	response, err := client.Do(req)
+	if err != nil {
+		t.Error(err)
+	}
+	body, err := ioutil.ReadAll(response.Body)
+	response.Body.Close()
+	if err != nil {
+		t.Error(err)
+	}
+	if string(body) != "Users: user1 user2" {
+		t.Error("Expected", "Users: user1 user2", "got", string(body))
+	}
+}