mirror of
https://github.com/gohugoio/hugo.git
synced 2024-06-27 21:25:07 +00:00
3cdf19e9b7
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
90 lines
2.4 KiB
Go
90 lines
2.4 KiB
Go
// Copyright 2016 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 (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"html/template"
|
|
|
|
"github.com/gohugoio/hugo/deps"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
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"
|
|
|
|
const slugDoc2 = `---
|
|
title: slug doc 2
|
|
slug: slug-doc-2
|
|
---
|
|
slug doc 2 content
|
|
`
|
|
|
|
var urlFakeSource = [][2]string{
|
|
{filepath.FromSlash("content/blue/doc1.md"), slugDoc1},
|
|
{filepath.FromSlash("content/blue/doc2.md"), slugDoc2},
|
|
}
|
|
|
|
// Issue #1105
|
|
func TestShouldNotAddTrailingSlashToBaseURL(t *testing.T) {
|
|
t.Parallel()
|
|
for i, this := range []struct {
|
|
in string
|
|
expected string
|
|
}{
|
|
{"http://base.com/", "http://base.com/"},
|
|
{"http://base.com/sub/", "http://base.com/sub/"},
|
|
{"http://base.com/sub", "http://base.com/sub"},
|
|
{"http://base.com", "http://base.com"}} {
|
|
|
|
cfg, fs := newTestCfg()
|
|
cfg.Set("baseURL", this.in)
|
|
d := deps.DepsCfg{Cfg: cfg, Fs: fs}
|
|
s, err := NewSiteForCfg(d)
|
|
require.NoError(t, err)
|
|
s.initializeSiteInfo()
|
|
|
|
if s.Info.BaseURL() != template.URL(this.expected) {
|
|
t.Errorf("[%d] got %s expected %s", i, s.Info.BaseURL(), this.expected)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestPageCount(t *testing.T) {
|
|
t.Parallel()
|
|
cfg, fs := newTestCfg()
|
|
cfg.Set("uglyURLs", false)
|
|
cfg.Set("paginate", 10)
|
|
|
|
writeSourcesToSource(t, "", fs, urlFakeSource...)
|
|
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{})
|
|
|
|
_, err := s.Fs.Destination.Open("public/blue")
|
|
if err != nil {
|
|
t.Errorf("No indexed rendered.")
|
|
}
|
|
|
|
for _, pth := range []string{
|
|
"public/sd1/foo/index.html",
|
|
"public/sd2/index.html",
|
|
"public/sd3/index.html",
|
|
"public/sd4.html",
|
|
} {
|
|
if _, err := s.Fs.Destination.Open(filepath.FromSlash(pth)); err != nil {
|
|
t.Errorf("No alias rendered: %s", pth)
|
|
}
|
|
}
|
|
}
|