github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-14 20:37:55 -05:00
Code Issues Projects Releases Packages Wiki Activity

tpl/math: Return error if less than 2 input numbers

Browse source 
Fixes #10827
This commit is contained in:
septs 2023-03-14 16:28:38 +08:00 committed by GitHub
parent 0e8ab20a84
commit f5eddf89bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tpl/math/math.go
View file

@ -23,6 +23,10 @@ import (
"github.com/spf13/cast"
)
var (
errMustTwoNumbersError = errors.New("must provide at least two numbers")
)
// New returns a new instance of the math-namespaced template functions.
func New() *Namespace {
return &Namespace{}
@ -73,6 +77,10 @@ func (ns *Namespace) Log(n any) (float64, error) {
// Max returns the greater of the multivalued numbers n1 and n2 or more values.
func (ns *Namespace) Max(inputs ...any) (maximum float64, err error) {
if len(inputs) < 2 {
err = errMustTwoNumbersError
return
}
var value float64
for index, input := range inputs {
value, err = cast.ToFloat64E(input)
@ -91,6 +99,10 @@ func (ns *Namespace) Max(inputs ...any) (maximum float64, err error) {
// Min returns the smaller of multivalued numbers n1 and n2 or more values.
func (ns *Namespace) Min(inputs ...any) (minimum float64, err error) {
if len(inputs) < 2 {
err = errMustTwoNumbersError
return
}
var value float64
for index, input := range inputs {
value, err = cast.ToFloat64E(input)
@ -176,6 +188,9 @@ func (ns *Namespace) Sub(inputs ...any) (any, error) {
}
func (ns *Namespace) doArithmetic(inputs []any, operation rune) (value any, err error) {
if len(inputs) < 2 {
return nil, errMustTwoNumbersError
}
value = inputs[0]
for i := 1; i < len(inputs); i++ {
value, err = _math.DoArithmetic(value, inputs[i], operation)

10
tpl/math/math_test.go
View file

@ -36,15 +36,19 @@ func TestBasicNSArithmetic(t *testing.T) {
{ns.Add, []any{4, 2}, int64(6)},
{ns.Add, []any{4, 2, 5}, int64(11)},
{ns.Add, []any{1.0, "foo"}, false},
{ns.Add, []any{0}, false},
{ns.Sub, []any{4, 2}, int64(2)},
{ns.Sub, []any{4, 2, 5}, int64(-3)},
{ns.Sub, []any{1.0, "foo"}, false},
{ns.Sub, []any{0}, false},
{ns.Mul, []any{4, 2}, int64(8)},
{ns.Mul, []any{4, 2, 5}, int64(40)},
{ns.Mul, []any{1.0, "foo"}, false},
{ns.Mul, []any{0}, false},
{ns.Div, []any{4, 2}, int64(2)},
{ns.Div, []any{4, 2, 5}, int64(0)},
{ns.Div, []any{1.0, "foo"}, false},
{ns.Div, []any{0}, false},
} {
result, err := test.fn(test.values...)
@ -390,6 +394,9 @@ func TestMax(t *testing.T) {
{[]any{0, "a"}, false},
{[]any{"a", 0}, false},
{[]any{"a", "b"}, false},
// miss values
{[]any{}, false},
{[]any{0}, false},
// multi values
{[]any{-1, -2, -3}, -1.0},
{[]any{1, 2, 3}, 3.0},
@ -434,6 +441,9 @@ func TestMin(t *testing.T) {
{[]any{0, "a"}, false},
{[]any{"a", 0}, false},
{[]any{"a", "b"}, false},
// miss values
{[]any{}, false},
{[]any{0}, false},
// multi values
{[]any{-1, -2, -3}, -3.0},
{[]any{1, 2, 3}, 1.0},