Add web.Process and web.Server.Process

mattn · hoisie · commit 646b194f6ec3 · 2013-04-13T11:00:25.000-07:00
These invoke the routing system directly. They can be used for testing,
as well as processing HTTP requests that are constructed from other
sources.
diff --git a/web.go b/web.go
@@ -234,9 +234,14 @@ func (c *responseWriter) Close() {
     }
 }
 
+// ServeHTTP is the interface method for Go's http server package
 func (s *Server) ServeHTTP(c http.ResponseWriter, req *http.Request) {
-    w := responseWriter{c}
-    s.routeHandler(req, &w)
+    s.Process(c, req)
+}
+
+// Process invokes the main server's routing system.
+func Process(c http.ResponseWriter, req *http.Request) {
+    mainServer.Process(c, req)
 }
 
 // safelyCall invokes `function` in recover block
@@ -423,6 +428,12 @@ func (s *Server) initServer() {
     }
 }
 
+// Process invokes the routing system for server s
+func (s *Server) Process(c http.ResponseWriter, req *http.Request) {
+    w := responseWriter{c}
+    s.routeHandler(req, &w)
+}
+
 // Run starts the web application and serves HTTP requests for s
 func (s *Server) Run(addr string) {
     s.initServer()
diff --git a/web_test.go b/web_test.go
@@ -93,7 +93,7 @@ func getTestResponse(method string, path string, body string, headers map[string
 
     tcpb := tcpBuffer{nil, &buf}
     c := scgiConn{wroteHeaders: false, req: req, headers: make(map[string][]string), fd: &tcpb}
-    mainServer.routeHandler(req, &c)
+    mainServer.Process(&c, req)
     return buildTestResponse(&buf)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -234,9 +234,14 @@ func (c *responseWriter) Close() {`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`
	`237`	`+// ServeHTTP is the interface method for Go's http server package`
`237`	`238`	`func (s Server) ServeHTTP(c http.ResponseWriter, req http.Request) {`
`238`		`- w := responseWriter{c}`
`239`		`- s.routeHandler(req, &w)`
	`239`	`+ s.Process(c, req)`
	`240`	`+}`
	`241`	`+`
	`242`	`+// Process invokes the main server's routing system.`
	`243`	`+func Process(c http.ResponseWriter, req *http.Request) {`
	`244`	`+ mainServer.Process(c, req)`
`240`	`245`	`}`
`241`	`246`
`242`	`247`	// safelyCall invokes `function` in recover block
`@@ -423,6 +428,12 @@ func (s *Server) initServer() {`
`423`	`428`	`}`
`424`	`429`	`}`
`425`	`430`
	`431`	`+// Process invokes the routing system for server s`
	`432`	`+func (s Server) Process(c http.ResponseWriter, req http.Request) {`
	`433`	`+ w := responseWriter{c}`
	`434`	`+ s.routeHandler(req, &w)`
	`435`	`+}`
	`436`	`+`
`426`	`437`	`// Run starts the web application and serves HTTP requests for s`
`427`	`438`	`func (s *Server) Run(addr string) {`
`428`	`439`	`s.initServer()`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func getTestResponse(method string, path string, body string, headers map[string`
`93`	`93`
`94`	`94`	`tcpb := tcpBuffer{nil, &buf}`
`95`	`95`	`c := scgiConn{wroteHeaders: false, req: req, headers: make(map[string][]string), fd: &tcpb}`
`96`		`- mainServer.routeHandler(req, &c)`
	`96`	`+ mainServer.Process(&c, req)`
`97`	`97`	`return buildTestResponse(&buf)`
`98`	`98`	`}`
`99`	`99`