add contrib include session, response and template

Author: honmaple

binder/binder.go

@@ -3,9 +3,11 @@ package binder
 import (
 	"encoding/json"
 	"encoding/xml"
-	"github.com/honmaple/forest/render"
+	"errors"
 	"net/http"
 	"strings"
+
+	"github.com/honmaple/forest/render"
 )
 
 const defaultMemory = 32 << 20
@@ -91,15 +93,18 @@ func Bind(req *http.Request, dst interface{}) (err error) {
 	if method != http.MethodPost && method != http.MethodPut && method != http.MethodPatch {
 		return Query.Bind(req, dst)
 	}
-	ctype := req.Header.Get("Content-Type")
+	ctype := req.Header.Get(render.ContentType)
 	if strings.Contains(ctype, "/x-www-form-urlencoded") {
 		return Form.Bind(req, dst)
 	}
-	if strings.HasPrefix(ctype, render.MIMEApplicationJSON) {
+	if strings.Contains(ctype, "/form-data") {
+		return MultipartForm.Bind(req, dst)
+	}
+	if strings.HasPrefix(ctype, render.ContentTypeJSON) {
 		return JSON.Bind(req, dst)
 	}
-	if strings.HasPrefix(ctype, render.MIMEApplicationXML) {
+	if strings.HasPrefix(ctype, render.ContentTypeXML) {
 		return XML.Bind(req, dst)
 	}
-	return nil
+	return errors.New("unknown content type: " + ctype)
 }

binder/mapping.go

@@ -8,17 +8,24 @@ import (
 )
 
 func bindData(value interface{}, dst map[string][]string, tagName string) error {
-	v := reflect.ValueOf(value)
+	val := reflect.ValueOf(value)
 
-	for v.Kind() == reflect.Ptr {
-		v = v.Elem()
+	for val.Kind() == reflect.Ptr {
+		val = val.Elem()
 	}
 
-	if v.Kind() != reflect.Struct {
+	if val.Kind() == reflect.Map {
+		for k, v := range dst {
+			val.SetMapIndex(reflect.ValueOf(k), reflect.ValueOf(v[0]))
+		}
+		return nil
+	}
+
+	if val.Kind() != reflect.Struct {
 		return errors.New("not struct")
 	}
 
-	t := v.Type()
+	t := val.Type()
 	for i := 0; i < t.NumField(); i++ {
 		field := t.Field(i)
 		tag := field.Tag.Get(tagName)
@@ -40,7 +47,7 @@ func bindData(value interface{}, dst map[string][]string, tagName string) error
 			tag = opts[0]
 		}
 
-		vfield := v.Field(i)
+		vfield := val.Field(i)
 		if omitempty && vfield.IsZero() {
 			continue
 		}

context.go

@@ -75,26 +75,23 @@ func (c *context) Get(key string) interface{} {
 	return nil
 }
 
-func (c *context) Param(key string) string {
+func (c *context) Param(name string) string {
 	for i, p := range c.route.pnames {
-		if i < len(c.pvalues) && p.key == key {
+		if i < len(c.pvalues) && p.name == name {
 			return c.pvalues[i]
 		}
 	}
 	return ""
 }
 
 func (c *context) Params() map[string]string {
-	if c.route == nil {
+	if c.route == nil || len(c.route.pnames) == 0 {
 		return nil
 	}
-	if len(c.route.pnames) == 0 {
-		return nil
-	}
-	params := make(Params)
+	params := make(map[string]string)
 	for i, p := range c.route.pnames {
 		if i < len(c.pvalues) {
-			params[p.key] = c.pvalues[i]
+			params[p.name] = c.pvalues[i]
 		}
 	}
 	return params

context_test.go

@@ -1,17 +1,24 @@
 package forest
 
 import (
+	"encoding/json"
 	"net/http"
+	"net/http/httptest"
+	"strings"
 	"testing"
 
 	"github.com/honmaple/forest/render"
 	"github.com/stretchr/testify/assert"
-	"net/http/httptest"
 )
 
+type testStruct struct {
+	Path  string `json:"path"`
+	Value int    `json:"value"`
+}
+
 var (
-	testJSONString = "{\"path\":\"/json\",\"value\":1}"
 	testString     = "test ok"
+	testJSONString = "{\"path\":\"/json\",\"value\":1}"
 )
 
 func testJSON() H {
@@ -23,21 +30,59 @@ func TestContextRenderString(t *testing.T) {
 	rec := httptest.NewRecorder()
 	c := NewContext(req, rec)
 	err := c.String(http.StatusOK, testString)
-	if assert.NoError(t, err) {
-		assert.Equal(t, http.StatusOK, rec.Code)
-		assert.Equal(t, render.MIMETextPlainCharsetUTF8, rec.Header().Get("Content-Type"))
-		assert.Equal(t, testString, rec.Body.String())
-	}
+	assert.NoError(t, err)
+	assert.Equal(t, http.StatusOK, rec.Code)
+	assert.Equal(t, render.ContentTypeTextCharsetUTF8, rec.Header().Get("Content-Type"))
+	assert.Equal(t, testString, rec.Body.String())
 }
 
 func TestContextRenderJSON(t *testing.T) {
 	req := httptest.NewRequest(http.MethodGet, "/", nil)
 	rec := httptest.NewRecorder()
 	c := NewContext(req, rec)
 	err := c.JSON(http.StatusCreated, testJSON())
-	if assert.NoError(t, err) {
-		assert.Equal(t, http.StatusCreated, rec.Code)
-		assert.Equal(t, render.MIMEApplicationJSONCharsetUTF8, rec.Header().Get("Content-Type"))
-		assert.Equal(t, testJSONString+"\n", rec.Body.String())
+	assert.NoError(t, err)
+	assert.Equal(t, http.StatusCreated, rec.Code)
+	assert.Equal(t, render.ContentTypeJSONCharsetUTF8, rec.Header().Get("Content-Type"))
+	assert.Equal(t, testJSONString+"\n", rec.Body.String())
+}
+
+func TestContextBind(t *testing.T) {
+	req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(testJSONString))
+	c := NewContext(req, nil)
+	u := new(testStruct)
+
+	req.Header.Add(render.ContentType, render.ContentTypeJSON)
+	err := c.Bind(u)
+	assert.NoError(t, err)
+	assert.Equal(t, &testStruct{"/json", 1}, u)
+
+	testHeaders := map[string]string{
+		render.ContentType: render.ContentTypeJSON,
+		"Test-Header":      "header",
+	}
+	for k, v := range testHeaders {
+		req.Header.Add(k, v)
 	}
+	headers := make(map[string]string)
+	err = c.BindHeader(headers)
+	assert.Equal(t, testHeaders, headers)
+}
+
+func TestContextBindParam(t *testing.T) {
+	router := New()
+	router.GET("/:var1/:var2/{var3:int}", func(c Context) error {
+		return c.JSON(200, c.Params())
+	})
+	req := httptest.NewRequest(http.MethodGet, "/1/2/3", nil)
+	rec := httptest.NewRecorder()
+	router.ServeHTTP(rec, req)
+
+	assert.Equal(t, 200, rec.Code)
+	dst := map[string]string{}
+	err := json.NewDecoder(rec.Body).Decode(&dst)
+	assert.NoError(t, err)
+	assert.Equal(t, dst["var1"], "1")
+	assert.Equal(t, dst["var2"], "2")
+	assert.Equal(t, dst["var3"], "3")
 }

contrib/go.mod

@@ -0,0 +1,10 @@
+module github.com/honmaple/forest/contrib
+
+go 1.16
+
+require (
+	github.com/flosch/pongo2/v5 v5.0.0
+	github.com/gorilla/context v1.1.1
+	github.com/gorilla/sessions v1.2.1
+	github.com/honmaple/forest v0.0.0-20220118110126-8c1856839f96
+)

contrib/go.sum

@@ -0,0 +1,29 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/flosch/pongo2/v5 v5.0.0 h1:ZauMp+iPZzh2aI1QM2UwRb0lXD4BoFcvBuWqefkIuq0=
+github.com/flosch/pongo2/v5 v5.0.0/go.mod h1:6ysKu++8ANFXmc3x6uA6iVaS+PKUoDfdX3yPcv8TIzY=
+github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
+github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/honmaple/forest v0.0.0-20220118110126-8c1856839f96 h1:y0dvh4aJtS7wbpze2IHkP1SW09eG7qnTZ7etaEBaQ0Y=
+github.com/honmaple/forest v0.0.0-20220118110126-8c1856839f96/go.mod h1:2AXWDFeeFtwv5jfmYrWq1k2w1uWqS40x8YBakMaDFm4=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

contrib/response/response.go

@@ -0,0 +1,89 @@
+package response
+
+import (
+	"net/http"
+	"sync"
+
+	"github.com/honmaple/forest"
+)
+
+type PageInfo struct {
+	Page     int   `json:"page"  query:"page"`
+	Limit    int   `json:"limit" query:"limit"`
+	Total    int64 `json:"total"`
+	NotLimit bool  `json:"-"`
+}
+
+func (s *PageInfo) GetLimit() (int, int) {
+	if s.Page < 1 {
+		s.Page = 1
+	}
+	if s.Limit < 1 {
+		s.Limit = 10
+	}
+	offset := (s.Page - 1) * s.Limit
+	if offset < 0 {
+		offset = 0
+	}
+	return offset, s.Limit
+}
+
+type Response struct {
+	Code    int         `json:"code"`
+	Data    interface{} `json:"data,omitempty"`
+	Message string      `json:"message"`
+}
+
+type ListResponse struct {
+	PageInfo
+	List interface{} `json:"list,omitempty"`
+}
+
+var respPool = sync.Pool{
+	New: func() interface{} {
+		return &Response{
+			Code:    http.StatusOK,
+			Message: http.StatusText(http.StatusOK),
+		}
+	},
+}
+
+func New(code int, data ...interface{}) *Response {
+	resp := respPool.Get().(*Response)
+	resp.Code = code
+
+	if len(data) == 0 {
+		resp.Message = http.StatusText(code)
+	} else {
+		resp.Data = data
+	}
+	return resp
+}
+
+func render(c forest.Context, code int, data ...interface{}) error {
+	return c.JSON(code, New(code, data...))
+}
+
+func OK(c forest.Context, message string, data interface{}) error {
+	return render(c, http.StatusOK, message, data)
+}
+
+func BadRequest(c forest.Context, data ...interface{}) error {
+	return render(c, http.StatusBadRequest, data)
+}
+
+func UnAuthorized(c forest.Context, message string, data interface{}) error {
+	return render(c, http.StatusUnauthorized, message, data)
+}
+
+func Forbidden(c forest.Context, message string, data interface{}) error {
+	return render(c, http.StatusForbidden, message, data)
+}
+
+func NotFound(c forest.Context, message string, data interface{}) error {
+	return render(c, http.StatusNotFound, message, data)
+}
+
+func ServerError(c forest.Context, message string, data interface{}) error {
+	return render(c, http.StatusInternalServerError, message, data)
+}