Browse Source

fix naming conflicts

tags/v0.9.0
jimzhan 9 years ago
parent
commit
bd36460d90
2 changed files with 15 additions and 15 deletions
  1. +12
    -12
      rex.go
  2. +3
    -3
      router.go

+ 12
- 12
rex.go View File

) )


var ( var (
mux = New()
DefaultMux = New()


options = struct { options = struct {
debug bool debug bool
// Get is a shortcut for mux.HandleFunc(pattern, handler).Methods("GET"), // 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. // it also fetch the full function name of the handler (with package) to name the route.
func Get(pattern string, handler interface{}) { func Get(pattern string, handler interface{}) {
mux.register("GET", pattern, handler)
DefaultMux.register("GET", pattern, handler)
} }


// Head is a shortcut for mux.HandleFunc(pattern, handler).Methods("HEAD") // 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. // it also fetch the full function name of the handler (with package) to name the route.
func Head(pattern string, handler interface{}) { func Head(pattern string, handler interface{}) {
mux.register("HEAD", pattern, handler)
DefaultMux.register("HEAD", pattern, handler)
} }


// Options is a shortcut for mux.HandleFunc(pattern, handler).Methods("OPTIONS") // 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. // 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. // NOTE method OPTIONS is **NOT** cachable, beware of what you are going to do.
func Options(pattern string, handler interface{}) { func Options(pattern string, handler interface{}) {
mux.register("OPTIONS", pattern, handler)
DefaultMux.register("OPTIONS", pattern, handler)
} }


// Post is a shortcut for mux.HandleFunc(pattern, handler).Methods("POST") // 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. // it also fetch the full function name of the handler (with package) to name the route.
func Post(pattern string, handler interface{}) { func Post(pattern string, handler interface{}) {
mux.register("POST", pattern, handler)
DefaultMux.register("POST", pattern, handler)
} }


// Put is a shortcut for mux.HandleFunc(pattern, handler).Methods("PUT") // 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. // it also fetch the full function name of the handler (with package) to name the route.
func Put(pattern string, handler interface{}) { func Put(pattern string, handler interface{}) {
mux.register("PUT", pattern, handler)
DefaultMux.register("PUT", pattern, handler)
} }


// Delete is a shortcut for mux.HandleFunc(pattern, handler).Methods("DELETE") // 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. // it also fetch the full function name of the handler (with package) to name the route.
func Delete(pattern string, handler interface{}) { func Delete(pattern string, handler interface{}) {
mux.register("Delete", pattern, handler)
DefaultMux.register("Delete", pattern, handler)
} }


// Group creates a new application group under the given path. // Group creates a new application group under the given path.
func Group(path string) *Router { func Group(path string) *Router {
return mux.Group(path)
return DefaultMux.Group(path)
} }


// FileServer registers a handler to serve HTTP requests // FileServer registers a handler to serve HTTP requests
// with the contents of the file system rooted at root. // with the contents of the file system rooted at root.
func FileServer(prefix, dir string) { func FileServer(prefix, dir string) {
mux.FileServer(prefix, dir)
DefaultMux.FileServer(prefix, dir)
} }


// Use appends middleware module into the serving list, modules will be served in FIFO order. // Use appends middleware module into the serving list, modules will be served in FIFO order.
func Use(module func(http.Handler) http.Handler) { func Use(module func(http.Handler) http.Handler) {
mux.Use(module)
DefaultMux.Use(module)
} }


func Run() { func Run() {
mux.Use(modules.Logger)
mux.Run()
DefaultMux.Use(modules.Logger)
DefaultMux.Run()
} }


func init() { func init() {

+ 3
- 3
router.go View File

} }


// build constructs all router/subrouters along with their middleware modules chain. // build constructs all router/subrouters along with their middleware modules chain.
func (self *Router) build() {
func (self *Router) build() http.Handler {
if !self.ready { if !self.ready {
self.ready = true self.ready = true
// * activate router's middleware modules. // * activate router's middleware modules.
sr.mod.Use(sr.mux) sr.mod.Use(sr.mux)
} }
} }
return self.mod
} }


// register adds the http.Handler/http.HandleFunc into Gorilla mux. // register adds the http.Handler/http.HandleFunc into Gorilla mux.
// ServeHTTP dispatches the request to the handler whose // ServeHTTP dispatches the request to the handler whose
// pattern most closely matches the request URL. // pattern most closely matches the request URL.
func (self *Router) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (self *Router) ServeHTTP(w http.ResponseWriter, r *http.Request) {
self.build()
self.mod.ServeHTTP(w, r)
self.build().ServeHTTP(w, r)
} }


// Run starts the application server to serve incoming requests at the given address. // Run starts the application server to serve incoming requests at the given address.

Loading…
Cancel
Save