mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-29 04:42:06 +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
153 lines
4.3 KiB
Go
153 lines
4.3 KiB
Go
// Copyright 2015 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"
|
|
"reflect"
|
|
"strings"
|
|
"testing"
|
|
|
|
"io/ioutil"
|
|
"log"
|
|
"os"
|
|
|
|
"github.com/gohugoio/hugo/deps"
|
|
jww "github.com/spf13/jwalterweatherman"
|
|
|
|
"github.com/gohugoio/hugo/parser"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestDataDirJSON(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
sources := [][2]string{
|
|
{filepath.FromSlash("data/test/foo.json"), `{ "bar": "foofoo" }`},
|
|
{filepath.FromSlash("data/test.json"), `{ "hello": [ { "world": "foo" } ] }`},
|
|
}
|
|
|
|
expected, err := parser.HandleJSONMetaData([]byte(`{ "test": { "hello": [{ "world": "foo" }] , "foo": { "bar":"foofoo" } } }`))
|
|
|
|
if err != nil {
|
|
t.Fatalf("Error %s", err)
|
|
}
|
|
|
|
doTestDataDir(t, expected, sources)
|
|
}
|
|
|
|
func TestDataDirToml(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
sources := [][2]string{
|
|
{"data/test/kung.toml", "[foo]\nbar = 1"},
|
|
}
|
|
|
|
expected, err := parser.HandleTOMLMetaData([]byte("[test]\n[test.kung]\n[test.kung.foo]\nbar = 1"))
|
|
|
|
if err != nil {
|
|
t.Fatalf("Error %s", err)
|
|
}
|
|
|
|
doTestDataDir(t, expected, sources)
|
|
}
|
|
|
|
func TestDataDirYAMLWithOverridenValue(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
sources := [][2]string{
|
|
// filepath.Walk walks the files in lexical order, '/' comes before '.'. Simulate this:
|
|
{filepath.FromSlash("data/a.yaml"), "a: 1"},
|
|
{filepath.FromSlash("data/test/v1.yaml"), "v1-2: 2"},
|
|
{filepath.FromSlash("data/test/v2.yaml"), "v2:\n- 2\n- 3"},
|
|
{filepath.FromSlash("data/test.yaml"), "v1: 1"},
|
|
}
|
|
|
|
expected := map[string]interface{}{"a": map[string]interface{}{"a": 1},
|
|
"test": map[string]interface{}{"v1": map[string]interface{}{"v1-2": 2}, "v2": map[string]interface{}{"v2": []interface{}{2, 3}}}}
|
|
|
|
doTestDataDir(t, expected, sources)
|
|
}
|
|
|
|
// issue 892
|
|
func TestDataDirMultipleSources(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
sources := [][2]string{
|
|
{filepath.FromSlash("data/test/first.toml"), "bar = 1"},
|
|
{filepath.FromSlash("themes/mytheme/data/test/first.toml"), "bar = 2"},
|
|
{filepath.FromSlash("data/test/second.toml"), "tender = 2"},
|
|
}
|
|
|
|
expected, _ := parser.HandleTOMLMetaData([]byte("[test.first]\nbar = 1\n[test.second]\ntender=2"))
|
|
|
|
doTestDataDir(t, expected, sources,
|
|
"theme", "mytheme")
|
|
|
|
}
|
|
|
|
func doTestDataDir(t *testing.T, expected interface{}, sources [][2]string, configKeyValues ...interface{}) {
|
|
var (
|
|
cfg, fs = newTestCfg()
|
|
)
|
|
|
|
for i := 0; i < len(configKeyValues); i += 2 {
|
|
cfg.Set(configKeyValues[i].(string), configKeyValues[i+1])
|
|
}
|
|
|
|
var (
|
|
logger = jww.NewNotepad(jww.LevelError, jww.LevelError, os.Stdout, ioutil.Discard, "", log.Ldate|log.Ltime)
|
|
depsCfg = deps.DepsCfg{Fs: fs, Cfg: cfg, Logger: logger}
|
|
)
|
|
|
|
writeSource(t, fs, filepath.Join("content", "dummy.md"), "content")
|
|
writeSourcesToSource(t, "", fs, sources...)
|
|
|
|
expectBuildError := false
|
|
|
|
if ok, shouldFail := expected.(bool); ok && shouldFail {
|
|
expectBuildError = true
|
|
}
|
|
|
|
s := buildSingleSiteExpected(t, expectBuildError, depsCfg, BuildCfg{SkipRender: true})
|
|
|
|
if !expectBuildError && !reflect.DeepEqual(expected, s.Data) {
|
|
t.Errorf("Expected structure\n%#v got\n%#v", expected, s.Data)
|
|
}
|
|
}
|
|
|
|
func TestDataFromShortcode(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
var (
|
|
cfg, fs = newTestCfg()
|
|
)
|
|
|
|
writeSource(t, fs, "data/hugo.toml", "slogan = \"Hugo Rocks!\"")
|
|
writeSource(t, fs, "layouts/_default/single.html", `
|
|
* Slogan from template: {{ .Site.Data.hugo.slogan }}
|
|
* {{ .Content }}`)
|
|
writeSource(t, fs, "layouts/shortcodes/d.html", `{{ .Page.Site.Data.hugo.slogan }}`)
|
|
writeSource(t, fs, "content/c.md", `---
|
|
---
|
|
Slogan from shortcode: {{< d >}}
|
|
`)
|
|
|
|
buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{})
|
|
|
|
content := readSource(t, fs, "public/c/index.html")
|
|
require.True(t, strings.Contains(content, "Slogan from template: Hugo Rocks!"), content)
|
|
require.True(t, strings.Contains(content, "Slogan from shortcode: Hugo Rocks!"), content)
|
|
|
|
}
|