From 2433c89334ceae84201a4a0eba048eeb77795d56 Mon Sep 17 00:00:00 2001 From: Darko Luketic Date: Fri, 6 May 2022 14:52:58 +0200 Subject: [PATCH] replace github.com/extemporalgnome/slug with github.com/gosimple/slug --- filters.go | 4 ++-- go.mod | 3 +-- go.sum | 13 ++++--------- v4/filters.go | 4 ++-- v5/filters.go | 4 ++-- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/filters.go b/filters.go index 2a7d859..cca94f1 100644 --- a/filters.go +++ b/filters.go @@ -10,9 +10,9 @@ import ( "time" "unicode/utf8" - "github.com/extemporalgenome/slug" "github.com/flosch/go-humanize" "github.com/flosch/pongo2" + "github.com/gosimple/slug" "github.com/russross/blackfriday/v2" ) @@ -43,7 +43,7 @@ func filterMarkdown(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pong } func filterSlugify(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) { - return pongo2.AsValue(slug.Slug(in.String())), nil + return pongo2.AsValue(slug.Make(in.String())), nil } func filterFilesizeformat(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) { diff --git a/go.mod b/go.mod index 3a471d0..e86eb76 100644 --- a/go.mod +++ b/go.mod @@ -3,14 +3,13 @@ module github.com/idc77/pongo2-addons go 1.14 require ( - github.com/extemporalgenome/slug v0.0.0-20150414033109-0320c85e32e0 github.com/flosch/go-humanize v0.0.0-20140728123800-3ba51eabe506 github.com/flosch/pongo2 v0.0.0-20200529170236-5abacdfa4915 github.com/flosch/pongo2/v4 v4.0.2 github.com/flosch/pongo2/v5 v5.0.0 + github.com/gosimple/slug v1.12.0 github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.0.1 github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect - golang.org/x/text v0.3.7 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c ) diff --git a/go.sum b/go.sum index de72672..3373163 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/extemporalgenome/slug v0.0.0-20150414033109-0320c85e32e0 h1:0A9+8DBvlpto0mr+SD1NadV5liSIAZkWnvyshwk88Bc= -github.com/extemporalgenome/slug v0.0.0-20150414033109-0320c85e32e0/go.mod h1:96eSBMO0aE2dcsEygXzIsvGyOf7bM5kWuqVCPEgwLEI= github.com/flosch/go-humanize v0.0.0-20140728123800-3ba51eabe506 h1:tN043XK9BV76qc31Z2GACIO5Dsh99q21JtYmR2ltXBg= github.com/flosch/go-humanize v0.0.0-20140728123800-3ba51eabe506/go.mod h1:pSiPkAThBLWmIzJ2fukUGkcxxWR4HoLT7Bp8/krrl5g= github.com/flosch/pongo2 v0.0.0-20200529170236-5abacdfa4915 h1:rNVrewdFbSujcoKZifC6cHJfqCTbCIR7XTLHW5TqUWU= @@ -10,6 +8,10 @@ github.com/flosch/pongo2/v5 v5.0.0 h1:ZauMp+iPZzh2aI1QM2UwRb0lXD4BoFcvBuWqefkIuq github.com/flosch/pongo2/v5 v5.0.0/go.mod h1:6ysKu++8ANFXmc3x6uA6iVaS+PKUoDfdX3yPcv8TIzY= github.com/go-check/check v0.0.0-20180628173108-788fd7840127 h1:0gkP6mzaMqkmpcJYCFOLkIBwI7xFExG03bbkOkCvUPI= github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= +github.com/gosimple/slug v1.12.0 h1:xzuhj7G7cGtd34NXnW/yF0l+AGNfWqwgh/IXgFy7dnc= +github.com/gosimple/slug v1.12.0/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ= +github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o= +github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -21,15 +23,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/v4/filters.go b/v4/filters.go index b8d7c3f..162aa76 100644 --- a/v4/filters.go +++ b/v4/filters.go @@ -10,9 +10,9 @@ import ( "time" "unicode/utf8" - "github.com/extemporalgenome/slug" "github.com/flosch/go-humanize" "github.com/flosch/pongo2/v4" + "github.com/gosimple/slug" "github.com/russross/blackfriday/v2" ) @@ -43,7 +43,7 @@ func filterMarkdown(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pong } func filterSlugify(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) { - return pongo2.AsValue(slug.Slug(in.String())), nil + return pongo2.AsValue(slug.Make(in.String())), nil } func filterFilesizeformat(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) { diff --git a/v5/filters.go b/v5/filters.go index 105bd5c..3920ad6 100644 --- a/v5/filters.go +++ b/v5/filters.go @@ -10,9 +10,9 @@ import ( "time" "unicode/utf8" - "github.com/extemporalgenome/slug" "github.com/flosch/go-humanize" "github.com/flosch/pongo2/v5" + "github.com/gosimple/slug" "github.com/russross/blackfriday/v2" ) @@ -43,7 +43,7 @@ func filterMarkdown(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pong } func filterSlugify(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) { - return pongo2.AsValue(slug.Slug(in.String())), nil + return pongo2.AsValue(slug.Make(in.String())), nil } func filterFilesizeformat(in *pongo2.Value, param *pongo2.Value) (*pongo2.Value, *pongo2.Error) {