From 45d693850bee02b6d44feabaafb46dc1392e2093 Mon Sep 17 00:00:00 2001 From: "Gerasimos (Makis) Maropoulos" Date: Fri, 18 Mar 2022 22:25:22 +0200 Subject: [PATCH] apply update for #1861 as requested --- NOTICE | 7 ++++--- _examples/view/template_handlebars_0/main.go | 2 +- .../template_handlebars_0/templates/example.html | 4 ++-- context/context.go | 2 +- go.mod | 5 +++-- go.sum | 12 ++++++++---- view/README.md | 2 +- view/handlebars.go | 2 +- 8 files changed, 21 insertions(+), 15 deletions(-) diff --git a/NOTICE b/NOTICE index aaf04975..72189f00 100644 --- a/NOTICE +++ b/NOTICE @@ -83,9 +83,10 @@ Revision ID: 5fc50a00491616d5cd0cbce3abd8b699838e25ca protobuf 6c66de79d66478d https://github.com/golang/protobuf 166c7ea05f5d2cc af016fbd6b - raymond b565731e1464263 https://github.com/aymerick/raymond - de0bda75f2e45d9 - 7b54b60110 + raymond cd18a09da5ea49b https://github.com/mailgun/raymond + b9a8cbec107a22a + 9c0e792c21 + go-redis 7125bf611e5d7d9 https://github.com/go-redis/redis bb4487dd6cb80d8 88bad92d23 diff --git a/_examples/view/template_handlebars_0/main.go b/_examples/view/template_handlebars_0/main.go index 01033229..77c61757 100644 --- a/_examples/view/template_handlebars_0/main.go +++ b/_examples/view/template_handlebars_0/main.go @@ -57,7 +57,7 @@ func main() { mvc.New(exampleRouter).Handle(new(controller)) // Read more about its syntax at: - // https://github.com/aymerick/raymond and + // https://github.com/mailgun/raymond and // https://handlebarsjs.com/guide // http://localhost:8080 diff --git a/_examples/view/template_handlebars_0/templates/example.html b/_examples/view/template_handlebars_0/templates/example.html index ffbcc8e6..353de651 100644 --- a/_examples/view/template_handlebars_0/templates/example.html +++ b/_examples/view/template_handlebars_0/templates/example.html @@ -19,8 +19,8 @@
- Read more at: - https://github.com/aymerick/raymond and + Read more at: + https://github.com/mailgun/raymond and https://handlebarsjs.com/guide diff --git a/context/context.go b/context/context.go index b5b2baf0..ca479f36 100644 --- a/context/context.go +++ b/context/context.go @@ -1248,7 +1248,7 @@ type ( ) // String returns the raw ref url. -func (ref Referrer) String() string { +func (ref *Referrer) String() string { return ref.Raw } diff --git a/go.mod b/go.mod index 933e22d5..a1d99da5 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,6 @@ require ( github.com/CloudyKit/jet/v6 v6.1.0 github.com/Shopify/goreferrer v0.0.0-20210630161223-536fa16abd6f github.com/andybalholm/brotli v1.0.4 - github.com/aymerick/raymond v2.0.2+incompatible github.com/blang/semver/v4 v4.0.0 github.com/dgraph-io/badger/v2 v2.2007.4 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 @@ -31,6 +30,7 @@ require ( github.com/kataras/sitemap v0.0.5 github.com/kataras/tunnel v0.0.3 github.com/klauspost/compress v1.15.1 + github.com/mailgun/raymond/v2 v2.0.46 github.com/mailru/easyjson v0.7.7 github.com/microcosm-cc/bluemonday v1.0.18 github.com/russross/blackfriday/v2 v2.1.0 @@ -42,7 +42,7 @@ require ( go.etcd.io/bbolt v1.3.6 golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd golang.org/x/net v0.0.0-20220225172249-27dd8689420f - golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf + golang.org/x/sys v0.0.0-20220318055525-2edf467146b5 golang.org/x/text v0.3.7 golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 google.golang.org/protobuf v1.27.1 @@ -89,6 +89,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/sergi/go-diff v1.2.0 // indirect + github.com/sirupsen/logrus v1.8.1 // indirect github.com/smartystreets/assertions v1.2.1 // indirect github.com/stretchr/testify v1.7.0 // indirect github.com/tdewolff/parse/v2 v2.5.27 // indirect diff --git a/go.sum b/go.sum index a6b4d065..379cb4aa 100644 --- a/go.sum +++ b/go.sum @@ -18,8 +18,6 @@ github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHG github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= -github.com/aymerick/raymond v2.0.2+incompatible h1:VEp3GpgdAnv9B2GFyTvqgcKvY+mfKMjPOA3SbKLtnU0= -github.com/aymerick/raymond v2.0.2+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= @@ -132,6 +130,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mailgun/raymond/v2 v2.0.46 h1:aOYHhvTpF5USySJ0o7cpPno/Uh2I5qg2115K25A+Ft4= +github.com/mailgun/raymond/v2 v2.0.46/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs= @@ -179,6 +179,8 @@ github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shirou/gopsutil/v3 v3.22.2 h1:wCrArWFkHYIdDxx/FSfF5RB4dpJYW6t7rcp3+zL8uks= github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v1.2.1 h1:bKNHfEv7tSIjZ8JbKaFjzFINljxG4lzZvmHUnElzOIg= github.com/smartystreets/assertions v1.2.1/go.mod h1:wDmR7qL282YbGsPy6H/yAsesrxfxaaSlJazyFLYVFx8= github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= @@ -253,6 +255,7 @@ golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -261,8 +264,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf h1:Fm4IcnUL803i92qDlmB0obyHmosDrxZWxJL3gIeNqOw= -golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220318055525-2edf467146b5 h1:saXMvIOKvRFwbOMicHXr0B1uwoxq9dGmLe5ExMES6c4= +golang.org/x/sys v0.0.0-20220318055525-2edf467146b5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -290,6 +293,7 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/view/README.md b/view/README.md index bc547ac0..7873206e 100644 --- a/view/README.md +++ b/view/README.md @@ -12,7 +12,7 @@ Parse using embedded assets, Layouts and Party-specific layout, Template Funcs, | 2 | Blocks | [kataras/blocks](https://github.com/kataras/blocks) | | 3 | Django | [flosch/pongo2](https://github.com/flosch/pongo2) | | 4 | Pug | [Joker/jade](https://github.com/Joker/jade) | -| 5 | Handlebars | [aymerick/raymond](https://github.com/aymerick/raymond) | +| 5 | Handlebars | [mailgun/raymond](https://github.com/mailgun/raymond) | | 6 | Amber | [eknkc/amber](https://github.com/eknkc/amber) | | 7 | Jet | [CloudyKit/jet](https://github.com/CloudyKit/jet) | | 8 | Ace | [yosssi/ace](https://github.com/yosssi/ace) | diff --git a/view/handlebars.go b/view/handlebars.go index 22adab8d..bdb9ed78 100644 --- a/view/handlebars.go +++ b/view/handlebars.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/aymerick/raymond" + "github.com/mailgun/raymond/v2" ) // HandlebarsEngine contains the handlebars view engine structure.