mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
90da7664bf
The main topic of this commit is that you can now index fragments (content heading identifiers) when calling `.Related`. You can do this by: * Configure one or more indices with type `fragments` * The name of those index configurations maps to an (optional) front matter slice with fragment references. This allows you to link page<->fragment and page<->page. * This also will index all the fragments (heading identifiers) of the pages. It's also possible to use type `fragments` indices in shortcode, e.g.: ``` {{ $related := site.RegularPages.Related .Page }} ``` But, and this is important, you need to include the shortcode using the `{{<` delimiter. Not doing so will create infinite loops and timeouts. This commit also: * Adds two new methods to Page: Fragments (can also be used to build ToC) and HeadingsFiltered (this is only used in Related Content with index type `fragments` and `enableFilter` set to true. * Consolidates all `.Related*` methods into one, which takes either a `Page` or an options map as its only argument. * Add `context.Context` to all of the content related Page API. Turns out it wasn't strictly needed for this particular feature, but it will soon become usefil, e.g. in #9339. Closes #10711 Updates #9339 Updates #10725
244 lines
4.6 KiB
Go
244 lines
4.6 KiB
Go
// Copyright 2019 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 lazy
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"math/rand"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
qt "github.com/frankban/quicktest"
|
|
)
|
|
|
|
var (
|
|
rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
|
|
bigOrSmall = func() int {
|
|
if rnd.Intn(10) < 5 {
|
|
return 10000 + rnd.Intn(100000)
|
|
}
|
|
return 1 + rnd.Intn(50)
|
|
}
|
|
)
|
|
|
|
func doWork() {
|
|
doWorkOfSize(bigOrSmall())
|
|
}
|
|
|
|
func doWorkOfSize(size int) {
|
|
_ = strings.Repeat("Hugo Rocks! ", size)
|
|
}
|
|
|
|
func TestInit(t *testing.T) {
|
|
c := qt.New(t)
|
|
|
|
var result string
|
|
|
|
f1 := func(name string) func(context.Context) (any, error) {
|
|
return func(context.Context) (any, error) {
|
|
result += name + "|"
|
|
doWork()
|
|
return name, nil
|
|
}
|
|
}
|
|
|
|
f2 := func() func(context.Context) (any, error) {
|
|
return func(context.Context) (any, error) {
|
|
doWork()
|
|
return nil, nil
|
|
}
|
|
}
|
|
|
|
root := New()
|
|
|
|
root.Add(f1("root(1)"))
|
|
root.Add(f1("root(2)"))
|
|
|
|
branch1 := root.Branch(f1("branch_1"))
|
|
branch1.Add(f1("branch_1_1"))
|
|
branch1_2 := branch1.Add(f1("branch_1_2"))
|
|
branch1_2_1 := branch1_2.Add(f1("branch_1_2_1"))
|
|
|
|
var wg sync.WaitGroup
|
|
|
|
ctx := context.Background()
|
|
|
|
// Add some concurrency and randomness to verify thread safety and
|
|
// init order.
|
|
for i := 0; i < 100; i++ {
|
|
wg.Add(1)
|
|
go func(i int) {
|
|
defer wg.Done()
|
|
var err error
|
|
if rnd.Intn(10) < 5 {
|
|
_, err = root.Do(ctx)
|
|
c.Assert(err, qt.IsNil)
|
|
}
|
|
|
|
// Add a new branch on the fly.
|
|
if rnd.Intn(10) > 5 {
|
|
branch := branch1_2.Branch(f2())
|
|
_, err = branch.Do(ctx)
|
|
c.Assert(err, qt.IsNil)
|
|
} else {
|
|
_, err = branch1_2_1.Do(ctx)
|
|
c.Assert(err, qt.IsNil)
|
|
}
|
|
_, err = branch1_2.Do(ctx)
|
|
c.Assert(err, qt.IsNil)
|
|
}(i)
|
|
|
|
wg.Wait()
|
|
|
|
c.Assert(result, qt.Equals, "root(1)|root(2)|branch_1|branch_1_1|branch_1_2|branch_1_2_1|")
|
|
|
|
}
|
|
}
|
|
|
|
func TestInitAddWithTimeout(t *testing.T) {
|
|
c := qt.New(t)
|
|
|
|
init := New().AddWithTimeout(100*time.Millisecond, func(ctx context.Context) (any, error) {
|
|
return nil, nil
|
|
})
|
|
|
|
_, err := init.Do(context.Background())
|
|
|
|
c.Assert(err, qt.IsNil)
|
|
}
|
|
|
|
func TestInitAddWithTimeoutTimeout(t *testing.T) {
|
|
c := qt.New(t)
|
|
|
|
init := New().AddWithTimeout(100*time.Millisecond, func(ctx context.Context) (any, error) {
|
|
time.Sleep(500 * time.Millisecond)
|
|
select {
|
|
case <-ctx.Done():
|
|
return nil, nil
|
|
default:
|
|
}
|
|
t.Fatal("slept")
|
|
return nil, nil
|
|
})
|
|
|
|
_, err := init.Do(context.Background())
|
|
|
|
c.Assert(err, qt.Not(qt.IsNil))
|
|
|
|
c.Assert(err.Error(), qt.Contains, "timed out")
|
|
|
|
time.Sleep(1 * time.Second)
|
|
}
|
|
|
|
func TestInitAddWithTimeoutError(t *testing.T) {
|
|
c := qt.New(t)
|
|
|
|
init := New().AddWithTimeout(100*time.Millisecond, func(ctx context.Context) (any, error) {
|
|
return nil, errors.New("failed")
|
|
})
|
|
|
|
_, err := init.Do(context.Background())
|
|
|
|
c.Assert(err, qt.Not(qt.IsNil))
|
|
}
|
|
|
|
type T struct {
|
|
sync.Mutex
|
|
V1 string
|
|
V2 string
|
|
}
|
|
|
|
func (t *T) Add1(v string) {
|
|
t.Lock()
|
|
t.V1 += v
|
|
t.Unlock()
|
|
}
|
|
|
|
func (t *T) Add2(v string) {
|
|
t.Lock()
|
|
t.V2 += v
|
|
t.Unlock()
|
|
}
|
|
|
|
// https://github.com/gohugoio/hugo/issues/5901
|
|
func TestInitBranchOrder(t *testing.T) {
|
|
c := qt.New(t)
|
|
|
|
base := New()
|
|
|
|
work := func(size int, f func()) func(context.Context) (any, error) {
|
|
return func(context.Context) (any, error) {
|
|
doWorkOfSize(size)
|
|
if f != nil {
|
|
f()
|
|
}
|
|
|
|
return nil, nil
|
|
}
|
|
}
|
|
|
|
state := &T{}
|
|
|
|
base = base.Add(work(10000, func() {
|
|
state.Add1("A")
|
|
}))
|
|
|
|
inits := make([]*Init, 2)
|
|
for i := range inits {
|
|
inits[i] = base.Branch(work(i+1*100, func() {
|
|
// V1 is A
|
|
ab := state.V1 + "B"
|
|
state.Add2(ab)
|
|
}))
|
|
}
|
|
|
|
var wg sync.WaitGroup
|
|
ctx := context.Background()
|
|
|
|
for _, v := range inits {
|
|
v := v
|
|
wg.Add(1)
|
|
go func() {
|
|
defer wg.Done()
|
|
_, err := v.Do(ctx)
|
|
c.Assert(err, qt.IsNil)
|
|
}()
|
|
}
|
|
|
|
wg.Wait()
|
|
|
|
c.Assert(state.V2, qt.Equals, "ABAB")
|
|
}
|
|
|
|
// See issue 7043
|
|
func TestResetError(t *testing.T) {
|
|
c := qt.New(t)
|
|
r := false
|
|
i := New().Add(func(context.Context) (any, error) {
|
|
if r {
|
|
return nil, nil
|
|
}
|
|
return nil, errors.New("r is false")
|
|
})
|
|
_, err := i.Do(context.Background())
|
|
c.Assert(err, qt.IsNotNil)
|
|
i.Reset()
|
|
r = true
|
|
_, err = i.Do(context.Background())
|
|
c.Assert(err, qt.IsNil)
|
|
|
|
}
|