Skip to content

Commit

Permalink
Merge pull request #93 from kozmod/feature/92_strings_replace_templat…
Browse files Browse the repository at this point in the history
…e_fn

[#92] stdlib strings.Replace was added to template's functions
  • Loading branch information
kozmod authored Feb 6, 2024
2 parents 8020584 + 9b2f81c commit e0b4a24
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 9 deletions.
2 changes: 2 additions & 0 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@ out:
| `slice` | | |
| `slice.New` | N `any` elements | Create new slice from any numbers of elements <br/>(`{ $element := slice.New "a" 1 "b" }}`) |
| `slice.Append` | slice,<br/> N `any` elements | Add element to exists slice <br/>(`{{ $element := slice.Append $element "b"}}`) |
| `strings` | | |
| `strings.Replace` | s, old, new string, n int | Replace returns a copy of the string `s` with `old` replaced by `new` (work the same as `strings.Replace` from `stdlib`). |

Custom template's functions added as custom arguments to the template
[function map](https://pkg.go.dev/text/template#hdr-Functions).
Expand Down
6 changes: 3 additions & 3 deletions internal/entity/slice.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package entity

type SLiceFn struct{}
type SliceFn struct{}

func (sfn SLiceFn) New(elems ...any) []any {
func (sfn SliceFn) New(elems ...any) []any {
return elems
}

func (sfn SLiceFn) Append(s []any, elems ...any) []any {
func (sfn SliceFn) Append(s []any, elems ...any) []any {
return append(s, elems...)
}
9 changes: 9 additions & 0 deletions internal/entity/strings.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package entity

import "strings"

type StringsFn struct{}

func (sfn StringsFn) Replace(input, from, to string, n int) string {
return strings.Replace(input, from, to, n)
}
5 changes: 3 additions & 2 deletions internal/entity/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import (

var (
TemplateFnsMap = map[string]any{
"random": func() any { return RandomFn{} },
"slice": func() any { return SLiceFn{} },
"random": func() any { return RandomFn{} },
"slice": func() any { return SliceFn{} },
"strings": func() any { return StringsFn{} },
}
)

Expand Down
55 changes: 51 additions & 4 deletions internal/entity/template_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,29 @@ func Test_TemplateProc(t *testing.T) {
})
}

func Test_TemplateFnsMap(t *testing.T) {
t.Run("slice_func", func(t *testing.T) {
t.Run("new", func(t *testing.T) {
func Test_TemplateFunctions_slice(t *testing.T) {
t.Run("entity", func(t *testing.T) {
const (
elem1 = "1"
elem2 = "2"
elem3 = "3"
)

var (
fn = SliceFn{}
)

t.Run("slice.New", func(t *testing.T) {
slice := fn.New([]any{elem1, elem2, elem3}...)
assert.Equal(t, []any{elem1, elem2, elem3}, slice)
})
t.Run("slice.Append", func(t *testing.T) {
slice := fn.Append([]any{elem1, elem2}, elem3)
assert.Equal(t, []any{elem1, elem2, elem3}, slice)
})
})
t.Run("template_slice", func(t *testing.T) {
t.Run("slice.New", func(t *testing.T) {
t.Run("var", func(t *testing.T) {
const (
in = `{{ $element := slice.New "a" 1 "b" }}{{ $element }}`
Expand Down Expand Up @@ -88,7 +108,7 @@ cmd:
assert.Equal(t, exp, res)
})
})
t.Run("append", func(t *testing.T) {
t.Run("slice.Append", func(t *testing.T) {
t.Run("single", func(t *testing.T) {
const (
in = `{{ $element := slice.New "a" }}{{ $element := slice.Append $element "b"}}{{ $element }}`
Expand All @@ -111,3 +131,30 @@ cmd:
})
})
}

func Test_TemplateFunctions_strings(t *testing.T) {
var (
fn = StringsFn{}
)

t.Run("entity", func(t *testing.T) {
t.Run("strings.Replace", func(t *testing.T) {
const (
in = "some_value"
exp = "some value"
)
result := fn.Replace(in, "_", " ", -1)
assert.Equal(t, exp, result)

})
})
t.Run("template_strings", func(t *testing.T) {
const (
in = `{{ strings.Replace "some_value" "_" " " -1 }}`
)
proc := TmplProc{templateFns: TemplateFnsMap}
res, err := proc.Process(tmplName, in)
assert.NoError(t, err)
assert.Equal(t, "some value", res)
})
}

0 comments on commit e0b4a24

Please sign in to comment.