2019-01-02 06:33:26 -05:00
|
|
|
// Copyright 2019 The Hugo Authors. All rights reserved.
|
2015-12-10 17:19:38 -05:00
|
|
|
//
|
|
|
|
|
// 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.
|
|
|
|
|
|
2013-08-30 20:18:05 -04:00
|
|
|
package hugolib
|
|
|
|
|
|
|
|
|
|
import (
|
2018-02-26 11:45:51 -05:00
|
|
|
"fmt"
|
2014-12-07 13:48:00 -05:00
|
|
|
"path/filepath"
|
2013-08-30 20:18:05 -04:00
|
|
|
"testing"
|
2014-04-07 11:44:13 -04:00
|
|
|
|
2019-08-10 15:05:17 -04:00
|
|
|
qt "github.com/frankban/quicktest"
|
2017-06-13 12:42:45 -04:00
|
|
|
"github.com/gohugoio/hugo/deps"
|
2023-07-28 04:53:47 -04:00
|
|
|
"github.com/gohugoio/hugo/resources/kinds"
|
2013-08-30 20:18:05 -04:00
|
|
|
)
|
|
|
|
|
|
2019-03-30 12:08:25 -04:00
|
|
|
const slugDoc1 = "---\ntitle: slug doc 1\nslug: slug-doc-1\naliases:\n - /sd1/foo/\n - /sd2\n - /sd3/\n - /sd4.html\n---\nslug doc 1 content\n"
|
2013-09-12 19:17:53 -04:00
|
|
|
|
2016-03-22 18:59:07 -04:00
|
|
|
const slugDoc2 = `---
|
2013-09-18 12:15:46 -04:00
|
|
|
title: slug doc 2
|
|
|
|
|
slug: slug-doc-2
|
|
|
|
|
---
|
|
|
|
|
slug doc 2 content
|
|
|
|
|
`
|
2013-08-30 20:18:05 -04:00
|
|
|
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 03:00:23 -04:00
|
|
|
var urlFakeSource = [][2]string{
|
|
|
|
|
{filepath.FromSlash("content/blue/doc1.md"), slugDoc1},
|
|
|
|
|
{filepath.FromSlash("content/blue/doc2.md"), slugDoc2},
|
2013-09-12 19:17:53 -04:00
|
|
|
}
|
|
|
|
|
|
2018-01-11 11:46:43 -05:00
|
|
|
func TestUglyURLsPerSection(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
2019-08-10 15:05:17 -04:00
|
|
|
c := qt.New(t)
|
2018-01-11 11:46:43 -05:00
|
|
|
|
|
|
|
|
const dt = `---
|
|
|
|
|
title: Do not go gentle into that good night
|
|
|
|
|
---
|
|
|
|
|
|
|
|
|
|
Wild men who caught and sang the sun in flight,
|
|
|
|
|
And learn, too late, they grieved it on its way,
|
|
|
|
|
Do not go gentle into that good night.
|
|
|
|
|
|
|
|
|
|
`
|
|
|
|
|
|
|
|
|
|
cfg, fs := newTestCfg()
|
|
|
|
|
|
|
|
|
|
cfg.Set("uglyURLs", map[string]bool{
|
|
|
|
|
"sect2": true,
|
|
|
|
|
})
|
2023-01-04 12:24:36 -05:00
|
|
|
configs, err := loadTestConfigFromProvider(cfg)
|
|
|
|
|
c.Assert(err, qt.IsNil)
|
2018-01-11 11:46:43 -05:00
|
|
|
|
|
|
|
|
writeSource(t, fs, filepath.Join("content", "sect1", "p1.md"), dt)
|
|
|
|
|
writeSource(t, fs, filepath.Join("content", "sect2", "p2.md"), dt)
|
|
|
|
|
|
2023-01-04 12:24:36 -05:00
|
|
|
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Configs: configs}, BuildCfg{SkipRender: true})
|
2018-01-11 11:46:43 -05:00
|
|
|
|
2019-08-10 15:05:17 -04:00
|
|
|
c.Assert(len(s.RegularPages()), qt.Equals, 2)
|
2018-01-11 11:46:43 -05:00
|
|
|
|
2023-07-28 04:53:47 -04:00
|
|
|
notUgly := s.getPage(kinds.KindPage, "sect1/p1.md")
|
2019-08-10 15:05:17 -04:00
|
|
|
c.Assert(notUgly, qt.Not(qt.IsNil))
|
|
|
|
|
c.Assert(notUgly.Section(), qt.Equals, "sect1")
|
|
|
|
|
c.Assert(notUgly.RelPermalink(), qt.Equals, "/sect1/p1/")
|
2018-01-11 11:46:43 -05:00
|
|
|
|
2023-07-28 04:53:47 -04:00
|
|
|
ugly := s.getPage(kinds.KindPage, "sect2/p2.md")
|
2019-08-10 15:05:17 -04:00
|
|
|
c.Assert(ugly, qt.Not(qt.IsNil))
|
|
|
|
|
c.Assert(ugly.Section(), qt.Equals, "sect2")
|
|
|
|
|
c.Assert(ugly.RelPermalink(), qt.Equals, "/sect2/p2.html")
|
2018-01-11 11:46:43 -05:00
|
|
|
}
|
2018-02-26 11:45:51 -05:00
|
|
|
|
|
|
|
|
func TestSectionWithURLInFrontMatter(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
2019-08-10 15:05:17 -04:00
|
|
|
c := qt.New(t)
|
2018-02-26 11:45:51 -05:00
|
|
|
|
|
|
|
|
const st = `---
|
|
|
|
|
title: Do not go gentle into that good night
|
|
|
|
|
url: %s
|
|
|
|
|
---
|
|
|
|
|
|
|
|
|
|
Wild men who caught and sang the sun in flight,
|
|
|
|
|
And learn, too late, they grieved it on its way,
|
|
|
|
|
Do not go gentle into that good night.
|
|
|
|
|
|
|
|
|
|
`
|
|
|
|
|
|
|
|
|
|
const pt = `---
|
|
|
|
|
title: Wild men who caught and sang the sun in flight
|
|
|
|
|
---
|
|
|
|
|
|
|
|
|
|
Wild men who caught and sang the sun in flight,
|
|
|
|
|
And learn, too late, they grieved it on its way,
|
|
|
|
|
Do not go gentle into that good night.
|
|
|
|
|
|
|
|
|
|
`
|
|
|
|
|
|
|
|
|
|
cfg, fs := newTestCfg()
|
|
|
|
|
cfg.Set("paginate", 1)
|
2023-01-04 12:24:36 -05:00
|
|
|
th, configs := newTestHelperFromProvider(cfg, fs, t)
|
2018-02-26 11:45:51 -05:00
|
|
|
|
|
|
|
|
writeSource(t, fs, filepath.Join("content", "sect1", "_index.md"), fmt.Sprintf(st, "/ss1/"))
|
|
|
|
|
writeSource(t, fs, filepath.Join("content", "sect2", "_index.md"), fmt.Sprintf(st, "/ss2/"))
|
|
|
|
|
|
|
|
|
|
for i := 0; i < 5; i++ {
|
|
|
|
|
writeSource(t, fs, filepath.Join("content", "sect1", fmt.Sprintf("p%d.md", i+1)), pt)
|
|
|
|
|
writeSource(t, fs, filepath.Join("content", "sect2", fmt.Sprintf("p%d.md", i+1)), pt)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
writeSource(t, fs, filepath.Join("layouts", "_default", "single.html"), "<html><body>{{.Content}}</body></html>")
|
|
|
|
|
writeSource(t, fs, filepath.Join("layouts", "_default", "list.html"),
|
|
|
|
|
"<html><body>P{{.Paginator.PageNumber}}|URL: {{.Paginator.URL}}|{{ if .Paginator.HasNext }}Next: {{.Paginator.Next.URL }}{{ end }}</body></html>")
|
|
|
|
|
|
2023-01-04 12:24:36 -05:00
|
|
|
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Configs: configs}, BuildCfg{})
|
2018-02-26 11:45:51 -05:00
|
|
|
|
2019-08-10 15:05:17 -04:00
|
|
|
c.Assert(len(s.RegularPages()), qt.Equals, 10)
|
2018-02-26 11:45:51 -05:00
|
|
|
|
2023-07-28 04:53:47 -04:00
|
|
|
sect1 := s.getPage(kinds.KindSection, "sect1")
|
2019-08-10 15:05:17 -04:00
|
|
|
c.Assert(sect1, qt.Not(qt.IsNil))
|
|
|
|
|
c.Assert(sect1.RelPermalink(), qt.Equals, "/ss1/")
|
2018-02-26 11:45:51 -05:00
|
|
|
th.assertFileContent(filepath.Join("public", "ss1", "index.html"), "P1|URL: /ss1/|Next: /ss1/page/2/")
|
|
|
|
|
th.assertFileContent(filepath.Join("public", "ss1", "page", "2", "index.html"), "P2|URL: /ss1/page/2/|Next: /ss1/page/3/")
|
|
|
|
|
}
|
2023-06-28 04:27:39 -04:00
|
|
|
|
|
|
|
|
func TestSectionsEntries(t *testing.T) {
|
|
|
|
|
files := `
|
|
|
|
|
-- hugo.toml --
|
|
|
|
|
-- content/withfile/_index.md --
|
|
|
|
|
-- content/withoutfile/p1.md --
|
|
|
|
|
-- layouts/_default/list.html --
|
|
|
|
|
SectionsEntries: {{ .SectionsEntries }}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
`
|
|
|
|
|
|
|
|
|
|
b := NewIntegrationTestBuilder(
|
|
|
|
|
IntegrationTestConfig{
|
|
|
|
|
T: t,
|
|
|
|
|
TxtarString: files,
|
|
|
|
|
},
|
|
|
|
|
).Build()
|
|
|
|
|
|
|
|
|
|
b.AssertFileContent("public/withfile/index.html", "SectionsEntries: [withfile]")
|
|
|
|
|
b.AssertFileContent("public/withoutfile/index.html", "SectionsEntries: [withoutfile]")
|
|
|
|
|
}
|
