render file and bytes. use reply builder

Author: jeevatkm

fs.go

@@ -11,7 +11,7 @@ import (
 )
 
 // FileOnlyFilesystem extends/wraps `http.FileSystem` to disable directory listing
-// fucntionality
+// functionality
 type FileOnlyFilesystem struct {
 	Fs  http.FileSystem
 	dir string
@@ -36,7 +36,7 @@ func Dir(path string, listDir bool) http.FileSystem {
 // FileOnlyFilesystem methods
 //___________________________________
 
-// Open method is compilance with `http.FileSystem` interface and disables
+// Open method is compliance with `http.FileSystem` interface and disables
 // directory listing
 func (fs FileOnlyFilesystem) Open(name string) (http.File, error) {
 	stat, err := os.Lstat(filepath.Join(fs.dir, name))

request.go

@@ -13,6 +13,8 @@ import (
 	"aahframework.org/essentials"
 )
 
+const jsonpReqParamKey = "callback"
+
 // Request is extends `http.Request` for aah framework
 type Request struct {
 	// Host value of the HTTP 'Host' header (e.g. 'example.com:8080').
@@ -75,6 +77,7 @@ func ParseRequest(r *http.Request, req *Request) *Request {
 	req.Referer = getReferer(r.Header)
 	req.ClientIP = ClientIP(r)
 	req.Locale = NegotiateLocale(r)
+	req.IsJSONP = isJSONPReqeust(r)
 	req.Raw = r
 
 	return req
@@ -132,3 +135,9 @@ func getReferer(hdr http.Header) string {
 
 	return referer
 }
+
+func isJSONPReqeust(r *http.Request) bool {
+	query := r.URL.Query()
+	callback := query.Get(jsonpReqParamKey)
+	return !ess.IsStrEmpty(callback)
+}

response.go

@@ -38,7 +38,7 @@ type (
 	}
 )
 
-// interface compilance
+// interface compliance
 var _ http.CloseNotifier = &Response{}
 var _ http.Flusher = &Response{}
 var _ http.Hijacker = &Response{}
@@ -88,7 +88,7 @@ func (r *Response) Write(buf []byte) (int, error) {
 }
 
 // ReadFrom method calls underlying ReadFrom method with given reader if it's
-// compatiable and writes HTTP status OK (200) if it's not written yet.
+// compatible and writes HTTP status OK (200) if it's not written yet.
 func (r *Response) ReadFrom(rdr io.Reader) (int64, error) {
 	if rf, ok := r.w.(io.ReaderFrom); ok {
 		r.WriteHeader(http.StatusOK)
@@ -107,7 +107,7 @@ func (r *Response) BytesWritten() int {
 // Close method closes the writer if possible.
 func (r *Response) Close() {
 	if c, ok := r.w.(io.Closer); ok {
-		c.Close()
+		_ = c.Close()
 	}
 }
 
@@ -116,26 +116,26 @@ func (r *Response) Unwrap() http.ResponseWriter {
 	return r.w
 }
 
-// CloseNotify method calls underlying CloseNotify method if it's compatiable
+// CloseNotify method calls underlying CloseNotify method if it's compatible
 func (r *Response) CloseNotify() <-chan bool {
 	n := r.w.(http.CloseNotifier)
 	return n.CloseNotify()
 }
 
-// Flush method calls underlying Flush method if it's compatiable
+// Flush method calls underlying Flush method if it's compatible
 func (r *Response) Flush() {
 	if f, ok := r.w.(http.Flusher); ok {
 		f.Flush()
 	}
 }
 
-// Hijack method calls underlying Hijack method if it's compatiable otherwise
+// Hijack method calls underlying Hijack method if it's compatible otherwise
 // returns an error. It becomes the caller's responsibility to manage
 // and close the connection.
 func (r *Response) Hijack() (net.Conn, *bufio.ReadWriter, error) {
 	if h, ok := r.w.(http.Hijacker); ok {
 		return h.Hijack()
 	}
 
-	return nil, nil, errors.New("http.Hijacker interface is not compatiable")
+	return nil, nil, errors.New("http.Hijacker interface is not compatible")
 }

response_test.go

@@ -70,21 +70,23 @@ func TestHijackCall(t *testing.T) {
 
 		con, rw, err := writer.(http.Hijacker).Hijack()
 		assert.FailOnError(t, err, "")
-		defer con.Close()
+		defer func() {
+			_ = con.Close()
+		}()
 
 		bytes := []byte("aah framework calling hijack")
-		rw.WriteString("HTTP/1.1 200 OK\r\n")
-		rw.WriteString("Date: " + time.Now().Format(http.TimeFormat) + "\r\n")
-		rw.WriteString("Content-Type: text/plain; charset=utf-8\r\n")
-		rw.WriteString("Content-Length: " + strconv.Itoa(len(bytes)))
-		rw.WriteString(string(bytes) + "\r\n")
+		_, _ = rw.WriteString("HTTP/1.1 200 OK\r\n")
+		_, _ = rw.WriteString("Date: " + time.Now().Format(http.TimeFormat) + "\r\n")
+		_, _ = rw.WriteString("Content-Type: text/plain; charset=utf-8\r\n")
+		_, _ = rw.WriteString("Content-Length: " + strconv.Itoa(len(bytes)))
+		_, _ = rw.WriteString(string(bytes) + "\r\n")
 		_ = rw.Flush()
 	}
 
 	server := httptest.NewServer(http.HandlerFunc(handler))
 	defer server.Close()
 
-	http.Get(server.URL)
+	_, _ = http.Get(server.URL)
 }
 
 func TestCallCloseNotifyAndFlush(t *testing.T) {
@@ -110,7 +112,9 @@ func callAndValidate(t *testing.T, handler http.HandlerFunc, response string) {
 	if err != nil {
 		t.Fatalf("Error Get: %v", err)
 	}
-	defer resp.Body.Close()
+	defer func() {
+		_ = resp.Body.Close()
+	}()
 
 	bytes, _ := ioutil.ReadAll(resp.Body)
 	assert.Equal(t, response, string(bytes))