rex.Router => rex.Server

middleware/static.go

@@ -4,6 +4,8 @@ import (
 	"net/http"
 	"path"
 	"strings"
+
+	"github.com/Sirupsen/logrus"
 )
 
 // Static serves as file server for static assets,
@@ -67,6 +69,10 @@ func Static(dir string) func(http.Handler) http.Handler {
 			}
 
 			http.ServeContent(w, r, filename, stat.ModTime(), file)
+			var header = w.Header()
+			for key, values := range header {
+				logrus.Infof("%s: %v", key, values)
+			}
 		})
 	}
 }

rex.go

@@ -11,59 +11,59 @@ import (
 )
 
 var (
-	DefaultMux = New()
+	Default = New()
 )
 
 // Get is a shortcut for mux.HandleFunc(pattern, handler).Methods("GET"),
 // it also fetch the full function name of the handler (with package) to name the route.
 func Get(pattern string, handler interface{}) {
-	DefaultMux.Get(pattern, handler)
+	Default.Get(pattern, handler)
 }
 
 // Head is a shortcut for mux.HandleFunc(pattern, handler).Methods("HEAD")
 // it also fetch the full function name of the handler (with package) to name the route.
 func Head(pattern string, handler interface{}) {
-	DefaultMux.Head(pattern, handler)
+	Default.Head(pattern, handler)
 }
 
 // Options is a shortcut for mux.HandleFunc(pattern, handler).Methods("OPTIONS")
 // it also fetch the full function name of the handler (with package) to name the route.
 // NOTE method OPTIONS is **NOT** cachable, beware of what you are going to do.
 func Options(pattern string, handler interface{}) {
-	DefaultMux.Options(pattern, handler)
+	Default.Options(pattern, handler)
 }
 
 // Post is a shortcut for mux.HandleFunc(pattern, handler).Methods("POST")
 // it also fetch the full function name of the handler (with package) to name the route.
 func Post(pattern string, handler interface{}) {
-	DefaultMux.Post(pattern, handler)
+	Default.Post(pattern, handler)
 }
 
 // Put is a shortcut for mux.HandleFunc(pattern, handler).Methods("PUT")
 // it also fetch the full function name of the handler (with package) to name the route.
 func Put(pattern string, handler interface{}) {
-	DefaultMux.Put(pattern, handler)
+	Default.Put(pattern, handler)
 }
 
 // Delete is a shortcut for mux.HandleFunc(pattern, handler).Methods("DELETE")
 // it also fetch the full function name of the handler (with package) to name the route.
 func Delete(pattern string, handler interface{}) {
-	DefaultMux.Delete(pattern, handler)
+	Default.Delete(pattern, handler)
 }
 
 // Group creates a new application group under the given path.
-func Group(path string) *Router {
-	return DefaultMux.Group(path)
+func Group(path string) *Server {
+	return Default.Group(path)
 }
 
 // Use appends middleware module into the serving list, modules will be served in FIFO order.
 func Use(module func(http.Handler) http.Handler) {
-	DefaultMux.Use(module)
+	Default.Use(module)
 }
 
 func Run() {
-	DefaultMux.Use(Logger)
-	DefaultMux.Run()
+	Default.Use(Logger)
+	Default.Run()
 }
 
 func init() {

schema.go

@@ -0,0 +1,24 @@
+package rex
+
+import (
+	"net/http"
+
+	"github.com/gorilla/schema"
+)
+
+var Schema = schema.NewDecoder()
+
+type Validator interface {
+	Validate() error
+}
+
+// ParseForm parsed the raw query from the URL and updates request.Form,
+// decode the from to the given struct with Validator implemented.
+func ParseForm(r *http.Request, form Validator) (err error) {
+	if err = r.ParseForm(); err == nil {
+		if err = Schema.Decode(form, r.Form); err == nil {
+			err = form.Validate()
+		}
+	}
+	return
+}

router.go → server.go

@@ -10,32 +10,32 @@ import (
 	"github.com/gorilla/mux"
 )
 
-type Router struct {
+type Server struct {
 	middleware *middleware
 	mux        *mux.Router
 	ready      bool
-	subrouters []*Router
+	subservers []*Server
 }
 
-func New() *Router {
-	return &Router{
+func New() *Server {
+	return &Server{
 		middleware: new(middleware),
 		mux:        mux.NewRouter().StrictSlash(true),
 	}
 }
 
-// build constructs all router/subrouters along with their middleware modules chain.
-func (self *Router) build() http.Handler {
+// build constructs all server/subservers along with their middleware modules chain.
+func (self *Server) build() http.Handler {
 	if !self.ready {
-		// * add router into middlware stack to serve as final http.Handler.
+		// * add server mux into middlware stack to serve as final http.Handler.
 		self.Use(func(http.Handler) http.Handler {
 			return self.mux
 		})
-		// * add subrouters into middlware stack to serve as final http.Handler.
-		for index := 0; index < len(self.subrouters); index++ {
-			router := self.subrouters[index]
-			router.Use(func(http.Handler) http.Handler {
-				return router.mux
+		// * add subservers into middlware stack to serve as final http.Handler.
+		for index := 0; index < len(self.subservers); index++ {
+			server := self.subservers[index]
+			server.Use(func(http.Handler) http.Handler {
+				return server.mux
 			})
 		}
 		self.ready = true
@@ -44,7 +44,7 @@ func (self *Router) build() http.Handler {
 }
 
 // register adds the http.Handler/http.HandleFunc into Gorilla mux.
-func (self *Router) register(method string, pattern string, handler interface{}) {
+func (self *Server) register(method string, pattern string, handler interface{}) {
 	// finds the full function name (with package) as its mappings.
 	var name = runtime.FuncForPC(reflect.ValueOf(handler).Pointer()).Name()
 
@@ -62,54 +62,54 @@ func (self *Router) register(method string, pattern string, handler interface{})
 
 // Get is a shortcut for mux.HandleFunc(pattern, handler).Methods("GET"),
 // it also fetch the full function name of the handler (with package) to name the route.
-func (self *Router) Get(pattern string, handler interface{}) {
+func (self *Server) Get(pattern string, handler interface{}) {
 	self.register("GET", pattern, handler)
 }
 
 // Head is a shortcut for mux.HandleFunc(pattern, handler).Methods("HEAD")
 // it also fetch the full function name of the handler (with package) to name the route.
-func (self *Router) Head(pattern string, handler interface{}) {
+func (self *Server) Head(pattern string, handler interface{}) {
 	self.register("HEAD", pattern, handler)
 }
 
 // Options is a shortcut for mux.HandleFunc(pattern, handler).Methods("OPTIONS")
 // it also fetch the full function name of the handler (with package) to name the route.
 // NOTE method OPTIONS is **NOT** cachable, beware of what you are going to do.
-func (self *Router) Options(pattern string, handler interface{}) {
+func (self *Server) Options(pattern string, handler interface{}) {
 	self.register("OPTIONS", pattern, handler)
 }
 
 // Post is a shortcut for mux.HandleFunc(pattern, handler).Methods("POST")
 // it also fetch the full function name of the handler (with package) to name the route.
-func (self *Router) Post(pattern string, handler interface{}) {
+func (self *Server) Post(pattern string, handler interface{}) {
 	self.register("POST", pattern, handler)
 }
 
 // Put is a shortcut for mux.HandleFunc(pattern, handler).Methods("PUT")
 // it also fetch the full function name of the handler (with package) to name the route.
-func (self *Router) Put(pattern string, handler interface{}) {
+func (self *Server) Put(pattern string, handler interface{}) {
 	self.register("PUT", pattern, handler)
 }
 
 // Delete is a shortcut for mux.HandleFunc(pattern, handler).Methods("DELETE")
 // it also fetch the full function name of the handler (with package) to name the route.
-func (self *Router) Delete(pattern string, handler interface{}) {
+func (self *Server) Delete(pattern string, handler interface{}) {
 	self.register("Delete", pattern, handler)
 }
 
 // Group creates a new application group under the given path prefix.
-func (self *Router) Group(prefix string) *Router {
+func (self *Server) Group(prefix string) *Server {
 	var middleware = new(middleware)
 	self.mux.PathPrefix(prefix).Handler(middleware)
 	var mux = self.mux.PathPrefix(prefix).Subrouter()
 
-	router := &Router{middleware: middleware, mux: mux}
-	self.subrouters = append(self.subrouters, router)
-	return router
+	server := &Server{middleware: middleware, mux: mux}
+	self.subservers = append(self.subservers, server)
+	return server
 }
 
 // Name returns route name for the given request, if any.
-func (self *Router) Name(r *http.Request) (name string) {
+func (self *Server) Name(r *http.Request) (name string) {
 	var match mux.RouteMatch
 	if self.mux.Match(r, &match) {
 		name = match.Route.GetName()
@@ -118,18 +118,18 @@ func (self *Router) Name(r *http.Request) (name string) {
 }
 
 // Use add the middleware module into the stack chain.
-func (self *Router) Use(module func(http.Handler) http.Handler) {
+func (self *Server) Use(module func(http.Handler) http.Handler) {
 	self.middleware.stack = append(self.middleware.stack, module)
 }
 
 // ServeHTTP dispatches the request to the handler whose
 // pattern most closely matches the request URL.
-func (self *Router) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (self *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	self.build().ServeHTTP(w, r)
 }
 
 // Run starts the application server to serve incoming requests at the given address.
-func (self *Router) Run() {
+func (self *Server) Run() {
 	configure()
 	runtime.GOMAXPROCS(maxprocs)
 
@@ -144,6 +144,6 @@ func (self *Router) Run() {
 }
 
 // Vars returns the route variables for the current request, if any.
-func (self *Router) Vars(r *http.Request) map[string]string {
+func (self *Server) Vars(r *http.Request) map[string]string {
 	return mux.Vars(r)
 }