go-aah/aah#157 code and flow optimization on http lib

Author: jeevatkm

ahttp.go

@@ -24,6 +24,13 @@ const (
 	MethodTrace   = http.MethodTrace
 )
 
+// URI Protocol scheme names
+const (
+	SchemeHTTP  = "http"
+	SchemeHTTPS = "https"
+	SchemeFTP   = "ftp"
+)
+
 // TimeFormat is the time format to use when generating times in HTTP
 // headers. It is like time.RFC1123 but hard-codes GMT as the time
 // zone. The time being formatted must be in UTC for Format to
@@ -53,6 +60,7 @@ func AcquireRequest(r *http.Request) *Request {
 // ReleaseRequest method resets the instance value and puts back to pool.
 func ReleaseRequest(r *Request) {
 	if r != nil {
+		r.cleanupMutlipart()
 		r.Reset()
 		requestPool.Put(r)
 	}

content_type.go

@@ -36,26 +36,29 @@ var (
 
 	// ContentTypeOctetStream content type for bytes.
 	ContentTypeOctetStream = parseMediaType("application/octet-stream")
-)
 
-type (
-	// ContentType is represents request and response content type values
-	ContentType struct {
-		Mime   string
-		Exts   []string
-		Params map[string]string
-	}
+	// ContentTypeJavascript content type.
+	ContentTypeJavascript = parseMediaType("application/javascript; charset=utf-8")
 )
 
 //‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-// Content-Type methods
+// Content-Type
 //___________________________________
 
-// IsEqual method compares give Content-Type string with current instance.
+// ContentType is represents request and response content type values
+type ContentType struct {
+	Mime   string
+	Exts   []string
+	Params map[string]string
+}
+
+// IsEqual method returns true if its equals to current content-type instance
+// otherwise false.
 //    E.g.:
 //      contentType.IsEqual("application/json")
+//      contentType.IsEqual("application/json; charset=utf-8")
 func (c *ContentType) IsEqual(contentType string) bool {
-	return strings.HasPrefix(c.String(), strings.ToLower(contentType))
+	return strings.HasPrefix(contentType, c.Mime)
 }
 
 // Charset method returns charset of content-type
@@ -65,7 +68,7 @@ func (c *ContentType) IsEqual(contentType string) bool {
 //
 // 		Method returns `utf-8`
 func (c *ContentType) Charset(defaultCharset string) string {
-	if v, ok := c.Params["charset"]; ok {
+	if v, found := c.Params["charset"]; found {
 		return v
 	}
 	return defaultCharset
@@ -117,6 +120,6 @@ func (c *ContentType) Raw() string {
 }
 
 // String is stringer interface
-func (c *ContentType) String() string {
+func (c ContentType) String() string {
 	return c.Raw()
 }

gzip_response.go

@@ -15,13 +15,6 @@ import (
 	"aahframework.org/essentials.v0"
 )
 
-// GzipResponse extends `ahttp.Response` and provides gzip for response
-// bytes before writing them to the underlying response.
-type GzipResponse struct {
-	r  *Response
-	gw *gzip.Writer
-}
-
 var (
 	// GzipLevel holds value from app config.
 	GzipLevel int
@@ -61,9 +54,16 @@ func PutGzipResponseWiriter(rw ResponseWriter) {
 }
 
 //‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-// Response methods
+// GzipResponse
 //___________________________________
 
+// GzipResponse extends `ahttp.Response` to provides gzip compression for response
+// bytes to the underlying response.
+type GzipResponse struct {
+	r  *Response
+	gw *gzip.Writer
+}
+
 // Status method returns HTTP response status code. If status is not yet written
 // it reurns 0.
 func (g *GzipResponse) Status() int {
@@ -82,9 +82,7 @@ func (g *GzipResponse) Header() http.Header {
 
 // Write method writes bytes into Response.
 func (g *GzipResponse) Write(b []byte) (int, error) {
-	g.r.setContentTypeIfNotSet(b)
 	g.r.WriteHeader(http.StatusOK)
-
 	size, err := g.gw.Write(b)
 	g.r.bytesWritten += size
 	return size, err

header.go

@@ -167,10 +167,9 @@ func NegotiateEncoding(req *http.Request) *AcceptSpec {
 // ParseContentType method parses the request header `Content-Type` as per RFC1521.
 func ParseContentType(req *http.Request) *ContentType {
 	contentType := req.Header.Get(HeaderContentType)
-	if ess.IsStrEmpty(contentType) {
+	if contentType == "" {
 		return ContentTypeHTML
 	}
-
 	return parseMediaType(contentType)
 }
 
@@ -281,7 +280,7 @@ func NewLocale(value string) *Locale {
 //___________________________________
 
 // String is stringer interface.
-func (l *Locale) String() string {
+func (l Locale) String() string {
 	return l.Raw
 }
 

header_test.go

@@ -94,26 +94,29 @@ func TestHTTPNegotiateLocale(t *testing.T) {
 
 func TestHTTPNegotiateEncoding(t *testing.T) {
 	req1 := createRawHTTPRequest(HeaderAcceptEncoding, "compress;q=0.5, gzip;q=1.0")
-	encoding := NegotiateEncoding(req1)
+	areq1 := AcquireRequest(req1)
+	encoding := areq1.AcceptEncoding()
+	assert.True(t, areq1.IsGzipAccepted)
 	assert.Equal(t, "gzip", encoding.Value)
 	assert.Equal(t, "gzip;q=1.0", encoding.Raw)
-	assert.True(t, isGzipAccepted(&Request{}, req1))
 
 	req2 := createRawHTTPRequest(HeaderAcceptEncoding, "gzip;q=1.0, identity; q=0.5, *;q=0")
-	encoding = NegotiateEncoding(req2)
+	areq2 := AcquireRequest(req2)
+	encoding = areq2.AcceptEncoding()
+	assert.True(t, areq2.IsGzipAccepted)
 	assert.Equal(t, "gzip", encoding.Value)
 	assert.Equal(t, "gzip;q=1.0", encoding.Raw)
-	assert.True(t, isGzipAccepted(&Request{}, req1))
 
 	req3 := createRawHTTPRequest(HeaderAcceptEncoding, "")
 	encoding = NegotiateEncoding(req3)
 	assert.Equal(t, true, encoding == nil)
 
 	req4 := createRawHTTPRequest(HeaderAcceptEncoding, "compress;q=0.5")
-	encoding = NegotiateEncoding(req4)
+	areq4 := AcquireRequest(req4)
+	encoding = areq4.AcceptEncoding()
+	assert.False(t, areq4.IsGzipAccepted)
 	assert.Equal(t, "compress", encoding.Value)
 	assert.Equal(t, "compress;q=0.5", encoding.Raw)
-	assert.False(t, isGzipAccepted(&Request{}, req4))
 }
 
 func TestHTTPAcceptHeaderVendorType(t *testing.T) {