mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-14 20:37:55 -05:00
929808190f
The change in lock logic for `partialCached` in 0927cf739f was naive as it didn't consider cached partials calling other cached partials.
This changeset may look on the large side for this particular issue, but it pulls in part of a working branch, introducing `context.Context` in the template execution.
Note that the context is only partially implemented in this PR, but the upcoming use cases will, as one example, include having access to the top "dot" (e.g. `Page`) all the way down into partials and shortcodes etc.
The earlier benchmarks rerun against master:
```bash
name old time/op new time/op delta
IncludeCached-10 13.6ms ± 2% 13.8ms ± 1% ~ (p=0.343 n=4+4)
name old alloc/op new alloc/op delta
IncludeCached-10 5.30MB ± 0% 5.35MB ± 0% +0.96% (p=0.029 n=4+4)
name old allocs/op new allocs/op delta
IncludeCached-10 74.7k ± 0% 75.3k ± 0% +0.77% (p=0.029 n=4+4)
```
Fixes #9519
91 lines
2.3 KiB
Go
91 lines
2.3 KiB
Go
// Copyright 2022 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 template
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"reflect"
|
|
"strings"
|
|
"testing"
|
|
|
|
qt "github.com/frankban/quicktest"
|
|
)
|
|
|
|
type TestStruct struct {
|
|
S string
|
|
M map[string]string
|
|
}
|
|
|
|
func (t TestStruct) Hello1(arg string) string {
|
|
return arg
|
|
}
|
|
|
|
func (t TestStruct) Hello2(arg1, arg2 string) string {
|
|
return arg1 + " " + arg2
|
|
}
|
|
|
|
type execHelper struct{}
|
|
|
|
func (e *execHelper) Init(ctx context.Context, tmpl Preparer) {
|
|
}
|
|
|
|
func (e *execHelper) GetFunc(ctx context.Context, tmpl Preparer, name string) (reflect.Value, reflect.Value, bool) {
|
|
if name == "print" {
|
|
return zero, zero, false
|
|
}
|
|
return reflect.ValueOf(func(s string) string {
|
|
return "hello " + s
|
|
}), zero, true
|
|
}
|
|
|
|
func (e *execHelper) GetMapValue(ctx context.Context, tmpl Preparer, m, key reflect.Value) (reflect.Value, bool) {
|
|
key = reflect.ValueOf(strings.ToLower(key.String()))
|
|
return m.MapIndex(key), true
|
|
}
|
|
|
|
func (e *execHelper) GetMethod(ctx context.Context, tmpl Preparer, receiver reflect.Value, name string) (method reflect.Value, firstArg reflect.Value) {
|
|
if name != "Hello1" {
|
|
return zero, zero
|
|
}
|
|
m := receiver.MethodByName("Hello2")
|
|
return m, reflect.ValueOf("v2")
|
|
}
|
|
|
|
func TestTemplateExecutor(t *testing.T) {
|
|
c := qt.New(t)
|
|
|
|
templ, err := New("").Parse(`
|
|
{{ print "foo" }}
|
|
{{ printf "hugo" }}
|
|
Map: {{ .M.A }}
|
|
Method: {{ .Hello1 "v1" }}
|
|
|
|
`)
|
|
|
|
c.Assert(err, qt.IsNil)
|
|
|
|
ex := NewExecuter(&execHelper{})
|
|
|
|
var b bytes.Buffer
|
|
data := TestStruct{S: "sv", M: map[string]string{"a": "av"}}
|
|
|
|
c.Assert(ex.ExecuteWithContext(context.Background(), templ, &b, data), qt.IsNil)
|
|
got := b.String()
|
|
|
|
c.Assert(got, qt.Contains, "foo")
|
|
c.Assert(got, qt.Contains, "hello hugo")
|
|
c.Assert(got, qt.Contains, "Map: av")
|
|
c.Assert(got, qt.Contains, "Method: v2 v1")
|
|
}
|