mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-29 22:40:03 -05:00
e27fd4c1b8
Before this commit you would typically use `.Scratch.Add` to manually create slices in a loop.
With variable overwrite in Go 1.11, we can do better. This commit adds the `append` template func.
A made-up example:
```bash
{{ $p1 := index .Site.RegularPages 0 }}{{ $p2 := index .Site.RegularPages 1 }}
{{ $pages := slice }}
{{ if true }}
{{ $pages = $pages | append $p2 $p1 }}
{{ end }}
```
Note that with 2 slices as arguments, the two examples below will give the same result:
```bash
{{ $s1 := slice "a" "b" | append (slice "c" "d") }}
{{ $s2 := slice "a" "b" | append "c" "d" }}
```
Both of the above will give `[]string{a, b, c, d}`.
This commit also improves the type handling in the `slice` template function. Now `slice "a" "b"` will give a `[]string` slice. The old behaviour was to return a `[]interface{}`.
Fixes #5190
142 lines
4.3 KiB
Go
142 lines
4.3 KiB
Go
// Copyright 2018 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package hugolib
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestGroupFunc(t *testing.T) {
|
|
assert := require.New(t)
|
|
|
|
pageContent := `
|
|
---
|
|
title: "Page"
|
|
---
|
|
|
|
`
|
|
b := newTestSitesBuilder(t)
|
|
b.WithSimpleConfigFile().
|
|
WithContent("page1.md", pageContent, "page2.md", pageContent).
|
|
WithTemplatesAdded("index.html", `
|
|
{{ $cool := .Site.RegularPages | group "cool" }}
|
|
{{ $cool.Key }}: {{ len $cool.Pages }}
|
|
|
|
`)
|
|
b.CreateSites().Build(BuildCfg{})
|
|
|
|
assert.Equal(1, len(b.H.Sites))
|
|
require.Len(t, b.H.Sites[0].RegularPages, 2)
|
|
|
|
b.AssertFileContent("public/index.html", "cool: 2")
|
|
}
|
|
|
|
func TestSliceFunc(t *testing.T) {
|
|
assert := require.New(t)
|
|
|
|
pageContent := `
|
|
---
|
|
title: "Page"
|
|
tags: ["blue", "green"]
|
|
tags_weight: %d
|
|
---
|
|
|
|
`
|
|
b := newTestSitesBuilder(t)
|
|
b.WithSimpleConfigFile().
|
|
WithContent("page1.md", fmt.Sprintf(pageContent, 10), "page2.md", fmt.Sprintf(pageContent, 20)).
|
|
WithTemplatesAdded("index.html", `
|
|
{{ $cool := first 1 .Site.RegularPages | group "cool" }}
|
|
{{ $blue := after 1 .Site.RegularPages | group "blue" }}
|
|
{{ $weightedPages := index (index .Site.Taxonomies "tags") "blue" }}
|
|
|
|
{{ $p1 := index .Site.RegularPages 0 }}{{ $p2 := index .Site.RegularPages 1 }}
|
|
{{ $wp1 := index $weightedPages 0 }}{{ $wp2 := index $weightedPages 1 }}
|
|
|
|
{{ $pages := slice $p1 $p2 }}
|
|
{{ $pageGroups := slice $cool $blue }}
|
|
{{ $weighted := slice $wp1 $wp2 }}
|
|
|
|
{{ printf "pages:%d:%T:%v/%v" (len $pages) $pages (index $pages 0) (index $pages 1) }}
|
|
{{ printf "pageGroups:%d:%T:%v/%v" (len $pageGroups) $pageGroups (index (index $pageGroups 0).Pages 0) (index (index $pageGroups 1).Pages 0)}}
|
|
{{ printf "weightedPages:%d::%T:%v" (len $weighted) $weighted $weighted | safeHTML }}
|
|
|
|
`)
|
|
b.CreateSites().Build(BuildCfg{})
|
|
|
|
assert.Equal(1, len(b.H.Sites))
|
|
require.Len(t, b.H.Sites[0].RegularPages, 2)
|
|
|
|
b.AssertFileContent("public/index.html",
|
|
"pages:2:hugolib.Pages:Page(/page1.md)/Page(/page2.md)",
|
|
"pageGroups:2:hugolib.PagesGroup:Page(/page1.md)/Page(/page2.md)",
|
|
`weightedPages:2::hugolib.WeightedPages:[WeightedPage(10,"Page") WeightedPage(20,"Page")]`)
|
|
}
|
|
|
|
func TestAppendFunc(t *testing.T) {
|
|
assert := require.New(t)
|
|
|
|
pageContent := `
|
|
---
|
|
title: "Page"
|
|
tags: ["blue", "green"]
|
|
tags_weight: %d
|
|
---
|
|
|
|
`
|
|
b := newTestSitesBuilder(t)
|
|
b.WithSimpleConfigFile().
|
|
WithContent("page1.md", fmt.Sprintf(pageContent, 10), "page2.md", fmt.Sprintf(pageContent, 20)).
|
|
WithTemplatesAdded("index.html", `
|
|
|
|
{{ $p1 := index .Site.RegularPages 0 }}{{ $p2 := index .Site.RegularPages 1 }}
|
|
|
|
{{ $pages := slice }}
|
|
|
|
{{ if true }}
|
|
{{ $pages = $pages | append $p2 $p1 }}
|
|
{{ end }}
|
|
{{ $appendPages := .Site.Pages | append .Site.RegularPages }}
|
|
{{ $appendStrings := slice "a" "b" | append "c" "d" "e" }}
|
|
{{ $appendStringsSlice := slice "a" "b" "c" | append (slice "c" "d") }}
|
|
|
|
{{ printf "pages:%d:%T:%v/%v" (len $pages) $pages (index $pages 0) (index $pages 1) }}
|
|
{{ printf "appendPages:%d:%T:%v/%v" (len $appendPages) $appendPages (index $appendPages 0).Kind (index $appendPages 8).Kind }}
|
|
{{ printf "appendStrings:%T:%v" $appendStrings $appendStrings }}
|
|
{{ printf "appendStringsSlice:%T:%v" $appendStringsSlice $appendStringsSlice }}
|
|
|
|
{{/* add some slightly related funcs to check what types we get */}}
|
|
{{ $u := $appendStrings | union $appendStringsSlice }}
|
|
{{ $i := $appendStrings | intersect $appendStringsSlice }}
|
|
{{ printf "union:%T:%v" $u $u }}
|
|
{{ printf "intersect:%T:%v" $i $i }}
|
|
|
|
`)
|
|
b.CreateSites().Build(BuildCfg{})
|
|
|
|
assert.Equal(1, len(b.H.Sites))
|
|
require.Len(t, b.H.Sites[0].RegularPages, 2)
|
|
|
|
b.AssertFileContent("public/index.html",
|
|
"pages:2:hugolib.Pages:Page(/page2.md)/Page(/page1.md)",
|
|
"appendPages:9:hugolib.Pages:home/page",
|
|
"appendStrings:[]string:[a b c d e]",
|
|
"appendStringsSlice:[]string:[a b c c d]",
|
|
"union:[]string:[a b c d e]",
|
|
"intersect:[]string:[a b c d]",
|
|
)
|
|
}
|