chore(vendor): upgrade gin repo (#249)

This commit is contained in:
Bo-Yi Wu
2017-07-14 22:23:57 -05:00
committed by GitHub
parent 02f0390d4d
commit 6a64b42ab0
69 changed files with 8967 additions and 298 deletions

View File

@@ -9,34 +9,32 @@ import (
"net/http"
)
type (
Delims struct {
Left string
Right string
}
type Delims struct {
Left string
Right string
}
HTMLRender interface {
Instance(string, interface{}) Render
}
type HTMLRender interface {
Instance(string, interface{}) Render
}
HTMLProduction struct {
Template *template.Template
Delims Delims
}
type HTMLProduction struct {
Template *template.Template
Delims Delims
}
HTMLDebug struct {
Files []string
Glob string
Delims Delims
FuncMap template.FuncMap
}
type HTMLDebug struct {
Files []string
Glob string
Delims Delims
FuncMap template.FuncMap
}
HTML struct {
Template *template.Template
Name string
Data interface{}
}
)
type HTML struct {
Template *template.Template
Name string
Data interface{}
}
var htmlContentType = []string{"text/html; charset=utf-8"}

View File

@@ -5,19 +5,28 @@
package render
import (
"encoding/json"
"bytes"
"net/http"
"github.com/json-iterator/go"
)
type (
JSON struct {
Data interface{}
}
var json = jsoniter.ConfigCompatibleWithStandardLibrary
IndentedJSON struct {
Data interface{}
}
)
type JSON struct {
Data interface{}
}
type IndentedJSON struct {
Data interface{}
}
type SecureJSON struct {
Prefix string
Data interface{}
}
type SecureJSONPrefix string
var jsonContentType = []string{"application/json; charset=utf-8"}
@@ -55,3 +64,21 @@ func (r IndentedJSON) Render(w http.ResponseWriter) error {
func (r IndentedJSON) WriteContentType(w http.ResponseWriter) {
writeContentType(w, jsonContentType)
}
func (r SecureJSON) Render(w http.ResponseWriter) error {
r.WriteContentType(w)
jsonBytes, err := json.Marshal(r.Data)
if err != nil {
return err
}
// if the jsonBytes is array values
if bytes.HasPrefix(jsonBytes, []byte("[")) && bytes.HasSuffix(jsonBytes, []byte("]")) {
w.Write([]byte(r.Prefix))
}
w.Write(jsonBytes)
return nil
}
func (r SecureJSON) WriteContentType(w http.ResponseWriter) {
writeContentType(w, jsonContentType)
}

View File

@@ -14,6 +14,7 @@ type Render interface {
var (
_ Render = JSON{}
_ Render = IndentedJSON{}
_ Render = SecureJSON{}
_ Render = XML{}
_ Render = String{}
_ Render = Redirect{}
@@ -23,7 +24,6 @@ var (
_ HTMLRender = HTMLProduction{}
_ Render = YAML{}
_ Render = MsgPack{}
_ Render = MsgPack{}
)
func writeContentType(w http.ResponseWriter, value []string) {