router, action

Author: jeevatkm

header_test.go

@@ -114,18 +114,23 @@ func TestNegotiateContentType(t *testing.T) {
 
 	req := createRawHTTPRequest(HeaderAccept, "application/json")
 	req.URL, _ = url.Parse("http://localhost:8080/testpath.json")
-	// req.Path = req.Raw.URL.Path
 	contentType = NegotiateContentType(req)
 	assert.Equal(t, "application/json", contentType.Mime)
 	assert.Equal(t, ".json", contentType.Exts[0])
 
 	req = createRawHTTPRequest(HeaderAccept, "application/json")
 	req.URL, _ = url.Parse("http://localhost:8080/testpath.html")
-	// req.Path = req.Raw.URL.Path
 	contentType = NegotiateContentType(req)
 	assert.Equal(t, "text/html; charset=utf-8", contentType.Mime)
 	assert.Equal(t, ".html", contentType.Exts[0])
 
+	req = createRawHTTPRequest(HeaderAccept, "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8")
+	contentType = NegotiateContentType(req)
+	assert.Equal(t, "text/html", contentType.String())
+	assert.Equal(t, "text/html", contentType.Mime)
+	assert.Equal(t, "", contentType.Version())
+
+	// ParseAccept
 	req = createRawHTTPRequest(HeaderAccept, "application/json; version=2")
 	spec := ParseAccept(req, HeaderAccept).MostQualified()
 	assert.Equal(t, "2", spec.GetParam("version", "1"))
@@ -137,6 +142,7 @@ func TestNegotiateContentType(t *testing.T) {
 	req = createRawHTTPRequest(HeaderAccept, "application/json; version")
 	spec = ParseAccept(req, HeaderAccept).MostQualified()
 	assert.Equal(t, "", spec.GetParam("version", "1"))
+
 }
 
 func TestNegotiateEncoding(t *testing.T) {

request.go

@@ -43,9 +43,6 @@ type Request struct {
 	// and PATCH body parameters take precedence over URL query string values.
 	Params url.Values
 
-	// PathParams contains values of request path parameters. e.g. /hello/{name}.
-	PathParams url.Values
-
 	// Referer value of the HTTP 'Referrer' (or 'Referer') header.
 	Referer string
 
@@ -60,27 +57,36 @@ type Request struct {
 	Raw *http.Request
 }
 
-// ParseRequest method creates aah framework `ahttp.Request` instance from go
-// HTTP request.
-func ParseRequest(r *http.Request) *Request {
-	req := &Request{
-		Host:              r.Host,
-		Method:            r.Method,
-		Path:              r.URL.Path,
-		Header:            r.Header,
-		ContentType:       ParseContentType(r),
-		AcceptContentType: NegotiateContentType(r),
-		Params:            url.Values{},
-		PathParams:        url.Values{},
-		Referer:           getReferer(r.Header),
-		ClientIP:          ClientIP(r),
-		Locale:            NegotiateLocale(r),
-		Raw:               r,
-	}
+// ParseRequest method populates the given aah framework `ahttp.Request`
+// instance from Go HTTP request.
+func ParseRequest(r *http.Request, req *Request) *Request {
+	req.Host = r.Host
+	req.Method = r.Method
+	req.Path = r.URL.Path
+	req.Header = r.Header
+	req.ContentType = ParseContentType(r)
+	req.AcceptContentType = NegotiateContentType(r)
+	req.Params = url.Values{}
+	req.Referer = getReferer(r.Header)
+	req.ClientIP = ClientIP(r)
+	req.Locale = NegotiateLocale(r)
+	req.Raw = r
 
 	return req
 }
 
+// Reset method resets request instance for reuse.
+func (r *Request) Reset() {
+	r.Header = nil
+	r.ContentType = nil
+	r.AcceptContentType = nil
+	r.Params = nil
+	r.Referer = ""
+	r.ClientIP = ""
+	r.Locale = nil
+	r.Raw = nil
+}
+
 //‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 // Unexported methods
 //___________________________________

request_test.go

@@ -55,7 +55,7 @@ func TestParseRequest(t *testing.T) {
 	req.Header.Add(HeaderAcceptLanguage, "en-gb;leve=1;q=0.8, da, en;level=2;q=0.7, en-us;q=gg")
 	req.URL, _ = url.Parse("http://localhost:8000/welcome1.html?_ref=true")
 
-	aahReq := ParseRequest(req)
+	aahReq := ParseRequest(req, &Request{})
 
 	assert.Equal(t, "127.0.0.1:8080", aahReq.Host)
 	assert.Equal(t, "GET", aahReq.Method)