Merge pull request astaxie#776 from vCaesar/u7-pr

Update RESTful and NoSQL

Author: astaxie

README.md

@@ -21,6 +21,10 @@ QQ群：148647580
 
 BBS：[http://golanghome.com/](http://gocn.io/)
 
+##Contributors
+
+- See [contributors page](https://github.com/astaxie/build-web-application-with-golang/graphs/contributors) for full list of contributors.
+
 ## Acknowledgments
 
  - [四月份平民](https://plus.google.com/110445767383269817959) (review代码)

de/05.6.md

@@ -10,10 +10,90 @@ redis is a key-value storage system like Memcached, that supports the string, li
 
 There are some Go database drivers for redis:
 
+- [https://github.com/garyburd/redigo](https://github.com/garyburd/redigo)
+- [https://github.com/go-redis/redis](https://github.com/go-redis/redis)
+- [https://github.com/hoisie/redis](https://github.com/hoisie/redis)
 - [https://github.com/alphazero/Go-Redis](https://github.com/alphazero/Go-Redis)
-- [http://code.google.com/p/tideland-rdc/](http://code.google.com/p/tideland-rdc/)
 - [https://github.com/simonz05/godis](https://github.com/simonz05/godis)
-- [https://github.com/hoisie/redis.go](https://github.com/hoisie/redis.go)
+
+Let's see how to use the driver that redigo to operate on a database:
+
+```Go
+
+	package main
+
+	import (
+		"fmt"
+		"github.com/garyburd/redigo/redis"
+		"os"
+    	"os/signal"
+		"syscall"
+		"time"
+	)
+
+	var (
+		Pool *redis.Pool
+	)
+
+	func init() {
+		redisHost := ":6379"
+		Pool = newPool(redisHost)
+		close()
+	}
+
+	func newPool(server string) *redis.Pool {
+
+		return &redis.Pool{
+
+			MaxIdle:     3,
+			IdleTimeout: 240 * time.Second,
+
+			Dial: func() (redis.Conn, error) {
+				c, err := redis.Dial("tcp", server)
+				if err != nil {
+					return nil, err
+				}
+				return c, err
+			},
+
+			TestOnBorrow: func(c redis.Conn, t time.Time) error {
+				_, err := c.Do("PING")
+				return err
+			},
+		}
+	}
+
+	func close() {
+		c := make(chan os.Signal, 1)
+		signal.Notify(c, os.Interrupt)
+		signal.Notify(c, syscall.SIGTERM)
+		signal.Notify(c, syscall.SIGKILL)
+		go func() {
+			<-c
+			Pool.Close()
+			os.Exit(0)
+		}()
+	}
+
+	func Get(key string) ([]byte, error) {
+
+		conn := Pool.Get()
+		defer conn.Close()
+
+		var data []byte
+		data, err := redis.Bytes(conn.Do("GET", key))
+		if err != nil {
+			return data, fmt.Errorf("error get key %s: %v", key, err)
+		}
+		return data, err
+	}
+
+	func main() {
+		test, err := Get("test")
+		fmt.Println(test, err)
+	}
+
+```
 
 I forked the last of these packages, fixed some bugs, and used it in my short URL service (2 million PV every day).
 

de/08.3.md

@@ -68,49 +68,62 @@ The picture above shows three levels that are currently implemented in REST. You
 
 We can simulate `PUT` and `DELETE` requests by adding a hidden `_method` field in our POST requests, however these requests must be converted on the server side before they are processed. My personal applications use this workflow to implement REST interfaces. Standard RESTful interfaces are easily implemented in Go, as the following example demonstrates:
 
+```Go
+
 	package main
 
 	import (
 		"fmt"
-		"github.com/drone/routes"
+		"github.com/julienschmidt/httprouter"
+		"log"
 		"net/http"
 	)
 
-	func getuser(w http.ResponseWriter, r *http.Request) {
-		params := r.URL.Query()
-		uid := params.Get(":uid")
+	func Index(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+		fmt.Fprint(w, "Welcome!\n")
+	}
+
+	func Hello(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+		fmt.Fprintf(w, "hello, %s!\n", ps.ByName("name"))
+	}
+
+	func getuser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+		uid := ps.ByName("uid")
 		fmt.Fprintf(w, "you are get user %s", uid)
 	}
 
-	func modifyuser(w http.ResponseWriter, r *http.Request) {
-		params := r.URL.Query()
-		uid := params.Get(":uid")
+	func modifyuser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+		uid := ps.ByName("uid")
 		fmt.Fprintf(w, "you are modify user %s", uid)
 	}
 
-	func deleteuser(w http.ResponseWriter, r *http.Request) {
-		params := r.URL.Query()
-		uid := params.Get(":uid")
+	func deleteuser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+		uid := ps.ByName("uid")
 		fmt.Fprintf(w, "you are delete user %s", uid)
 	}
 
-	func adduser(w http.ResponseWriter, r *http.Request) {
-		params := r.URL.Query()
-		uid := params.Get(":uid")
-		fmt.Fprint(w, "you are add user %s", uid)
+	func adduser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+		// uid := r.FormValue("uid")
+		uid := ps.ByName("uid")
+		fmt.Fprintf(w, "you are add user %s", uid)
 	}
 
 	func main() {
-		mux := routes.New()
-		mux.Get("/user/:uid", getuser)
-		mux.Post("/user/:uid", modifyuser)
-		mux.Del("/user/:uid", deleteuser)
-		mux.Put("/user/", adduser)
-		http.Handle("/", mux)
-		http.ListenAndServe(":8088", nil)
+		router := httprouter.New()
+		router.GET("/", Index)
+		router.GET("/hello/:name", Hello)
+
+		router.GET("/user/:uid", getuser)
+		router.POST("/adduser/:uid", adduser)
+		router.DELETE("/deluser/:uid", deleteuser)
+		router.PUT("/moduser/:uid", modifyuser)
+
+		log.Fatal(http.ListenAndServe(":8080", router))
 	}
 
-This sample code shows you how to write a very basic REST application. Our resources are users, and we use different functions for different methods. Here, we imported a third-party package called `github.com/drone/routes`. We've already covered how to implement a custom router in previous chapters -the `drone/routes` package implements some very convenient router mapping rules that make it very convenient for implementing RESTful architecture. As you can see, REST requires you to implement different logic for different HTTP methods of the same resource.
+```
+
+This sample code shows you how to write a very basic REST application. Our resources are users, and we use different functions for different methods. Here, we imported a third-party package called `github.com/julienschmidt/httprouter`. We've already covered how to implement a custom router in previous chapters -the `julienschmidt/httprouter` package implements some very convenient router mapping rules that make it very convenient for implementing RESTful architecture. As you can see, REST requires you to implement different logic for different HTTP methods of the same resource.
 
 ## Summary
 

en/08.3.md

@@ -68,49 +68,62 @@ The picture above shows three levels that are currently implemented in REST. You
 
 We can simulate `PUT` and `DELETE` requests by adding a hidden `_method` field in our POST requests, however these requests must be converted on the server side before they are processed. My personal applications use this workflow to implement REST interfaces. Standard RESTful interfaces are easily implemented in Go, as the following example demonstrates:
 
+```Go
+
 	package main
 
 	import (
 		"fmt"
-		"github.com/drone/routes"
+		"github.com/julienschmidt/httprouter"
+		"log"
 		"net/http"
 	)
 
-	func getuser(w http.ResponseWriter, r *http.Request) {
-		params := r.URL.Query()
-		uid := params.Get(":uid")
+	func Index(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+		fmt.Fprint(w, "Welcome!\n")
+	}
+
+	func Hello(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+		fmt.Fprintf(w, "hello, %s!\n", ps.ByName("name"))
+	}
+
+	func getuser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+		uid := ps.ByName("uid")
 		fmt.Fprintf(w, "you are get user %s", uid)
 	}
 
-	func modifyuser(w http.ResponseWriter, r *http.Request) {
-		params := r.URL.Query()
-		uid := params.Get(":uid")
+	func modifyuser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+		uid := ps.ByName("uid")
 		fmt.Fprintf(w, "you are modify user %s", uid)
 	}
 
-	func deleteuser(w http.ResponseWriter, r *http.Request) {
-		params := r.URL.Query()
-		uid := params.Get(":uid")
+	func deleteuser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+		uid := ps.ByName("uid")
 		fmt.Fprintf(w, "you are delete user %s", uid)
 	}
 
-	func adduser(w http.ResponseWriter, r *http.Request) {
-		params := r.URL.Query()
-		uid := params.Get(":uid")
-		fmt.Fprint(w, "you are add user %s", uid)
+	func adduser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+		// uid := r.FormValue("uid")
+		uid := ps.ByName("uid")
+		fmt.Fprintf(w, "you are add user %s", uid)
 	}
 
 	func main() {
-		mux := routes.New()
-		mux.Get("/user/:uid", getuser)
-		mux.Post("/user/:uid", modifyuser)
-		mux.Del("/user/:uid", deleteuser)
-		mux.Put("/user/", adduser)
-		http.Handle("/", mux)
-		http.ListenAndServe(":8088", nil)
+		router := httprouter.New()
+		router.GET("/", Index)
+		router.GET("/hello/:name", Hello)
+
+		router.GET("/user/:uid", getuser)
+		router.POST("/adduser/:uid", adduser)
+		router.DELETE("/deluser/:uid", deleteuser)
+		router.PUT("/moduser/:uid", modifyuser)
+
+		log.Fatal(http.ListenAndServe(":8080", router))
 	}
 
-This sample code shows you how to write a very basic REST application. Our resources are users, and we use different functions for different methods. Here, we imported a third-party package called `github.com/drone/routes`. We've already covered how to implement a custom router in previous chapters -the `drone/routes` package implements some very convenient router mapping rules that make it very convenient for implementing RESTful architecture. As you can see, REST requires you to implement different logic for different HTTP methods of the same resource.
+```
+
+This sample code shows you how to write a very basic REST application. Our resources are users, and we use different functions for different methods. Here, we imported a third-party package called `github.com/julienschmidt/httprouter`. We've already covered how to implement a custom router in previous chapters -the `julienschmidt/httprouter` package implements some very convenient router mapping rules that make it very convenient for implementing RESTful architecture. As you can see, REST requires you to implement different logic for different HTTP methods of the same resource.
 
 ## Summary
 

es/05.6.md

@@ -9,11 +9,90 @@ Al ser el lenguaje C del siglo XXI, Go tiene soporte para bases de datos NoSQL,
 redis es un sistema de almacenamiento llave valor como Memcached, que soporta los tipos de  cadenas, listas conjuntos y conjuntos ordenados.
 
 Aquí están algunos de los manejadores de bases de datos para redis:
-
+- [https://github.com/garyburd/redigo](https://github.com/garyburd/redigo)
+- [https://github.com/go-redis/redis](https://github.com/go-redis/redis)
+- [https://github.com/hoisie/redis](https://github.com/hoisie/redis)
 - [https://github.com/alphazero/Go-Redis](https://github.com/alphazero/Go-Redis)
-- [http://code.google.com/p/tideland-rdc/](http://code.google.com/p/tideland-rdc/)
 - [https://github.com/simonz05/godis](https://github.com/simonz05/godis)
-- [https://github.com/hoisie/redis.go](https://github.com/hoisie/redis.go)
+
+Let's see how to use the driver that redigo to operate on a database:
+
+```Go
+
+	package main
+
+	import (
+		"fmt"
+		"github.com/garyburd/redigo/redis"
+		"os"
+    	"os/signal"
+		"syscall"
+		"time"
+	)
+
+	var (
+		Pool *redis.Pool
+	)
+
+	func init() {
+		redisHost := ":6379"
+		Pool = newPool(redisHost)
+		close()
+	}
+
+	func newPool(server string) *redis.Pool {
+
+		return &redis.Pool{
+
+			MaxIdle:     3,
+			IdleTimeout: 240 * time.Second,
+
+			Dial: func() (redis.Conn, error) {
+				c, err := redis.Dial("tcp", server)
+				if err != nil {
+					return nil, err
+				}
+				return c, err
+			},
+
+			TestOnBorrow: func(c redis.Conn, t time.Time) error {
+				_, err := c.Do("PING")
+				return err
+			},
+		}
+	}
+
+	func close() {
+		c := make(chan os.Signal, 1)
+		signal.Notify(c, os.Interrupt)
+		signal.Notify(c, syscall.SIGTERM)
+		signal.Notify(c, syscall.SIGKILL)
+		go func() {
+			<-c
+			Pool.Close()
+			os.Exit(0)
+		}()
+	}
+
+	func Get(key string) ([]byte, error) {
+
+		conn := Pool.Get()
+		defer conn.Close()
+
+		var data []byte
+		data, err := redis.Bytes(conn.Do("GET", key))
+		if err != nil {
+			return data, fmt.Errorf("error get key %s: %v", key, err)
+		}
+		return data, err
+	}
+
+	func main() {
+		test, err := Get("test")
+		fmt.Println(test, err)
+	}
+
+```
 
 Realicé una bifurcación de el último de estos paquetes, arreglé algunos servicios y lo usé en mi sistema de acortado de urls (2 millones de peticiones por día).