Upgrade to Jet v6

Author: razonyang

README.md

@@ -8,6 +8,11 @@
 [![Chat](https://img.shields.io/badge/chat-telegram-blue?style=flat-square)](https://t.me/clevergotech)
 [![Community](https://img.shields.io/badge/community-forum-blue?style=flat-square&color=orange)](https://forum.clevergo.tech)
 
+| JetRenderer | Jet |
+|---|---|
+| `v1` | `v5` |
+| `v2` | `v6` |
+
 ## Usage
 
 See [example](https://github.com/clevergo/examples/tree/master/jetrenderer).
@@ -20,13 +25,13 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/CloudyKit/jet/v5"
+	"github.com/CloudyKit/jet/v6"
 	"clevergo.tech/clevergo"
 	"clevergo.tech/jetrenderer"
 )
 
 func main() {
-	renderer := jetrenderer.New(jet.NewHTMLSet("./views"))
+	renderer := jetrenderer.New(jet.New(jet.NewOSFileSystemLoader("./views")))
 	renderer.SetBeforeRender(func(w io.Writer, name string, vars jet.VarMap, data interface{}, ctx *clevergo.Context) error {
 		// populate variables and functions
 		// vars.Set("user", user) // user instance.

go.mod

@@ -1,9 +1,9 @@
-module clevergo.tech/jetrenderer
+module clevergo.tech/jetrenderer/v2
 
 go 1.13
 
 require (
 	clevergo.tech/clevergo v0.5.0
-	github.com/CloudyKit/jet/v5 v5.0.0
+	github.com/CloudyKit/jet/v6 v6.0.1
 	github.com/stretchr/testify v1.6.1
 )

go.sum

@@ -4,8 +4,8 @@ clevergo.tech/log v0.3.0 h1:9ryDHGeOD3BUSUuJEW3be8QtdnjjavoBkknoRCA7dp8=
 clevergo.tech/log v0.3.0/go.mod h1:61sruy0OB79q5JJlxlyi+6eZzVf/bxbUbXnL0KIzsVw=
 github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4slttB4vD+b9btVEnWgL3Q00OBTzVT8B9C0c=
 github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
-github.com/CloudyKit/jet/v5 v5.0.0 h1:iS7jV4P+tey1bmTXDycIq1Q2can3rsblyZlt5g6LDsc=
-github.com/CloudyKit/jet/v5 v5.0.0/go.mod h1:dmmuzWBdd8bDyJYGZVFdhD21ptN+mjyigFubrffTGTw=
+github.com/CloudyKit/jet/v6 v6.0.1 h1:HrLxunEn2CpUsZqd6dY5VZQUgXyUdinZUqR9QqvpIkA=
+github.com/CloudyKit/jet/v6 v6.0.1/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4=
 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/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

render.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	"clevergo.tech/clevergo"
-	"github.com/CloudyKit/jet/v5"
+	"github.com/CloudyKit/jet/v6"
 )
 
 var varsPool sync.Pool

render_test.go

@@ -13,12 +13,12 @@ import (
 	"testing"
 
 	"clevergo.tech/clevergo"
-	"github.com/CloudyKit/jet/v5"
+	"github.com/CloudyKit/jet/v6"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestNew(t *testing.T) {
-	set := jet.NewHTMLSet("")
+	set := jet.NewSet(jet.NewInMemLoader())
 	r := New(set)
 	assert.Equal(t, set, r.Set)
 }
@@ -31,7 +31,7 @@ func fakeBeforeRender(callback func(), err error) BeforeRender {
 }
 
 func TestRenderer_SetBeforeRender(t *testing.T) {
-	r := New(jet.NewHTMLSet(""))
+	r := New(jet.NewSet(jet.NewInMemLoader()))
 	fn := fakeBeforeRender(func() {}, errors.New("before render test"))
 	r.SetBeforeRender(fn)
 	expected := fn(nil, "", nil, nil, nil)
@@ -40,7 +40,7 @@ func TestRenderer_SetBeforeRender(t *testing.T) {
 }
 
 func TestRenderer_Render(t *testing.T) {
-	r := New(jet.NewHTMLSet("./testdata/views"))
+	r := New(jet.NewSet(jet.NewOSFileSystemLoader("./testdata/views")))
 	// invalid template.
 	err := r.Render(nil, "404.tmpl", nil, nil)
 	assert.NotNil(t, err)