apply update for #1861 as requested

kataras · kataras · commit 45d693850bee · 2022-03-18T22:25:22.000+02:00
diff --git 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
@@ -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
@@ -19,8 +19,8 @@ <h2>By {{fullName author}}</h2>
 
     <hr />
 
-    <strong>Read more at: <a href="https://github.com/aymerick/raymond" target="_new">
-            https://github.com/aymerick/raymond</a> and <a href="https://handlebarsjs.com/guide" target="_new">
+    <strong>Read more at: <a href="https://github.com/mailgun/raymond" target="_new">
+            https://github.com/mailgun/raymond</a> and <a href="https://handlebarsjs.com/guide" target="_new">
             https://handlebarsjs.com/guide
         </a>
     </strong>
diff --git 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
@@ -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
diff --git 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
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/aymerick/raymond"
+	"github.com/mailgun/raymond/v2"
 )
 
 // HandlebarsEngine contains the handlebars view engine structure.

Original file line number	Diff line number	Diff line change
`@@ -1248,7 +1248,7 @@ type (`
`1248`	`1248`	`)`
`1249`	`1249`
`1250`	`1250`	`// String returns the raw ref url.`
`1251`		`-func (ref Referrer) String() string {`
	`1251`	`+func (ref *Referrer) String() string {`
`1252`	`1252`	`return ref.Raw`
`1253`	`1253`	`}`
`1254`	`1254`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"strings"`
`11`	`11`	`"sync"`
`12`	`12`
`13`		`- "github.com/aymerick/raymond"`
	`13`	`+ "github.com/mailgun/raymond/v2"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`// HandlebarsEngine contains the handlebars view engine structure.`