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-05 10:53:58 -04:00
package hugolib
import (
2015-07-26 09:28:56 -04:00
"fmt"
2014-01-29 17:50:31 -05:00
"html/template"
2017-01-02 05:44:17 -05:00
"os"
2020-12-02 07:23:25 -05:00
"path/filepath"
"strings"
"testing"
"time"
2018-03-11 13:59:11 -04:00
2020-12-23 03:26:23 -05:00
"github.com/gohugoio/hugo/htesting"
Rework external asciidoctor integration
This commit solves the relative path problem with asciidoctor tooling. An include will resolve relatively, so you can refer easily to files in the same folder.
Also `asciidoctor-diagram` and PlantUML rendering works now, because the created temporary files will be placed in the correct folder.
This patch covers just the Ruby version of asciidoctor. The old AsciiDoc CLI EOLs in Jan 2020, so this variant is removed from code.
The configuration is completely rewritten and now available in `config.toml` under the key `[markup.asciidocext]`:
```toml
[markup.asciidocext]
extensions = ["asciidoctor-html5s", "asciidoctor-diagram"]
workingFolderCurrent = true
trace = true
[markup.asciidocext.attributes]
my-base-url = "https://example.com/"
my-attribute-name = "my value"
```
- backends, safe-modes, and extensions are now whitelisted to the popular (ruby) extensions and valid values.
- the default for extensions is to not enable any, because they're all external dependencies so the build would break if the user didn't install them beforehand.
- the default backend is html5 because html5s is an external gem dependency.
- the default safe-mode is safe, explanations of the modes: https://asciidoctor.org/man/asciidoctor/
- the config is namespaced under asciidocext_config and the parser looks at asciidocext to allow a future native Go asciidoc.
- `uglyUrls=true` option and `--source` flag are supported
- `--destination` flag is required
Follow the updated documentation under `docs/content/en/content-management/formats.md`.
This patch would be a breaking change, because you need to correct all your absolute include pathes to relative paths, so using relative paths must be configured explicitly by setting `workingFolderCurrent = true`.
2020-06-25 03:51:33 -04:00
"github.com/gohugoio/hugo/markup/asciidocext"
2022-01-01 06:20:07 -05:00
"github.com/gohugoio/hugo/markup/rst"
2019-08-16 09:55:03 -04:00
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
"github.com/gohugoio/hugo/config"
2019-03-25 13:18:34 -04:00
"github.com/gohugoio/hugo/common/loggers"
2018-03-11 13:59:11 -04:00
"github.com/gohugoio/hugo/hugofs"
2019-01-02 06:33:26 -05:00
"github.com/gohugoio/hugo/resources/page"
"github.com/gohugoio/hugo/resources/resource"
"github.com/spf13/afero"
2021-09-09 09:30:41 -04:00
"github.com/spf13/jwalterweatherman"
2018-03-11 13:59:11 -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"
"github.com/gohugoio/hugo/helpers"
2013-08-05 10:53:58 -04:00
)
2013-09-18 13:17:43 -04:00
const (
2019-01-02 06:33:26 -05:00
homePage = "---\ntitle: Home\n---\nHome Page Content\n"
simplePage = "---\ntitle: Simple\n---\nSimple Page\n"
2013-08-05 10:53:58 -04:00
2019-01-02 06:33:26 -05:00
simplePageRFC3339Date = "---\ntitle: RFC3339 Date\ndate: \"2013-05-17T16:59:30Z\"\n---\nrfc3339 content"
2013-08-07 02:04:49 -04:00
2019-04-05 13:11:04 -04:00
simplePageWithoutSummaryDelimiter = ` -- -
title : SimpleWithoutSummaryDelimiter
-- -
[ Lorem ipsum ] ( https : //lipsum.com/) dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
Additional text .
Further text .
`
2016-03-24 09:42:03 -04:00
simplePageWithSummaryDelimiter = ` -- -
2013-08-21 05:37:14 -04:00
title : Simple
-- -
2013-09-18 12:15:46 -04:00
Summary Next Line
2013-08-21 05:37:14 -04:00
< ! -- more -- >
2013-10-04 12:28:28 -04:00
Some more text
2019-04-05 13:11:04 -04:00
`
simplePageWithSummaryParameter = ` -- -
title : SimpleWithSummaryParameter
summary : "Page with summary parameter and [a link](http://www.example.com/)"
-- -
Some text .
Some more text .
2016-08-01 17:04:44 -04:00
`
simplePageWithSummaryDelimiterAndMarkdownThatCrossesBorder = ` -- -
title : Simple
-- -
The [ best static site generator ] [ hugo ] . [ ^ 1 ]
< ! -- more -- >
[ hugo ] : http : //gohugo.io/
[ ^ 1 ] : Many people say so .
2013-10-04 12:28:28 -04:00
`
2016-03-24 09:42:03 -04:00
simplePageWithShortcodeInSummary = ` -- -
2013-10-04 12:28:28 -04:00
title : Simple
-- -
Shortcode rewrite, take 2
This commit contains a restructuring and partial rewrite of the shortcode handling.
Prior to this commit rendering of the page content was mingled with handling of the shortcodes. This led to several oddities.
The new flow is:
1. Shortcodes are extracted from page and replaced with placeholders.
2. Shortcodes are processed and rendered
3. Page is processed
4. The placeholders are replaced with the rendered shortcodes
The handling of summaries is also made simpler by this.
This commit also introduces some other chenges:
1. distinction between shortcodes that need further processing and those who do not:
* `{{< >}}`: Typically raw HTML. Will not be processed.
* `{{% %}}`: Will be processed by the page's markup engine (Markdown or (infuture) Asciidoctor)
The above also involves a new shortcode-parser, with lexical scanning inspired by Rob Pike's talk called "Lexical Scanning in Go",
which should be easier to understand, give better error messages and perform better.
2. If you want to exclude a shortcode from being processed (for documentation etc.), the inner part of the shorcode must be commented out, i.e. `{{%/* movie 47238zzb */%}}`. See the updated shortcode section in the documentation for further examples.
The new parser supports nested shortcodes. This isn't new, but has two related design choices worth mentioning:
* The shortcodes will be rendered individually, so If both `{{< >}}` and `{{% %}}` are used in the nested hierarchy, one will be passed through the page's markdown processor, the other not.
* To avoid potential costly overhead of always looking far ahead for a possible closing tag, this implementation looks at the template itself, and is branded as a container with inner content if it contains a reference to `.Inner`
Fixes #565
Fixes #480
Fixes #461
And probably some others.
2014-10-27 16:48:30 -04:00
Summary Next Line . { { < figure src = "/not/real" > } } .
2013-10-04 12:28:28 -04:00
More text here .
2013-08-21 05:37:14 -04:00
Some more text
`
2016-03-24 09:42:03 -04:00
simplePageWithSummaryDelimiterSameLine = ` -- -
2013-09-01 00:07:22 -04:00
title : Simple
-- -
2013-09-18 12:15:46 -04:00
Summary Same Line < ! -- more -- >
2013-09-01 00:07:22 -04:00
Some more text
2015-07-12 05:05:37 -04:00
`
2016-03-24 09:42:03 -04:00
simplePageWithAllCJKRunes = ` -- -
2015-07-12 05:05:37 -04:00
title : Simple
-- -
€ € € € €
2015-09-03 06:22:20 -04:00
你好
도형이
カテゴリー
2015-07-12 05:05:37 -04:00
2013-10-15 09:15:52 -04:00
`
2016-03-24 09:42:03 -04:00
simplePageWithMainEnglishWithCJKRunes = ` -- -
2015-09-03 06:22:20 -04:00
title : Simple
-- -
In Chinese , 好 means good . In Chinese , 好 means good .
In Chinese , 好 means good . In Chinese , 好 means good .
In Chinese , 好 means good . In Chinese , 好 means good .
In Chinese , 好 means good . In Chinese , 好 means good .
In Chinese , 好 means good . In Chinese , 好 means good .
In Chinese , 好 means good . In Chinese , 好 means good .
In Chinese , 好 means good . In Chinese , 好 means good .
More then 70 words .
`
2016-03-24 09:42:03 -04:00
simplePageWithMainEnglishWithCJKRunesSummary = "In Chinese, 好 means good. In Chinese, 好 means good. " +
2015-09-03 06:22:20 -04:00
"In Chinese, 好 means good. In Chinese, 好 means good. " +
"In Chinese, 好 means good. In Chinese, 好 means good. " +
"In Chinese, 好 means good. In Chinese, 好 means good. " +
"In Chinese, 好 means good. In Chinese, 好 means good. " +
"In Chinese, 好 means good. In Chinese, 好 means good. " +
"In Chinese, 好 means good. In Chinese, 好 means good."
2016-03-24 09:42:03 -04:00
simplePageWithIsCJKLanguageFalse = ` -- -
2015-09-03 06:22:20 -04:00
title : Simple
isCJKLanguage : false
-- -
In Chinese , 好的啊 means good . In Chinese , 好的呀 means good .
In Chinese , 好的啊 means good . In Chinese , 好的呀 means good .
In Chinese , 好的啊 means good . In Chinese , 好的呀 means good .
In Chinese , 好的啊 means good . In Chinese , 好的呀 means good .
In Chinese , 好的啊 means good . In Chinese , 好的呀 means good .
In Chinese , 好的啊 means good . In Chinese , 好的呀 means good .
In Chinese , 好的啊 means good . In Chinese , 好的呀呀 means good enough .
More then 70 words .
`
2016-03-24 09:42:03 -04:00
simplePageWithIsCJKLanguageFalseSummary = "In Chinese, 好的啊 means good. In Chinese, 好的呀 means good. " +
2015-09-03 06:22:20 -04:00
"In Chinese, 好的啊 means good. In Chinese, 好的呀 means good. " +
"In Chinese, 好的啊 means good. In Chinese, 好的呀 means good. " +
"In Chinese, 好的啊 means good. In Chinese, 好的呀 means good. " +
"In Chinese, 好的啊 means good. In Chinese, 好的呀 means good. " +
"In Chinese, 好的啊 means good. In Chinese, 好的呀 means good. " +
"In Chinese, 好的啊 means good. In Chinese, 好的呀呀 means good enough."
2016-03-24 09:42:03 -04:00
simplePageWithLongContent = ` -- -
2013-10-15 09:15:52 -04:00
title : Simple
-- -
2014-01-28 23:09:24 -05:00
Lorem ipsum dolor sit amet , consectetur adipisicing elit , sed do eiusmod tempor
incididunt ut labore et dolore magna aliqua . Ut enim ad minim veniam , quis
nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat .
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
fugiat nulla pariatur . Excepteur sint occaecat cupidatat non proident , sunt in
culpa qui officia deserunt mollit anim id est laborum . Lorem ipsum dolor sit
amet , consectetur adipisicing elit , sed do eiusmod tempor incididunt ut labore
et dolore magna aliqua . Ut enim ad minim veniam , quis nostrud exercitation
ullamco laboris nisi ut aliquip ex ea commodo consequat . Duis aute irure dolor
in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
pariatur . Excepteur sint occaecat cupidatat non proident , sunt in culpa qui
officia deserunt mollit anim id est laborum . Lorem ipsum dolor sit amet ,
consectetur adipisicing elit , sed do eiusmod tempor incididunt ut labore et
dolore magna aliqua . Ut enim ad minim veniam , quis nostrud exercitation ullamco
laboris nisi ut aliquip ex ea commodo consequat . Duis aute irure dolor in
reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur .
Excepteur sint occaecat cupidatat non proident , sunt in culpa qui officia
deserunt mollit anim id est laborum . Lorem ipsum dolor sit amet , consectetur
adipisicing elit , sed do eiusmod tempor incididunt ut labore et dolore magna
aliqua . Ut enim ad minim veniam , quis nostrud exercitation ullamco laboris nisi
ut aliquip ex ea commodo consequat . Duis aute irure dolor in reprehenderit in
voluptate velit esse cillum dolore eu fugiat nulla pariatur . Excepteur sint
occaecat cupidatat non proident , sunt in culpa qui officia deserunt mollit anim
id est laborum . Lorem ipsum dolor sit amet , consectetur adipisicing elit , sed
do eiusmod tempor incididunt ut labore et dolore magna aliqua . Ut enim ad minim
veniam , quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat . Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur . Excepteur sint occaecat cupidatat non
proident , sunt in culpa qui officia deserunt mollit anim id est laborum . Lorem
ipsum dolor sit amet , consectetur adipisicing elit , sed do eiusmod tempor
incididunt ut labore et dolore magna aliqua . Ut enim ad minim veniam , quis
nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat .
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
fugiat nulla pariatur . Excepteur sint occaecat cupidatat non proident , sunt in
culpa qui officia deserunt mollit anim id est laborum . Lorem ipsum dolor sit
amet , consectetur adipisicing elit , sed do eiusmod tempor incididunt ut labore
et dolore magna aliqua . Ut enim ad minim veniam , quis nostrud exercitation
ullamco laboris nisi ut aliquip ex ea commodo consequat . Duis aute irure dolor
in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
pariatur . Excepteur sint occaecat cupidatat non proident , sunt in culpa qui
officia deserunt mollit anim id est laborum . `
2016-03-24 09:42:03 -04:00
pageWithToC = ` -- -
2014-01-28 23:09:24 -05:00
title : TOC
-- -
For some moments the old man did not reply . He stood with bowed head , buried in deep thought . But at last he spoke .
# # AA
I have no idea , of course , how long it took me to reach the limit of the plain ,
but at last I entered the foothills , following a pretty little canyon upward
toward the mountains . Beside me frolicked a laughing brooklet , hurrying upon
its noisy way down to the silent sea . In its quieter pools I discovered many
small fish , of four - or five - pound weight I should imagine . In appearance ,
except as to size and color , they were not unlike the whale of our own seas . As
I watched them playing about I discovered , not only that they suckled their
young , but that at intervals they rose to the surface to breathe as well as to
feed upon certain grasses and a strange , scarlet lichen which grew upon the
rocks just above the water line .
# # # AAA
I remember I felt an extraordinary persuasion that I was being played with ,
that presently , when I was upon the very verge of safety , this mysterious
death -- as swift as the passage of light -- would leap after me from the pit about
the cylinder and strike me down . # # BB
# # # BBB
"You're a great Granser," he cried delightedly , "always making believe them little marks mean something."
2015-01-25 06:08:02 -05:00
`
2016-03-24 09:42:03 -04:00
simplePageWithAdditionalExtension = ` ++ +
2015-01-25 06:08:02 -05:00
[ blackfriday ]
extensions = [ "hardLineBreak" ]
++ +
first line .
second line .
fourth line .
2013-09-01 00:07:22 -04:00
`
2015-05-09 06:12:30 -04:00
2016-03-24 09:42:03 -04:00
simplePageWithURL = ` -- -
2015-05-09 06:12:30 -04:00
title : Simple
url : simple / url /
-- -
Simple Page With URL `
2016-03-24 09:42:03 -04:00
simplePageWithSlug = ` -- -
2015-05-09 06:12:30 -04:00
title : Simple
slug : simple - slug
-- -
Simple Page With Slug `
2016-03-24 09:42:03 -04:00
simplePageWithDate = ` -- -
2015-05-09 06:12:30 -04:00
title : Simple
date : ' 2013 - 10 - 15 T06 : 16 : 13 '
-- -
Simple Page With Date `
2016-03-24 09:42:03 -04:00
UTF8Page = ` -- -
2015-05-09 06:12:30 -04:00
title : ラーメン
-- -
UTF8 Page `
2016-03-24 09:42:03 -04:00
UTF8PageWithURL = ` -- -
2015-05-09 06:12:30 -04:00
title : ラーメン
url : ラーメン / url /
-- -
UTF8 Page With URL `
2016-03-24 09:42:03 -04:00
UTF8PageWithSlug = ` -- -
2015-05-09 06:12:30 -04:00
title : ラーメン
slug : ラーメン - slug
-- -
UTF8 Page With Slug `
2016-03-24 09:42:03 -04:00
UTF8PageWithDate = ` -- -
2015-05-09 06:12:30 -04:00
title : ラーメン
date : ' 2013 - 10 - 15 T06 : 16 : 13 '
-- -
UTF8 Page With Date `
2013-09-18 13:17:43 -04:00
)
2013-09-01 00:07:22 -04:00
2019-01-02 06:33:26 -05:00
func checkPageTitle ( t * testing . T , page page . Page , title string ) {
if page . Title ( ) != title {
t . Fatalf ( "Page title is: %s. Expected %s" , page . Title ( ) , title )
2014-01-29 17:50:31 -05:00
}
2013-08-05 10:53:58 -04:00
}
2022-03-17 17:03:27 -04:00
func checkPageContent ( t * testing . T , page page . Page , expected string , msg ... any ) {
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
t . Helper ( )
2019-01-02 06:33:26 -05:00
a := normalizeContent ( expected )
b := normalizeContent ( content ( page ) )
2016-08-01 17:04:44 -04:00
if a != b {
t . Fatalf ( "Page content is:\n%q\nExpected:\n%q (%q)" , b , a , msg )
2014-01-29 17:50:31 -05:00
}
2014-01-28 23:09:24 -05:00
}
2016-08-01 17:04:44 -04:00
func normalizeContent ( c string ) string {
2016-08-17 07:41:48 -04:00
norm := c
norm = strings . Replace ( norm , "\n" , " " , - 1 )
2016-08-01 17:04:44 -04:00
norm = strings . Replace ( norm , " " , " " , - 1 )
norm = strings . Replace ( norm , " " , " " , - 1 )
norm = strings . Replace ( norm , " " , " " , - 1 )
2016-08-17 07:41:48 -04:00
norm = strings . Replace ( norm , "p> " , "p>" , - 1 )
norm = strings . Replace ( norm , "> <" , "> <" , - 1 )
2016-08-01 17:04:44 -04:00
return strings . TrimSpace ( norm )
}
2019-01-02 06:33:26 -05:00
func checkPageTOC ( t * testing . T , page page . Page , toc string ) {
2019-11-27 07:42:36 -05:00
t . Helper ( )
2019-01-02 06:33:26 -05:00
if page . TableOfContents ( ) != template . HTML ( toc ) {
2019-11-06 14:10:47 -05:00
t . Fatalf ( "Page TableOfContents is:\n%q.\nExpected %q" , page . TableOfContents ( ) , toc )
2014-01-29 17:50:31 -05:00
}
2013-08-05 10:53:58 -04:00
}
2022-03-17 17:03:27 -04:00
func checkPageSummary ( t * testing . T , page page . Page , summary string , msg ... any ) {
2019-01-02 06:33:26 -05:00
a := normalizeContent ( string ( page . Summary ( ) ) )
2016-08-01 17:04:44 -04:00
b := normalizeContent ( summary )
if a != b {
t . Fatalf ( "Page summary is:\n%q.\nExpected\n%q (%q)" , a , b , msg )
2014-01-29 17:50:31 -05:00
}
2013-08-21 05:37:14 -04:00
}
2020-01-26 09:53:42 -05:00
func checkPageType ( t * testing . T , page page . Page , pageType string ) {
if page . Type ( ) != pageType {
t . Fatalf ( "Page type is: %s. Expected: %s" , page . Type ( ) , pageType )
}
}
2019-01-02 06:33:26 -05:00
func checkPageDate ( t * testing . T , page page . Page , time time . Time ) {
if page . Date ( ) != time {
t . Fatalf ( "Page date is: %s. Expected: %s" , page . Date ( ) , time )
2014-01-29 17:50:31 -05:00
}
2013-11-10 15:04:51 -05:00
}
2016-08-01 17:04:44 -04:00
func normalizeExpected ( ext , str string ) string {
str = normalizeContent ( str )
switch ext {
default :
return str
case "html" :
return strings . Trim ( helpers . StripHTML ( str ) , " " )
case "ad" :
paragraphs := strings . Split ( str , "</p>" )
expected := ""
for _ , para := range paragraphs {
if para == "" {
continue
}
expected += fmt . Sprintf ( "<div class=\"paragraph\">\n%s</p></div>\n" , para )
}
2018-10-30 15:24:34 -04:00
2016-08-01 17:04:44 -04:00
return expected
case "rst" :
return fmt . Sprintf ( "<div class=\"document\">\n\n\n%s</div>" , str )
}
}
2016-10-18 02:43:44 -04:00
func testAllMarkdownEnginesForPages ( t * testing . T ,
2022-03-17 17:03:27 -04:00
assertFunc func ( t * testing . T , ext string , pages page . Pages ) , settings map [ string ] any , pageSources ... string ) {
2021-12-12 06:11:11 -05:00
2016-08-01 17:04:44 -04:00
engines := [ ] struct {
ext string
shouldExecute func ( ) bool
} {
{ "md" , func ( ) bool { return true } } ,
Rework external asciidoctor integration
This commit solves the relative path problem with asciidoctor tooling. An include will resolve relatively, so you can refer easily to files in the same folder.
Also `asciidoctor-diagram` and PlantUML rendering works now, because the created temporary files will be placed in the correct folder.
This patch covers just the Ruby version of asciidoctor. The old AsciiDoc CLI EOLs in Jan 2020, so this variant is removed from code.
The configuration is completely rewritten and now available in `config.toml` under the key `[markup.asciidocext]`:
```toml
[markup.asciidocext]
extensions = ["asciidoctor-html5s", "asciidoctor-diagram"]
workingFolderCurrent = true
trace = true
[markup.asciidocext.attributes]
my-base-url = "https://example.com/"
my-attribute-name = "my value"
```
- backends, safe-modes, and extensions are now whitelisted to the popular (ruby) extensions and valid values.
- the default for extensions is to not enable any, because they're all external dependencies so the build would break if the user didn't install them beforehand.
- the default backend is html5 because html5s is an external gem dependency.
- the default safe-mode is safe, explanations of the modes: https://asciidoctor.org/man/asciidoctor/
- the config is namespaced under asciidocext_config and the parser looks at asciidocext to allow a future native Go asciidoc.
- `uglyUrls=true` option and `--source` flag are supported
- `--destination` flag is required
Follow the updated documentation under `docs/content/en/content-management/formats.md`.
This patch would be a breaking change, because you need to correct all your absolute include pathes to relative paths, so using relative paths must be configured explicitly by setting `workingFolderCurrent = true`.
2020-06-25 03:51:33 -04:00
{ "ad" , func ( ) bool { return asciidocext . Supports ( ) } } ,
2022-01-01 06:20:07 -05:00
{ "rst" , func ( ) bool { return rst . Supports ( ) } } ,
2016-08-01 17:04:44 -04:00
}
for _ , e := range engines {
if ! e . shouldExecute ( ) {
continue
}
2021-12-12 06:11:11 -05:00
t . Run ( e . ext , func ( t * testing . T ) {
cfg , fs := newTestCfg ( func ( cfg config . Provider ) error {
for k , v := range settings {
cfg . Set ( k , v )
}
return nil
} )
contentDir := "content"
if s := cfg . GetString ( "contentDir" ) ; s != "" {
contentDir = s
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
}
2016-10-28 03:34:47 -04:00
2022-03-17 17:03:27 -04:00
cfg . Set ( "security" , map [ string ] any {
"exec" : map [ string ] any {
2021-12-12 06:11:11 -05:00
"allow" : [ ] string { "^python$" , "^rst2html.*" , "^asciidoctor$" } ,
} ,
} )
2016-10-28 03:34:47 -04:00
2021-12-12 06:11:11 -05:00
var fileSourcePairs [ ] string
2016-10-28 03:34:47 -04:00
2021-12-12 06:11:11 -05:00
for i , source := range pageSources {
fileSourcePairs = append ( fileSourcePairs , fmt . Sprintf ( "p%d.%s" , i , e . ext ) , source )
}
2016-10-18 02:43:44 -04:00
2021-12-12 06:11:11 -05:00
for i := 0 ; i < len ( fileSourcePairs ) ; i += 2 {
writeSource ( t , fs , filepath . Join ( contentDir , fileSourcePairs [ i ] ) , fileSourcePairs [ i + 1 ] )
}
2016-08-01 17:04:44 -04:00
2021-12-12 06:11:11 -05:00
// Add a content page for the home page
homePath := fmt . Sprintf ( "_index.%s" , e . ext )
writeSource ( t , fs , filepath . Join ( contentDir , homePath ) , homePage )
2016-10-28 03:34:47 -04:00
2021-12-12 06:11:11 -05:00
b := newTestSitesBuilderFromDepsCfg ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } ) . WithNothingAdded ( )
b . Build ( BuildCfg { } )
2017-12-29 04:16:50 -05:00
2021-12-12 06:11:11 -05:00
s := b . H . Sites [ 0 ]
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
2021-12-12 06:11:11 -05:00
b . Assert ( len ( s . RegularPages ( ) ) , qt . Equals , len ( pageSources ) )
2016-08-01 17:04:44 -04:00
2021-12-12 06:11:11 -05:00
assertFunc ( t , e . ext , s . RegularPages ( ) )
2016-08-01 17:04:44 -04:00
2022-02-17 07:04:00 -05:00
home := s . Info . Home ( )
2021-12-12 06:11:11 -05:00
b . Assert ( home , qt . Not ( qt . IsNil ) )
b . Assert ( home . File ( ) . Path ( ) , qt . Equals , homePath )
b . Assert ( content ( home ) , qt . Contains , "Home Page Content" )
} )
2019-01-02 06:33:26 -05:00
}
}
// Issue #1076
func TestPageWithDelimiterForMarkdownThatCrossesBorder ( t * testing . T ) {
t . Parallel ( )
cfg , fs := newTestCfg ( )
2019-11-06 14:10:47 -05:00
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2019-01-02 06:33:26 -05:00
writeSource ( t , fs , filepath . Join ( "content" , "simple.md" ) , simplePageWithSummaryDelimiterAndMarkdownThatCrossesBorder )
s := buildSingleSite ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } , BuildCfg { SkipRender : true } )
2019-08-10 15:05:17 -04:00
c . Assert ( len ( s . RegularPages ( ) ) , qt . Equals , 1 )
2019-01-02 06:33:26 -05:00
p := s . RegularPages ( ) [ 0 ]
if p . Summary ( ) != template . HTML (
2019-11-06 14:10:47 -05:00
"<p>The <a href=\"http://gohugo.io/\">best static site generator</a>.<sup id=\"fnref:1\"><a href=\"#fn:1\" class=\"footnote-ref\" role=\"doc-noteref\">1</a></sup></p>" ) {
2019-01-02 06:33:26 -05:00
t . Fatalf ( "Got summary:\n%q" , p . Summary ( ) )
}
2019-08-10 15:05:17 -04:00
cnt := content ( p )
2021-04-15 16:08:17 -04:00
if cnt != "<p>The <a href=\"http://gohugo.io/\">best static site generator</a>.<sup id=\"fnref:1\"><a href=\"#fn:1\" class=\"footnote-ref\" role=\"doc-noteref\">1</a></sup></p>\n<section class=\"footnotes\" role=\"doc-endnotes\">\n<hr>\n<ol>\n<li id=\"fn:1\" role=\"doc-endnote\">\n<p>Many people say so. <a href=\"#fnref:1\" class=\"footnote-backref\" role=\"doc-backlink\">↩︎</a></p>\n</li>\n</ol>\n</section>" {
2019-08-10 15:05:17 -04:00
t . Fatalf ( "Got content:\n%q" , cnt )
2019-01-02 06:33:26 -05:00
}
}
func TestPageDatesAllKinds ( t * testing . T ) {
t . Parallel ( )
pageContent := `
-- -
title : Page
date : 2017 - 01 - 15
tags : [ "hugo" ]
categories : [ "cool stuff" ]
-- -
`
b := newTestSitesBuilder ( t )
b . WithSimpleConfigFile ( ) . WithContent ( "page.md" , pageContent )
2019-04-05 05:05:25 -04:00
b . WithContent ( "blog/page.md" , pageContent )
2019-01-02 06:33:26 -05:00
b . CreateSites ( ) . Build ( BuildCfg { } )
2019-08-10 15:05:17 -04:00
b . Assert ( len ( b . H . Sites ) , qt . Equals , 1 )
2019-01-02 06:33:26 -05:00
s := b . H . Sites [ 0 ]
checkDate := func ( t time . Time , msg string ) {
2019-09-10 05:26:34 -04:00
b . Assert ( t . Year ( ) , qt . Equals , 2017 , qt . Commentf ( msg ) )
2019-01-02 06:33:26 -05:00
}
checkDated := func ( d resource . Dated , msg string ) {
checkDate ( d . Date ( ) , "date: " + msg )
checkDate ( d . Lastmod ( ) , "lastmod: " + msg )
2016-08-01 17:04:44 -04:00
}
2019-01-02 06:33:26 -05:00
for _ , p := range s . Pages ( ) {
checkDated ( p , p . Kind ( ) )
}
checkDate ( s . Info . LastChange ( ) , "site" )
2016-08-01 17:04:44 -04:00
}
2019-04-05 05:05:25 -04:00
func TestPageDatesSections ( t * testing . T ) {
t . Parallel ( )
b := newTestSitesBuilder ( t )
b . WithSimpleConfigFile ( ) . WithContent ( "no-index/page.md" , `
-- -
title : Page
date : 2017 - 01 - 15
-- -
2020-05-24 08:35:49 -04:00
` , "with-index-no-date/_index.md", ` -- -
2019-04-05 05:05:25 -04:00
title : No Date
-- -
2020-05-24 08:35:49 -04:00
` ,
// https://github.com/gohugoio/hugo/issues/5854
"with-index-date/_index.md" , ` -- -
title : Date
date : 2018 - 01 - 15
-- -
` , "with-index-date/p1.md", ` -- -
title : Date
date : 2018 - 01 - 15
-- -
2019-04-13 12:58:06 -04:00
2020-05-24 08:35:49 -04:00
` , "with-index-date/p1.md", ` -- -
2019-04-13 12:58:06 -04:00
title : Date
date : 2018 - 01 - 15
-- -
2019-04-05 05:05:25 -04:00
` )
2020-05-24 08:35:49 -04:00
for i := 1 ; i <= 20 ; i ++ {
b . WithContent ( fmt . Sprintf ( "main-section/p%d.md" , i ) , ` -- -
title : Date
date : 2012 - 01 - 12
-- -
` )
}
2019-04-05 05:05:25 -04:00
b . CreateSites ( ) . Build ( BuildCfg { } )
2019-08-10 15:05:17 -04:00
b . Assert ( len ( b . H . Sites ) , qt . Equals , 1 )
2019-04-05 05:05:25 -04:00
s := b . H . Sites [ 0 ]
2020-05-24 08:35:49 -04:00
checkDate := func ( p page . Page , year int ) {
b . Assert ( p . Date ( ) . Year ( ) , qt . Equals , year )
b . Assert ( p . Lastmod ( ) . Year ( ) , qt . Equals , year )
}
checkDate ( s . getPage ( "/" ) , 2018 )
checkDate ( s . getPage ( "/no-index" ) , 2017 )
2019-08-10 15:05:17 -04:00
b . Assert ( s . getPage ( "/with-index-no-date" ) . Date ( ) . IsZero ( ) , qt . Equals , true )
2020-05-24 08:35:49 -04:00
checkDate ( s . getPage ( "/with-index-date" ) , 2018 )
b . Assert ( s . Site . LastChange ( ) . Year ( ) , qt . Equals , 2018 )
2019-04-05 05:05:25 -04:00
}
2013-08-05 10:53:58 -04:00
func TestCreateNewPage ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2019-01-02 06:33:26 -05:00
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
2016-10-18 02:43:44 -04:00
p := pages [ 0 ]
2016-10-28 03:34:47 -04:00
2016-10-28 04:35:19 -04:00
// issue #2290: Path is relative to the content dir and will continue to be so.
2019-08-10 15:05:17 -04:00
c . Assert ( p . File ( ) . Path ( ) , qt . Equals , fmt . Sprintf ( "p0.%s" , ext ) )
c . Assert ( p . IsHome ( ) , qt . Equals , false )
2016-08-01 17:04:44 -04:00
checkPageTitle ( t , p , "Simple" )
checkPageContent ( t , p , normalizeExpected ( ext , "<p>Simple Page</p>\n" ) )
checkPageSummary ( t , p , "Simple Page" )
2020-01-26 09:53:42 -05:00
checkPageType ( t , p , "page" )
2014-01-29 17:50:31 -05:00
}
2015-05-27 21:19:59 -04:00
2022-03-17 17:03:27 -04:00
settings := map [ string ] any {
2016-10-28 04:35:19 -04:00
"contentDir" : "mycontent" ,
}
testAllMarkdownEnginesForPages ( t , assertFunc , settings , simplePage )
2016-08-01 17:04:44 -04:00
}
2019-04-05 13:11:04 -04:00
func TestPageSummary ( t * testing . T ) {
t . Parallel ( )
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
p := pages [ 0 ]
checkPageTitle ( t , p , "SimpleWithoutSummaryDelimiter" )
2019-07-31 08:36:36 -04:00
// Source is not Asciidoctor- or RST-compatible so don't test them
2019-04-05 13:11:04 -04:00
if ext != "ad" && ext != "rst" {
checkPageContent ( t , p , normalizeExpected ( ext , "<p><a href=\"https://lipsum.com/\">Lorem ipsum</a> dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>\n\n<p>Additional text.</p>\n\n<p>Further text.</p>\n" ) , ext )
checkPageSummary ( t , p , normalizeExpected ( ext , "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Additional text." ) , ext )
}
2020-01-26 09:53:42 -05:00
checkPageType ( t , p , "page" )
2019-04-05 13:11:04 -04:00
}
testAllMarkdownEnginesForPages ( t , assertFunc , nil , simplePageWithoutSummaryDelimiter )
}
2013-08-21 05:37:14 -04:00
func TestPageWithDelimiter ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2019-01-02 06:33:26 -05:00
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
2016-10-18 02:43:44 -04:00
p := pages [ 0 ]
2016-08-01 17:04:44 -04:00
checkPageTitle ( t , p , "Simple" )
checkPageContent ( t , p , normalizeExpected ( ext , "<p>Summary Next Line</p>\n\n<p>Some more text</p>\n" ) , ext )
checkPageSummary ( t , p , normalizeExpected ( ext , "<p>Summary Next Line</p>" ) , ext )
2020-01-26 09:53:42 -05:00
checkPageType ( t , p , "page" )
2016-08-01 17:04:44 -04:00
}
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages ( t , assertFunc , nil , simplePageWithSummaryDelimiter )
2016-08-01 17:04:44 -04:00
}
2019-04-05 13:11:04 -04:00
func TestPageWithSummaryParameter ( t * testing . T ) {
t . Parallel ( )
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
p := pages [ 0 ]
checkPageTitle ( t , p , "SimpleWithSummaryParameter" )
checkPageContent ( t , p , normalizeExpected ( ext , "<p>Some text.</p>\n\n<p>Some more text.</p>\n" ) , ext )
2019-07-31 08:36:36 -04:00
// Summary is not Asciidoctor- or RST-compatible so don't test them
2019-04-05 13:11:04 -04:00
if ext != "ad" && ext != "rst" {
checkPageSummary ( t , p , normalizeExpected ( ext , "Page with summary parameter and <a href=\"http://www.example.com/\">a link</a>" ) , ext )
}
2020-01-26 09:53:42 -05:00
checkPageType ( t , p , "page" )
2019-04-05 13:11:04 -04:00
}
testAllMarkdownEnginesForPages ( t , assertFunc , nil , simplePageWithSummaryParameter )
}
2017-10-13 04:21:28 -04:00
// Issue #3854
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
// Also see https://github.com/gohugoio/hugo/issues/3977
2017-10-13 04:21:28 -04:00
func TestPageWithDateFields ( t * testing . T ) {
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2017-10-13 04:21:28 -04:00
pageWithDate := ` -- -
title : P % d
weight : % d
% s : 2017 - 10 - 13
-- -
Simple Page With Some Date `
2019-01-02 06:33:26 -05:00
hasDate := func ( p page . Page ) bool {
return p . Date ( ) . Year ( ) == 2017
2017-10-13 04:21:28 -04:00
}
datePage := func ( field string , weight int ) string {
return fmt . Sprintf ( pageWithDate , weight , weight , field )
}
t . Parallel ( )
2019-01-02 06:33:26 -05:00
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
2019-08-10 15:05:17 -04:00
c . Assert ( len ( pages ) > 0 , qt . Equals , true )
2017-10-13 04:21:28 -04:00
for _ , p := range pages {
2019-08-10 15:05:17 -04:00
c . Assert ( hasDate ( p ) , qt . Equals , true )
2017-10-13 04:21:28 -04:00
}
}
fields := [ ] string { "date" , "publishdate" , "pubdate" , "published" }
pageContents := make ( [ ] string , len ( fields ) )
for i , field := range fields {
pageContents [ i ] = datePage ( field , i + 1 )
}
testAllMarkdownEnginesForPages ( t , assertFunc , nil , pageContents ... )
}
2016-12-01 04:21:49 -05:00
// Issue #2601
2018-10-23 08:37:09 -04:00
func TestPageRawContent ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
cfg , fs := newTestCfg ( )
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2017-01-10 04:55:03 -05:00
writeSource ( t , fs , filepath . Join ( "content" , "raw.md" ) , ` -- -
2016-12-01 04:21:49 -05:00
title : Raw
-- -
* * Raw * * ` )
2017-01-10 04:55:03 -05:00
writeSource ( t , fs , filepath . Join ( "layouts" , "_default" , "single.html" ) , ` {{ .RawContent }} ` )
2016-12-01 04:21:49 -05:00
2017-02-04 22:20:06 -05:00
s := buildSingleSite ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } , BuildCfg { SkipRender : true } )
2016-12-01 04:21:49 -05:00
2019-08-10 15:05:17 -04:00
c . Assert ( len ( s . RegularPages ( ) ) , qt . Equals , 1 )
2019-01-02 06:33:26 -05:00
p := s . RegularPages ( ) [ 0 ]
2016-12-01 04:21:49 -05:00
2019-08-10 15:05:17 -04:00
c . Assert ( "**Raw**" , qt . Equals , p . RawContent ( ) )
2016-12-01 04:21:49 -05:00
}
2013-10-04 12:28:28 -04:00
func TestPageWithShortCodeInSummary ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2019-01-02 06:33:26 -05:00
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
2016-10-18 02:43:44 -04:00
p := pages [ 0 ]
2016-08-01 17:04:44 -04:00
checkPageTitle ( t , p , "Simple" )
2021-04-09 22:03:01 -04:00
checkPageContent ( t , p , normalizeExpected ( ext , "<p>Summary Next Line. <figure><img src=\"/not/real\"/> </figure> . More text here.</p><p>Some more text</p>" ) )
2016-08-17 07:41:48 -04:00
checkPageSummary ( t , p , "Summary Next Line. . More text here. Some more text" )
2020-01-26 09:53:42 -05:00
checkPageType ( t , p , "page" )
2014-01-29 17:50:31 -05:00
}
Shortcode rewrite, take 2
This commit contains a restructuring and partial rewrite of the shortcode handling.
Prior to this commit rendering of the page content was mingled with handling of the shortcodes. This led to several oddities.
The new flow is:
1. Shortcodes are extracted from page and replaced with placeholders.
2. Shortcodes are processed and rendered
3. Page is processed
4. The placeholders are replaced with the rendered shortcodes
The handling of summaries is also made simpler by this.
This commit also introduces some other chenges:
1. distinction between shortcodes that need further processing and those who do not:
* `{{< >}}`: Typically raw HTML. Will not be processed.
* `{{% %}}`: Will be processed by the page's markup engine (Markdown or (infuture) Asciidoctor)
The above also involves a new shortcode-parser, with lexical scanning inspired by Rob Pike's talk called "Lexical Scanning in Go",
which should be easier to understand, give better error messages and perform better.
2. If you want to exclude a shortcode from being processed (for documentation etc.), the inner part of the shorcode must be commented out, i.e. `{{%/* movie 47238zzb */%}}`. See the updated shortcode section in the documentation for further examples.
The new parser supports nested shortcodes. This isn't new, but has two related design choices worth mentioning:
* The shortcodes will be rendered individually, so If both `{{< >}}` and `{{% %}}` are used in the nested hierarchy, one will be passed through the page's markdown processor, the other not.
* To avoid potential costly overhead of always looking far ahead for a possible closing tag, this implementation looks at the template itself, and is branded as a container with inner content if it contains a reference to `.Inner`
Fixes #565
Fixes #480
Fixes #461
And probably some others.
2014-10-27 16:48:30 -04:00
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages ( t , assertFunc , nil , simplePageWithShortcodeInSummary )
2013-09-01 00:07:22 -04:00
}
2015-01-25 06:08:02 -05:00
func TestPageWithAdditionalExtension ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
cfg , fs := newTestCfg ( )
2022-03-17 17:03:27 -04:00
cfg . Set ( "markup" , map [ string ] any {
2019-11-06 14:10:47 -05:00
"defaultMarkdownHandler" : "blackfriday" , // TODO(bep)
} )
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2017-01-10 04:55:03 -05:00
writeSource ( t , fs , filepath . Join ( "content" , "simple.md" ) , simplePageWithAdditionalExtension )
2017-02-04 22:20:06 -05:00
s := buildSingleSite ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } , BuildCfg { SkipRender : true } )
2016-08-01 17:04:44 -04:00
2019-08-10 15:05:17 -04:00
c . Assert ( len ( s . RegularPages ( ) ) , qt . Equals , 1 )
2016-08-01 17:04:44 -04:00
2019-01-02 06:33:26 -05:00
p := s . RegularPages ( ) [ 0 ]
2016-08-01 17:04:44 -04:00
2015-01-25 06:08:02 -05:00
checkPageContent ( t , p , "<p>first line.<br />\nsecond line.</p>\n\n<p>fourth line.</p>\n" )
}
2014-01-28 23:09:24 -05:00
func TestTableOfContents ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
cfg , fs := newTestCfg ( )
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2017-01-10 04:55:03 -05:00
writeSource ( t , fs , filepath . Join ( "content" , "tocpage.md" ) , pageWithToC )
2017-02-04 22:20:06 -05:00
s := buildSingleSite ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } , BuildCfg { SkipRender : true } )
2016-08-01 17:04:44 -04:00
2019-08-10 15:05:17 -04:00
c . Assert ( len ( s . RegularPages ( ) ) , qt . Equals , 1 )
2016-08-01 17:04:44 -04:00
2019-01-02 06:33:26 -05:00
p := s . RegularPages ( ) [ 0 ]
2016-08-01 17:04:44 -04:00
2020-01-15 04:32:45 -05:00
checkPageContent ( t , p , "<p>For some moments the old man did not reply. He stood with bowed head, buried in deep thought. But at last he spoke.</p><h2 id=\"aa\">AA</h2> <p>I have no idea, of course, how long it took me to reach the limit of the plain, but at last I entered the foothills, following a pretty little canyon upward toward the mountains. Beside me frolicked a laughing brooklet, hurrying upon its noisy way down to the silent sea. In its quieter pools I discovered many small fish, of four-or five-pound weight I should imagine. In appearance, except as to size and color, they were not unlike the whale of our own seas. As I watched them playing about I discovered, not only that they suckled their young, but that at intervals they rose to the surface to breathe as well as to feed upon certain grasses and a strange, scarlet lichen which grew upon the rocks just above the water line.</p><h3 id=\"aaa\">AAA</h3> <p>I remember I felt an extraordinary persuasion that I was being played with, that presently, when I was upon the very verge of safety, this mysterious death–as swift as the passage of light–would leap after me from the pit about the cylinder and strike me down. ## BB</p><h3 id=\"bbb\">BBB</h3> <p>“You’re a great Granser,” he cried delightedly, “always making believe them little marks mean something.”</p>" )
2019-11-06 14:10:47 -05:00
checkPageTOC ( t , p , "<nav id=\"TableOfContents\">\n <ul>\n <li><a href=\"#aa\">AA</a>\n <ul>\n <li><a href=\"#aaa\">AAA</a></li>\n <li><a href=\"#bbb\">BBB</a></li>\n </ul>\n </li>\n </ul>\n</nav>" )
2014-01-28 23:09:24 -05:00
}
2013-09-01 00:07:22 -04:00
func TestPageWithMoreTag ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2019-01-02 06:33:26 -05:00
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
2016-10-18 02:43:44 -04:00
p := pages [ 0 ]
2016-08-01 17:04:44 -04:00
checkPageTitle ( t , p , "Simple" )
checkPageContent ( t , p , normalizeExpected ( ext , "<p>Summary Same Line</p>\n\n<p>Some more text</p>\n" ) )
checkPageSummary ( t , p , normalizeExpected ( ext , "<p>Summary Same Line</p>" ) )
2020-01-26 09:53:42 -05:00
checkPageType ( t , p , "page" )
2014-01-29 17:50:31 -05:00
}
2016-08-01 17:04:44 -04:00
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages ( t , assertFunc , nil , simplePageWithSummaryDelimiterSameLine )
2013-08-05 10:53:58 -04:00
}
2017-06-28 14:30:26 -04:00
// #2973
func TestSummaryWithHTMLTagsOnNextLine ( t * testing . T ) {
2019-01-02 06:33:26 -05:00
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2017-06-28 14:30:26 -04:00
p := pages [ 0 ]
2019-08-10 15:05:17 -04:00
s := string ( p . Summary ( ) )
c . Assert ( s , qt . Contains , "Happy new year everyone!" )
c . Assert ( s , qt . Not ( qt . Contains ) , "User interface" )
2017-06-28 14:30:26 -04:00
}
testAllMarkdownEnginesForPages ( t , assertFunc , nil , ` -- -
title : Simple
-- -
Happy new year everyone !
Here is the last report for commits in the year 2016. It covers hrev50718 - hrev50829 .
< ! -- more -- >
< h3 > User interface < / h3 >
` )
}
2022-01-14 16:08:11 -05:00
// Issue 9383
func TestRenderStringForRegularPageTranslations ( t * testing . T ) {
c := qt . New ( t )
b := newTestSitesBuilder ( t )
2022-01-27 03:46:51 -05:00
b . WithLogger ( loggers . NewBasicLoggerForWriter ( jwalterweatherman . LevelError , os . Stderr ) )
2022-01-14 16:08:11 -05:00
b . WithConfigFile ( "toml" ,
` baseurl = "https://example.org/"
title = "My Site"
defaultContentLanguage = "ru"
defaultContentLanguageInSubdir = true
[ languages . ru ]
contentDir = ' content / ru '
weight = 1
[ languages . en ]
weight = 2
contentDir = ' content / en '
[ outputs ]
home = [ "HTML" , "JSON" ] ` )
b . WithTemplates ( "index.html" , `
{ { - range . Site . Home . Translations - } }
< p > { { - . RenderString "foo" - } } < / p >
{ { - end - } }
{ { - range . Site . Home . AllTranslations - } }
< p > { { - . RenderString "bar" - } } < / p >
{ { - end - } }
` , "_default/single.html" ,
` {{ .Content }} ` ,
"index.json" ,
` { "Title": "My Site"} ` ,
)
b . WithContent (
"ru/a.md" ,
"" ,
"en/a.md" ,
"" ,
)
err := b . BuildE ( BuildCfg { } )
c . Assert ( err , qt . Equals , nil )
b . AssertFileContent ( "public/ru/index.html" , `
< p > foo < / p >
< p > foo < / p >
< p > bar < / p >
< p > bar < / p >
` )
b . AssertFileContent ( "public/en/index.html" , `
< p > foo < / p >
< p > foo < / p >
< p > bar < / p >
< p > bar < / p >
` )
}
2021-09-09 09:30:41 -04:00
// Issue 8919
func TestContentProviderWithCustomOutputFormat ( t * testing . T ) {
b := newTestSitesBuilder ( t )
b . WithLogger ( loggers . NewBasicLoggerForWriter ( jwalterweatherman . LevelDebug , os . Stderr ) )
b . WithConfigFile ( "toml" , ` baseURL = ' http : //example.org/'
title = ' My New Hugo Site '
timeout = 600000 # ten minutes in case we want to pause and debug
defaultContentLanguage = "en"
[ languages ]
[ languages . en ]
title = "Repro"
languageName = "English"
contentDir = "content/en"
[ languages . zh_CN ]
title = "Repro"
languageName = "简体中文"
contentDir = "content/zh_CN"
[ outputFormats ]
[ outputFormats . metadata ]
baseName = "metadata"
mediaType = "text/html"
isPlainText = true
notAlternative = true
[ outputs ]
home = [ "HTML" , "metadata" ] ` )
b . WithTemplates ( "home.metadata.html" , ` < h2 > Translations metadata < / h2 >
< ul >
{ { $ p := . Page } }
{ { range $ p . Translations } }
< li > Title : { { . Title } } , { { . Summary } } < / li >
< li > Content : { { . Content } } < / li >
< li > Plain : { { . Plain } } < / li >
< li > PlainWords : { { . PlainWords } } < / li >
< li > Summary : { { . Summary } } < / li >
< li > Truncated : { { . Truncated } } < / li >
< li > FuzzyWordCount : { { . FuzzyWordCount } } < / li >
< li > ReadingTime : { { . ReadingTime } } < / li >
< li > Len : { { . Len } } < / li >
{ { end } }
< / ul > ` )
b . WithTemplates ( "_default/baseof.html" , ` < html >
< body >
{ { block "main" . } } { { end } }
< / body >
< / html > ` )
b . WithTemplates ( "_default/home.html" , ` { { define "main" } }
< h2 > Translations < / h2 >
< ul >
{ { $ p := . Page } }
{ { range $ p . Translations } }
< li > Title : { { . Title } } , { { . Summary } } < / li >
< li > Content : { { . Content } } < / li >
< li > Plain : { { . Plain } } < / li >
< li > PlainWords : { { . PlainWords } } < / li >
< li > Summary : { { . Summary } } < / li >
< li > Truncated : { { . Truncated } } < / li >
< li > FuzzyWordCount : { { . FuzzyWordCount } } < / li >
< li > ReadingTime : { { . ReadingTime } } < / li >
< li > Len : { { . Len } } < / li >
{ { end } }
< / ul >
{ { end } } ` )
b . WithContent ( "en/_index.md" , ` -- -
title : Title ( en )
summary : Summary ( en )
-- -
Here is some content .
` )
b . WithContent ( "zh_CN/_index.md" , ` -- -
title : Title ( zh )
summary : Summary ( zh )
-- -
这是一些内容
` )
b . Build ( BuildCfg { } )
b . AssertFileContent ( "public/index.html" , ` < html >
< body >
< h2 > Translations < / h2 >
< ul >
< li > Title : Title ( zh ) , Summary ( zh ) < / li >
< li > Content : < p > 这是一些内容 < / p >
< / li >
< li > Plain : 这是一些内容
< / li >
< li > PlainWords : [ 这是一些内容 ] < / li >
< li > Summary : Summary ( zh ) < / li >
< li > Truncated : false < / li >
< li > FuzzyWordCount : 100 < / li >
< li > ReadingTime : 1 < / li >
< li > Len : 26 < / li >
< / ul >
< / body >
< / html > ` )
b . AssertFileContent ( "public/metadata.html" , ` < h2 > Translations metadata < / h2 >
< ul >
< li > Title : Title ( zh ) , Summary ( zh ) < / li >
< li > Content : < p > 这是一些内容 < / p >
< / li >
< li > Plain : 这是一些内容
< / li >
< li > PlainWords : [ 这是一些内容 ] < / li >
< li > Summary : Summary ( zh ) < / li >
< li > Truncated : false < / li >
< li > FuzzyWordCount : 100 < / li >
< li > ReadingTime : 1 < / li >
< li > Len : 26 < / li >
< / ul > ` )
b . AssertFileContent ( "public/zh_cn/index.html" , ` < html >
< body >
< h2 > Translations < / h2 >
< ul >
< li > Title : Title ( en ) , Summary ( en ) < / li >
< li > Content : < p > Here is some content . < / p >
< / li >
< li > Plain : Here is some content .
< / li >
< li > PlainWords : [ Here is some content . ] < / li >
< li > Summary : Summary ( en ) < / li >
< li > Truncated : false < / li >
< li > FuzzyWordCount : 100 < / li >
< li > ReadingTime : 1 < / li >
< li > Len : 29 < / li >
< / ul >
< / body >
< / html > ` )
b . AssertFileContent ( "public/zh_cn/metadata.html" , ` < h2 > Translations metadata < / h2 >
< ul >
< li > Title : Title ( en ) , Summary ( en ) < / li >
< li > Content : < p > Here is some content . < / p >
< / li >
< li > Plain : Here is some content .
< / li >
< li > PlainWords : [ Here is some content . ] < / li >
< li > Summary : Summary ( en ) < / li >
< li > Truncated : false < / li >
< li > FuzzyWordCount : 100 < / li >
< li > ReadingTime : 1 < / li >
< li > Len : 29 < / li >
< / ul > ` )
}
2013-09-03 17:51:06 -04:00
func TestPageWithDate ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
cfg , fs := newTestCfg ( )
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2016-08-01 17:04:44 -04:00
2017-01-10 04:55:03 -05:00
writeSource ( t , fs , filepath . Join ( "content" , "simple.md" ) , simplePageRFC3339Date )
2017-02-04 22:20:06 -05:00
s := buildSingleSite ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } , BuildCfg { SkipRender : true } )
2016-08-01 17:04:44 -04:00
2019-08-10 15:05:17 -04:00
c . Assert ( len ( s . RegularPages ( ) ) , qt . Equals , 1 )
2016-08-01 17:04:44 -04:00
2019-01-02 06:33:26 -05:00
p := s . RegularPages ( ) [ 0 ]
2016-08-01 17:04:44 -04:00
d , _ := time . Parse ( time . RFC3339 , "2013-05-17T16:59:30Z" )
2014-01-29 17:50:31 -05:00
checkPageDate ( t , p , d )
2013-09-03 17:51:06 -04:00
}
2018-03-11 13:59:11 -04:00
func TestPageWithLastmodFromGitInfo ( t * testing . T ) {
2020-12-23 03:26:23 -05:00
if htesting . IsCI ( ) {
// TODO(bep) figure out why this fails on GitHub actions.
t . Skip ( "Skip GitInfo test on CI" )
}
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2018-03-11 13:59:11 -04:00
// We need to use the OS fs for this.
2021-06-09 04:58:18 -04:00
cfg := config . New ( )
2018-03-11 13:59:11 -04:00
fs := hugofs . NewFrom ( hugofs . Os , cfg )
fs . Destination = & afero . MemMapFs { }
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
wd , err := os . Getwd ( )
2019-08-10 15:05:17 -04:00
c . Assert ( err , qt . IsNil )
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
2022-03-17 17:03:27 -04:00
cfg . Set ( "frontmatter" , map [ string ] any {
2018-03-11 13:59:11 -04:00
"lastmod" : [ ] string { ":git" , "lastmod" } ,
} )
2018-08-11 10:37:00 -04:00
cfg . Set ( "defaultContentLanguage" , "en" )
2018-03-11 13:59:11 -04:00
2022-03-17 17:03:27 -04:00
langConfig := map [ string ] any {
"en" : map [ string ] any {
2018-08-11 10:37:00 -04:00
"weight" : 1 ,
"languageName" : "English" ,
"contentDir" : "content" ,
} ,
2022-03-17 17:03:27 -04:00
"nn" : map [ string ] any {
2018-08-11 10:37:00 -04:00
"weight" : 2 ,
"languageName" : "Nynorsk" ,
"contentDir" : "content_nn" ,
} ,
}
cfg . Set ( "languages" , langConfig )
2018-03-11 13:59:11 -04:00
cfg . Set ( "enableGitInfo" , true )
cfg . Set ( "workingDir" , filepath . Join ( wd , "testsite" ) )
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
b := newTestSitesBuilderFromDepsCfg ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } ) . WithNothingAdded ( )
2018-03-11 13:59:11 -04:00
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
b . Build ( BuildCfg { SkipRender : true } )
h := b . H
2018-08-11 10:37:00 -04:00
2019-08-10 15:05:17 -04:00
c . Assert ( len ( h . Sites ) , qt . Equals , 2 )
2018-08-11 10:37:00 -04:00
enSite := h . Sites [ 0 ]
2019-08-10 15:05:17 -04:00
c . Assert ( len ( enSite . RegularPages ( ) ) , qt . Equals , 1 )
2018-03-11 16:17:41 -04:00
// 2018-03-11 is the Git author date for testsite/content/first-post.md
2019-08-10 15:05:17 -04:00
c . Assert ( enSite . RegularPages ( ) [ 0 ] . Lastmod ( ) . Format ( "2006-01-02" ) , qt . Equals , "2018-03-11" )
2022-02-27 13:40:07 -05:00
c . Assert ( enSite . RegularPages ( ) [ 0 ] . CodeOwners ( ) [ 0 ] , qt . Equals , "@bep" )
2018-08-11 10:37:00 -04:00
nnSite := h . Sites [ 1 ]
2019-08-10 15:05:17 -04:00
c . Assert ( len ( nnSite . RegularPages ( ) ) , qt . Equals , 1 )
2018-08-11 10:37:00 -04:00
// 2018-08-11 is the Git author date for testsite/content_nn/first-post.md
2019-08-10 15:05:17 -04:00
c . Assert ( nnSite . RegularPages ( ) [ 0 ] . Lastmod ( ) . Format ( "2006-01-02" ) , qt . Equals , "2018-08-11" )
2022-02-27 13:40:07 -05:00
c . Assert ( enSite . RegularPages ( ) [ 0 ] . CodeOwners ( ) [ 0 ] , qt . Equals , "@bep" )
2018-03-11 13:59:11 -04:00
}
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
func TestPageWithFrontMatterConfig ( t * testing . T ) {
for _ , dateHandler := range [ ] string { ":filename" , ":fileModTime" } {
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
dateHandler := dateHandler
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
t . Run ( fmt . Sprintf ( "dateHandler=%q" , dateHandler ) , func ( t * testing . T ) {
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
t . Parallel ( )
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
cfg , fs := newTestCfg ( )
2018-01-24 09:21:55 -05:00
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
pageTemplate := `
2018-01-24 09:21:55 -05:00
-- -
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
title : Page
weight : % d
lastMod : 2018 - 02 - 28
% s
2018-01-24 09:21:55 -05:00
-- -
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
Content
`
2018-01-24 09:21:55 -05:00
2022-03-17 17:03:27 -04:00
cfg . Set ( "frontmatter" , map [ string ] any {
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
"date" : [ ] string { dateHandler , "date" } ,
} )
2018-01-24 09:21:55 -05:00
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
c1 := filepath . Join ( "content" , "section" , "2012-02-21-noslug.md" )
c2 := filepath . Join ( "content" , "section" , "2012-02-22-slug.md" )
2018-01-24 09:21:55 -05:00
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
writeSource ( t , fs , c1 , fmt . Sprintf ( pageTemplate , 1 , "" ) )
writeSource ( t , fs , c2 , fmt . Sprintf ( pageTemplate , 2 , "slug: aslug" ) )
2018-01-24 09:21:55 -05:00
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
c1fi , err := fs . Source . Stat ( c1 )
2019-08-10 15:05:17 -04:00
c . Assert ( err , qt . IsNil )
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
c2fi , err := fs . Source . Stat ( c2 )
2019-08-10 15:05:17 -04:00
c . Assert ( err , qt . IsNil )
2018-01-25 22:54:15 -05:00
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
b := newTestSitesBuilderFromDepsCfg ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } ) . WithNothingAdded ( )
b . Build ( BuildCfg { SkipRender : true } )
2018-01-24 09:21:55 -05:00
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
s := b . H . Sites [ 0 ]
2019-08-10 15:05:17 -04:00
c . Assert ( len ( s . RegularPages ( ) ) , qt . Equals , 2 )
2018-01-24 09:21:55 -05:00
2019-01-02 06:33:26 -05:00
noSlug := s . RegularPages ( ) [ 0 ]
slug := s . RegularPages ( ) [ 1 ]
2018-01-24 09:21:55 -05:00
2019-08-10 15:05:17 -04:00
c . Assert ( noSlug . Lastmod ( ) . Day ( ) , qt . Equals , 28 )
2018-01-24 09:21:55 -05:00
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
switch strings . ToLower ( dateHandler ) {
case ":filename" :
2019-08-10 15:05:17 -04:00
c . Assert ( noSlug . Date ( ) . IsZero ( ) , qt . Equals , false )
c . Assert ( slug . Date ( ) . IsZero ( ) , qt . Equals , false )
c . Assert ( noSlug . Date ( ) . Year ( ) , qt . Equals , 2012 )
c . Assert ( slug . Date ( ) . Year ( ) , qt . Equals , 2012 )
c . Assert ( noSlug . Slug ( ) , qt . Equals , "noslug" )
c . Assert ( slug . Slug ( ) , qt . Equals , "aslug" )
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
case ":filemodtime" :
2019-08-10 15:05:17 -04:00
c . Assert ( noSlug . Date ( ) . Year ( ) , qt . Equals , c1fi . ModTime ( ) . Year ( ) )
c . Assert ( slug . Date ( ) . Year ( ) , qt . Equals , c2fi . ModTime ( ) . Year ( ) )
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
fallthrough
default :
2019-08-10 15:05:17 -04:00
c . Assert ( noSlug . Slug ( ) , qt . Equals , "" )
c . Assert ( slug . Slug ( ) , qt . Equals , "aslug" )
2018-01-24 09:21:55 -05:00
hugolib: Extract date and slug from filename
This commit makes it possible to extract the date from the content filename. Also, the filenames in these cases will make for very poor permalinks, so we will also use the remaining part as the page `slug` if that value is not set in front matter.
This should make it easier to move content from Jekyll to Hugo.
To enable, put this in your `config.toml`:
```toml
[frontmatter]
date = [":filename", ":default"]
```
This commit is also a spring cleaning of how the different dates are configured in Hugo. Hugo will check for dates following the configuration from left to right, starting with `:filename` etc.
So, if you want to use the `file modification time`, this can be a good configuration:
```toml
[frontmatter]
date = [ "date",":fileModTime", ":default"]
lastmod = ["lastmod" ,":fileModTime", ":default"]
```
The current `:default` values for the different dates are
```toml
[frontmatter]
date = ["date","publishDate", "lastmod"]
lastmod = ["lastmod", "date","publishDate"]
publishDate = ["publishDate", "date"]
expiryDate = ["expiryDate"]
```
The above will now be the same as:
```toml
[frontmatter]
date = [":default"]
lastmod = [":default"]
publishDate = [":default"]
expiryDate = [":default"]
```
Note:
* We have some built-in aliases to the above: lastmod => modified, publishDate => pubdate, published and expiryDate => unpublishdate.
* If you want a new configuration for, say, `date`, you can provide only that line, and the rest will be preserved.
* All the keywords to the right that does not start with a ":" maps to front matter parameters, and can be any date param (e.g. `myCustomDateParam`).
* The keywords to the left are the **4 predefined dates in Hugo**, i.e. they are constant values.
* The current "special date handlers" are `:fileModTime` and `:filename`. We will soon add `:git` to that list.
Fixes #285
Closes #3310
Closes #3762
Closes #4340
2018-03-11 06:32:55 -04:00
}
} )
2018-01-24 09:21:55 -05:00
}
}
2015-09-03 06:22:20 -04:00
func TestWordCountWithAllCJKRunesWithoutHasCJKLanguage ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2019-01-02 06:33:26 -05:00
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
2016-10-18 02:43:44 -04:00
p := pages [ 0 ]
2016-08-17 07:41:48 -04:00
if p . WordCount ( ) != 8 {
2019-01-02 06:33:26 -05:00
t . Fatalf ( "[%s] incorrect word count. expected %v, got %v" , ext , 8 , p . WordCount ( ) )
2016-08-01 17:04:44 -04:00
}
2015-09-03 06:22:20 -04:00
}
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages ( t , assertFunc , nil , simplePageWithAllCJKRunes )
2015-09-03 06:22:20 -04:00
}
2018-10-23 08:37:09 -04:00
func TestWordCountWithAllCJKRunesHasCJKLanguage ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2022-03-17 17:03:27 -04:00
settings := map [ string ] any { "hasCJKLanguage" : true }
2015-09-03 06:22:20 -04:00
2019-01-02 06:33:26 -05:00
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
2016-10-18 02:43:44 -04:00
p := pages [ 0 ]
2016-08-17 07:41:48 -04:00
if p . WordCount ( ) != 15 {
2019-01-02 06:33:26 -05:00
t . Fatalf ( "[%s] incorrect word count, expected %v, got %v" , ext , 15 , p . WordCount ( ) )
2016-08-01 17:04:44 -04:00
}
2015-09-03 06:22:20 -04:00
}
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages ( t , assertFunc , settings , simplePageWithAllCJKRunes )
2015-09-03 06:22:20 -04:00
}
2018-10-23 08:37:09 -04:00
func TestWordCountWithMainEnglishWithCJKRunes ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2022-03-17 17:03:27 -04:00
settings := map [ string ] any { "hasCJKLanguage" : true }
2015-09-03 06:22:20 -04:00
2019-01-02 06:33:26 -05:00
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
2016-10-18 02:43:44 -04:00
p := pages [ 0 ]
2016-08-17 07:41:48 -04:00
if p . WordCount ( ) != 74 {
2019-01-02 06:33:26 -05:00
t . Fatalf ( "[%s] incorrect word count, expected %v, got %v" , ext , 74 , p . WordCount ( ) )
2016-08-01 17:04:44 -04:00
}
2015-07-12 05:05:37 -04:00
2019-01-02 06:33:26 -05:00
if p . Summary ( ) != simplePageWithMainEnglishWithCJKRunesSummary {
t . Fatalf ( "[%s] incorrect Summary for content '%s'. expected %v, got %v" , ext , p . Plain ( ) ,
simplePageWithMainEnglishWithCJKRunesSummary , p . Summary ( ) )
2016-08-01 17:04:44 -04:00
}
2015-09-03 06:22:20 -04:00
}
2016-08-01 17:04:44 -04:00
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages ( t , assertFunc , settings , simplePageWithMainEnglishWithCJKRunes )
2015-09-03 06:22:20 -04:00
}
func TestWordCountWithIsCJKLanguageFalse ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2022-03-17 17:03:27 -04:00
settings := map [ string ] any {
2017-02-04 22:20:06 -05:00
"hasCJKLanguage" : true ,
}
2015-09-03 06:22:20 -04:00
2019-01-02 06:33:26 -05:00
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
2016-10-18 02:43:44 -04:00
p := pages [ 0 ]
2016-08-17 07:41:48 -04:00
if p . WordCount ( ) != 75 {
2019-01-02 06:33:26 -05:00
t . Fatalf ( "[%s] incorrect word count for content '%s'. expected %v, got %v" , ext , p . Plain ( ) , 74 , p . WordCount ( ) )
2016-08-01 17:04:44 -04:00
}
2015-09-03 06:22:20 -04:00
2019-01-02 06:33:26 -05:00
if p . Summary ( ) != simplePageWithIsCJKLanguageFalseSummary {
t . Fatalf ( "[%s] incorrect Summary for content '%s'. expected %v, got %v" , ext , p . Plain ( ) ,
simplePageWithIsCJKLanguageFalseSummary , p . Summary ( ) )
2016-08-01 17:04:44 -04:00
}
2015-07-12 05:05:37 -04:00
}
2016-08-01 17:04:44 -04:00
2017-02-04 22:20:06 -05:00
testAllMarkdownEnginesForPages ( t , assertFunc , settings , simplePageWithIsCJKLanguageFalse )
2015-07-12 05:05:37 -04:00
}
2013-10-15 09:15:52 -04:00
func TestWordCount ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2019-01-02 06:33:26 -05:00
assertFunc := func ( t * testing . T , ext string , pages page . Pages ) {
2016-10-18 02:43:44 -04:00
p := pages [ 0 ]
2016-08-17 07:41:48 -04:00
if p . WordCount ( ) != 483 {
t . Fatalf ( "[%s] incorrect word count. expected %v, got %v" , ext , 483 , p . WordCount ( ) )
2016-08-01 17:04:44 -04:00
}
2014-01-29 17:50:31 -05:00
2016-08-17 07:41:48 -04:00
if p . FuzzyWordCount ( ) != 500 {
2018-10-03 03:01:30 -04:00
t . Fatalf ( "[%s] incorrect word count. expected %v, got %v" , ext , 500 , p . FuzzyWordCount ( ) )
2016-08-01 17:04:44 -04:00
}
2016-08-17 07:41:48 -04:00
if p . ReadingTime ( ) != 3 {
t . Fatalf ( "[%s] incorrect min read. expected %v, got %v" , ext , 3 , p . ReadingTime ( ) )
2016-08-01 17:04:44 -04:00
}
2014-01-29 17:50:31 -05:00
}
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages ( t , assertFunc , nil , simplePageWithLongContent )
2013-10-15 09:15:52 -04:00
}
2015-05-31 12:54:50 -04:00
func TestPagePaths ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2015-05-20 02:21:21 -04:00
2017-02-04 22:20:06 -05:00
siteParmalinksSetting := map [ string ] string {
2015-05-09 06:12:30 -04:00
"post" : ":year/:month/:day/:title/" ,
}
tests := [ ] struct {
2015-05-20 02:21:21 -04:00
content string
path string
hasPermalink bool
expected string
2015-05-09 06:12:30 -04:00
} {
2017-02-04 22:20:06 -05:00
{ simplePage , "post/x.md" , false , "post/x.html" } ,
{ simplePageWithURL , "post/x.md" , false , "simple/url/index.html" } ,
{ simplePageWithSlug , "post/x.md" , false , "post/simple-slug.html" } ,
{ simplePageWithDate , "post/x.md" , true , "2013/10/15/simple/index.html" } ,
{ UTF8Page , "post/x.md" , false , "post/x.html" } ,
{ UTF8PageWithURL , "post/x.md" , false , "ラーメン/url/index.html" } ,
{ UTF8PageWithSlug , "post/x.md" , false , "post/ラーメン-slug.html" } ,
{ UTF8PageWithDate , "post/x.md" , true , "2013/10/15/ラーメン/index.html" } ,
2015-05-09 06:12:30 -04:00
}
2017-03-08 07:45:33 -05:00
for _ , test := range tests {
2017-02-04 22:20:06 -05:00
cfg , fs := newTestCfg ( )
2015-05-09 06:12:30 -04:00
if test . hasPermalink {
2017-02-04 22:20:06 -05:00
cfg . Set ( "permalinks" , siteParmalinksSetting )
2015-05-09 06:12:30 -04:00
}
2017-02-04 22:20:06 -05:00
writeSource ( t , fs , filepath . Join ( "content" , filepath . FromSlash ( test . path ) ) , test . content )
s := buildSingleSite ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } , BuildCfg { SkipRender : true } )
2019-08-10 15:05:17 -04:00
c . Assert ( len ( s . RegularPages ( ) ) , qt . Equals , 1 )
2015-05-09 06:12:30 -04:00
2015-08-30 18:51:25 -04:00
}
}
2017-11-17 10:28:35 -05:00
func TestTranslationKey ( t * testing . T ) {
t . Parallel ( )
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2017-11-17 10:28:35 -05:00
cfg , fs := newTestCfg ( )
writeSource ( t , fs , filepath . Join ( "content" , filepath . FromSlash ( "sect/simple.no.md" ) ) , "---\ntitle: \"A1\"\ntranslationKey: \"k1\"\n---\nContent\n" )
writeSource ( t , fs , filepath . Join ( "content" , filepath . FromSlash ( "sect/simple.en.md" ) ) , "---\ntitle: \"A2\"\n---\nContent\n" )
s := buildSingleSite ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } , BuildCfg { SkipRender : true } )
2019-08-10 15:05:17 -04:00
c . Assert ( len ( s . RegularPages ( ) ) , qt . Equals , 2 )
2017-11-17 10:28:35 -05:00
2022-02-17 07:04:00 -05:00
home := s . Info . Home ( )
2019-08-10 15:05:17 -04:00
c . Assert ( home , qt . Not ( qt . IsNil ) )
c . Assert ( home . TranslationKey ( ) , qt . Equals , "home" )
c . Assert ( s . RegularPages ( ) [ 0 ] . TranslationKey ( ) , qt . Equals , "page/k1" )
2019-01-02 06:33:26 -05:00
p2 := s . RegularPages ( ) [ 1 ]
2017-11-17 10:28:35 -05:00
2019-08-10 15:05:17 -04:00
c . Assert ( p2 . TranslationKey ( ) , qt . Equals , "page/sect/simple" )
2017-11-17 10:28:35 -05:00
}
2016-04-12 18:14:00 -04:00
func TestChompBOM ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2016-04-12 18:14:00 -04:00
const utf8BOM = "\xef\xbb\xbf"
2017-02-04 22:20:06 -05:00
cfg , fs := newTestCfg ( )
2016-08-01 17:04:44 -04:00
2017-01-10 04:55:03 -05:00
writeSource ( t , fs , filepath . Join ( "content" , "simple.md" ) , utf8BOM + simplePage )
2017-02-04 22:20:06 -05:00
s := buildSingleSite ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } , BuildCfg { SkipRender : true } )
2016-04-12 18:14:00 -04:00
2019-08-10 15:05:17 -04:00
c . Assert ( len ( s . RegularPages ( ) ) , qt . Equals , 1 )
2016-08-01 17:04:44 -04:00
2019-01-02 06:33:26 -05:00
p := s . RegularPages ( ) [ 0 ]
2016-08-01 17:04:44 -04:00
2016-04-12 18:14:00 -04:00
checkPageTitle ( t , p , "Simple" )
}
Move the emoji parsing to pageparser
This avoids double parsing the page content when `enableEmoji=true`.
This commit also adds some general improvements to the parser, making it in general much faster:
```bash
benchmark old ns/op new ns/op delta
BenchmarkShortcodeLexer-4 90258 101730 +12.71%
BenchmarkParse-4 148940 15037 -89.90%
benchmark old allocs new allocs delta
BenchmarkShortcodeLexer-4 456 700 +53.51%
BenchmarkParse-4 28 33 +17.86%
benchmark old bytes new bytes delta
BenchmarkShortcodeLexer-4 69875 81014 +15.94%
BenchmarkParse-4 8128 8304 +2.17%
```
Running some site benchmarks with Emoji support turned on:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 924556797 818115620 -11.51%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 4112613 4133787 +0.51%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 426982864 424363832 -0.61%
```
Fixes #5534
2018-12-17 15:03:23 -05:00
func TestPageWithEmoji ( t * testing . T ) {
for _ , enableEmoji := range [ ] bool { true , false } {
2021-06-09 04:58:18 -04:00
v := config . New ( )
Move the emoji parsing to pageparser
This avoids double parsing the page content when `enableEmoji=true`.
This commit also adds some general improvements to the parser, making it in general much faster:
```bash
benchmark old ns/op new ns/op delta
BenchmarkShortcodeLexer-4 90258 101730 +12.71%
BenchmarkParse-4 148940 15037 -89.90%
benchmark old allocs new allocs delta
BenchmarkShortcodeLexer-4 456 700 +53.51%
BenchmarkParse-4 28 33 +17.86%
benchmark old bytes new bytes delta
BenchmarkShortcodeLexer-4 69875 81014 +15.94%
BenchmarkParse-4 8128 8304 +2.17%
```
Running some site benchmarks with Emoji support turned on:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 924556797 818115620 -11.51%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 4112613 4133787 +0.51%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 426982864 424363832 -0.61%
```
Fixes #5534
2018-12-17 15:03:23 -05:00
v . Set ( "enableEmoji" , enableEmoji )
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
b := newTestSitesBuilder ( t ) . WithViper ( v )
Move the emoji parsing to pageparser
This avoids double parsing the page content when `enableEmoji=true`.
This commit also adds some general improvements to the parser, making it in general much faster:
```bash
benchmark old ns/op new ns/op delta
BenchmarkShortcodeLexer-4 90258 101730 +12.71%
BenchmarkParse-4 148940 15037 -89.90%
benchmark old allocs new allocs delta
BenchmarkShortcodeLexer-4 456 700 +53.51%
BenchmarkParse-4 28 33 +17.86%
benchmark old bytes new bytes delta
BenchmarkShortcodeLexer-4 69875 81014 +15.94%
BenchmarkParse-4 8128 8304 +2.17%
```
Running some site benchmarks with Emoji support turned on:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 924556797 818115620 -11.51%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 4112613 4133787 +0.51%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 426982864 424363832 -0.61%
```
Fixes #5534
2018-12-17 15:03:23 -05:00
b . WithContent ( "page-emoji.md" , ` -- -
title : "Hugo Smile"
-- -
This is a : smile : .
< ! -- more -- >
2019-01-29 15:03:42 -05:00
Another : smile : This is : not : : an : : emoji : .
Move the emoji parsing to pageparser
This avoids double parsing the page content when `enableEmoji=true`.
This commit also adds some general improvements to the parser, making it in general much faster:
```bash
benchmark old ns/op new ns/op delta
BenchmarkShortcodeLexer-4 90258 101730 +12.71%
BenchmarkParse-4 148940 15037 -89.90%
benchmark old allocs new allocs delta
BenchmarkShortcodeLexer-4 456 700 +53.51%
BenchmarkParse-4 28 33 +17.86%
benchmark old bytes new bytes delta
BenchmarkShortcodeLexer-4 69875 81014 +15.94%
BenchmarkParse-4 8128 8304 +2.17%
```
Running some site benchmarks with Emoji support turned on:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 924556797 818115620 -11.51%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 4112613 4133787 +0.51%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 426982864 424363832 -0.61%
```
Fixes #5534
2018-12-17 15:03:23 -05:00
2019-01-29 15:03:42 -05:00
O : christmas_tree :
Write me an : e - mail : or : email : ?
Too many colons : : : : : : : : : : : ? : : ! : : . :
If you dislike this video , you can hit that : - 1 : button : stuck_out_tongue_winking_eye : ,
but if you like it , hit : + 1 : and get subscribed !
Move the emoji parsing to pageparser
This avoids double parsing the page content when `enableEmoji=true`.
This commit also adds some general improvements to the parser, making it in general much faster:
```bash
benchmark old ns/op new ns/op delta
BenchmarkShortcodeLexer-4 90258 101730 +12.71%
BenchmarkParse-4 148940 15037 -89.90%
benchmark old allocs new allocs delta
BenchmarkShortcodeLexer-4 456 700 +53.51%
BenchmarkParse-4 28 33 +17.86%
benchmark old bytes new bytes delta
BenchmarkShortcodeLexer-4 69875 81014 +15.94%
BenchmarkParse-4 8128 8304 +2.17%
```
Running some site benchmarks with Emoji support turned on:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 924556797 818115620 -11.51%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 4112613 4133787 +0.51%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 426982864 424363832 -0.61%
```
Fixes #5534
2018-12-17 15:03:23 -05:00
` )
b . CreateSites ( ) . Build ( BuildCfg { } )
if enableEmoji {
b . AssertFileContent ( "public/page-emoji/index.html" ,
"This is a 😄" ,
"Another 😄" ,
2019-01-29 15:03:42 -05:00
"This is :not: :an: :emoji:." ,
"O 🎄" ,
"Write me an 📧 or ✉️?" ,
"Too many colons: :: ::: :::: :?: :!: :.:" ,
"you can hit that 👎 button 😜," ,
"hit 👍 and get subscribed!" ,
Move the emoji parsing to pageparser
This avoids double parsing the page content when `enableEmoji=true`.
This commit also adds some general improvements to the parser, making it in general much faster:
```bash
benchmark old ns/op new ns/op delta
BenchmarkShortcodeLexer-4 90258 101730 +12.71%
BenchmarkParse-4 148940 15037 -89.90%
benchmark old allocs new allocs delta
BenchmarkShortcodeLexer-4 456 700 +53.51%
BenchmarkParse-4 28 33 +17.86%
benchmark old bytes new bytes delta
BenchmarkShortcodeLexer-4 69875 81014 +15.94%
BenchmarkParse-4 8128 8304 +2.17%
```
Running some site benchmarks with Emoji support turned on:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 924556797 818115620 -11.51%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 4112613 4133787 +0.51%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 426982864 424363832 -0.61%
```
Fixes #5534
2018-12-17 15:03:23 -05:00
)
} else {
b . AssertFileContent ( "public/page-emoji/index.html" ,
"This is a :smile:" ,
"Another :smile:" ,
2019-01-29 15:03:42 -05:00
"This is :not: :an: :emoji:." ,
"O :christmas_tree:" ,
"Write me an :e-mail: or :email:?" ,
"Too many colons: :: ::: :::: :?: :!: :.:" ,
"you can hit that :-1: button :stuck_out_tongue_winking_eye:," ,
"hit :+1: and get subscribed!" ,
Move the emoji parsing to pageparser
This avoids double parsing the page content when `enableEmoji=true`.
This commit also adds some general improvements to the parser, making it in general much faster:
```bash
benchmark old ns/op new ns/op delta
BenchmarkShortcodeLexer-4 90258 101730 +12.71%
BenchmarkParse-4 148940 15037 -89.90%
benchmark old allocs new allocs delta
BenchmarkShortcodeLexer-4 456 700 +53.51%
BenchmarkParse-4 28 33 +17.86%
benchmark old bytes new bytes delta
BenchmarkShortcodeLexer-4 69875 81014 +15.94%
BenchmarkParse-4 8128 8304 +2.17%
```
Running some site benchmarks with Emoji support turned on:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 924556797 818115620 -11.51%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 4112613 4133787 +0.51%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=3,num_pages=5000,tags_per_page=5,shortcodes,render-4 426982864 424363832 -0.61%
```
Fixes #5534
2018-12-17 15:03:23 -05:00
)
}
}
}
2019-01-02 06:33:26 -05:00
func TestPageHTMLContent ( t * testing . T ) {
b := newTestSitesBuilder ( t )
b . WithSimpleConfigFile ( )
frontmatter := ` -- -
title : "HTML Content"
-- -
`
b . WithContent ( "regular.html" , frontmatter + ` <h1>Hugo</h1> ` )
b . WithContent ( "noblackfridayforyou.html" , frontmatter + ` **Hugo!** ` )
b . WithContent ( "manualsummary.html" , frontmatter + `
< p > This is summary < / p >
< ! -- more -- >
< p > This is the main content . < / p > ` )
b . Build ( BuildCfg { } )
b . AssertFileContent (
"public/regular/index.html" ,
"Single: HTML Content|Hello|en|RelPermalink: /regular/|" ,
"Summary: Hugo|Truncated: false" )
b . AssertFileContent (
"public/noblackfridayforyou/index.html" ,
"Permalink: http://example.com/noblackfridayforyou/|**Hugo!**|" ,
)
// https://github.com/gohugoio/hugo/issues/5723
b . AssertFileContent (
"public/manualsummary/index.html" ,
"Single: HTML Content|Hello|en|RelPermalink: /manualsummary/|" ,
"Summary: \n<p>This is summary</p>\n|Truncated: true" ,
"|<p>This is the main content.</p>|" ,
)
}
2018-10-30 15:24:34 -04:00
// https://github.com/gohugoio/hugo/issues/5381
func TestPageManualSummary ( t * testing . T ) {
b := newTestSitesBuilder ( t )
b . WithSimpleConfigFile ( )
b . WithContent ( "page-md-shortcode.md" , ` -- -
title : "Hugo"
-- -
This is a { { < sc > } } .
< ! -- more -- >
Content .
2018-11-24 11:06:26 -05:00
` )
// https://github.com/gohugoio/hugo/issues/5464
b . WithContent ( "page-md-only-shortcode.md" , ` -- -
title : "Hugo"
-- -
{ { < sc > } }
< ! -- more -- >
{ { < sc > } }
2018-10-30 15:24:34 -04:00
` )
b . WithContent ( "page-md-shortcode-same-line.md" , ` -- -
title : "Hugo"
-- -
2018-11-05 07:30:16 -05:00
This is a { { < sc > } } < ! -- more -- > Same line .
` )
b . WithContent ( "page-md-shortcode-same-line-after.md" , ` -- -
title : "Hugo"
-- -
Summary < ! -- more -- > { { < sc > } }
2018-10-30 15:24:34 -04:00
` )
b . WithContent ( "page-org-shortcode.org" , ` # + TITLE : T1
# + AUTHOR : A1
# + DESCRIPTION : D1
This is a { { < sc > } } .
# more
Content .
` )
b . WithContent ( "page-org-variant1.org" , ` # + TITLE : T1
Summary .
# more
Content .
` )
b . WithTemplatesAdded ( "layouts/shortcodes/sc.html" , "a shortcode" )
b . WithTemplatesAdded ( "layouts/_default/single.html" , `
SUMMARY : { { . Summary } } : END
-- -- -- -- -- -- -- -- -- -- -- -- --
CONTENT : { { . Content } }
` )
b . CreateSites ( ) . Build ( BuildCfg { } )
b . AssertFileContent ( "public/page-md-shortcode/index.html" ,
"SUMMARY:<p>This is a a shortcode.</p>:END" ,
"CONTENT:<p>This is a a shortcode.</p>\n\n<p>Content.</p>\n" ,
)
b . AssertFileContent ( "public/page-md-shortcode-same-line/index.html" ,
2018-11-05 07:30:16 -05:00
"SUMMARY:<p>This is a a shortcode</p>:END" ,
"CONTENT:<p>This is a a shortcode</p>\n\n<p>Same line.</p>\n" ,
)
b . AssertFileContent ( "public/page-md-shortcode-same-line-after/index.html" ,
"SUMMARY:<p>Summary</p>:END" ,
"CONTENT:<p>Summary</p>\n\na shortcode" ,
2018-10-30 15:24:34 -04:00
)
b . AssertFileContent ( "public/page-org-shortcode/index.html" ,
2019-06-04 06:21:25 -04:00
"SUMMARY:<p>\nThis is a a shortcode.\n</p>:END" ,
"CONTENT:<p>\nThis is a a shortcode.\n</p>\n<p>\nContent.\t\n</p>\n" ,
2018-10-30 15:24:34 -04:00
)
b . AssertFileContent ( "public/page-org-variant1/index.html" ,
2019-06-04 06:21:25 -04:00
"SUMMARY:<p>\nSummary.\n</p>:END" ,
"CONTENT:<p>\nSummary.\n</p>\n<p>\nContent.\t\n</p>\n" ,
2018-10-30 15:24:34 -04:00
)
2018-11-24 11:06:26 -05:00
b . AssertFileContent ( "public/page-md-only-shortcode/index.html" ,
"SUMMARY:a shortcode:END" ,
"CONTENT:a shortcode\n\na shortcode\n" ,
)
2018-10-30 15:24:34 -04:00
}
2018-11-28 04:21:54 -05:00
// https://github.com/gohugoio/hugo/issues/5478
func TestPageWithCommentedOutFrontMatter ( t * testing . T ) {
b := newTestSitesBuilder ( t )
b . WithSimpleConfigFile ( )
b . WithContent ( "page.md" , ` < ! --
++ +
title = "hello"
++ +
-- >
This is the content .
` )
b . WithTemplatesAdded ( "layouts/_default/single.html" , `
Title : { { . Title } }
Content : { { . Content } }
` )
b . CreateSites ( ) . Build ( BuildCfg { } )
b . AssertFileContent ( "public/page/index.html" ,
"Title: hello" ,
"Content:<p>This is the content.</p>" ,
)
}
2019-03-25 13:18:34 -04:00
// https://github.com/gohugoio/hugo/issues/5781
func TestPageWithZeroFile ( t * testing . T ) {
newTestSitesBuilder ( t ) . WithLogger ( loggers . NewWarningLogger ( ) ) . WithSimpleConfigFile ( ) .
WithTemplatesAdded ( "index.html" , "{{ .File.Filename }}{{ with .File }}{{ .Dir }}{{ end }}" ) . Build ( BuildCfg { } )
}
2019-03-26 05:28:02 -04:00
func TestHomePageWithNoTitle ( t * testing . T ) {
2019-03-26 09:33:09 -04:00
b := newTestSitesBuilder ( t ) . WithConfigFile ( "toml" , `
title = "Site Title"
` )
b . WithTemplatesAdded ( "index.html" , "Title|{{ with .Title }}{{ . }}{{ end }}|" )
2019-03-26 05:28:02 -04:00
b . WithContent ( "_index.md" , ` -- -
description : "No title for you!"
-- -
Content .
` )
b . Build ( BuildCfg { } )
b . AssertFileContent ( "public/index.html" , "Title||" )
}
2016-06-14 09:53:49 -04:00
func TestShouldBuild ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2020-12-02 07:23:25 -05:00
past := time . Date ( 2009 , 11 , 17 , 20 , 34 , 58 , 651387237 , time . UTC )
future := time . Date ( 2037 , 11 , 17 , 20 , 34 , 58 , 651387237 , time . UTC )
zero := time . Time { }
2016-05-11 11:45:09 -04:00
2020-12-02 07:23:25 -05:00
publishSettings := [ ] struct {
2016-05-11 11:45:09 -04:00
buildFuture bool
buildExpired bool
buildDrafts bool
draft bool
publishDate time . Time
expiryDate time . Time
out bool
} {
// publishDate and expiryDate
{ false , false , false , false , zero , zero , true } ,
{ false , false , false , false , zero , future , true } ,
{ false , false , false , false , past , zero , true } ,
{ false , false , false , false , past , future , true } ,
{ false , false , false , false , past , past , false } ,
{ false , false , false , false , future , future , false } ,
{ false , false , false , false , future , past , false } ,
// buildFuture and buildExpired
{ false , true , false , false , past , past , true } ,
{ true , true , false , false , past , past , true } ,
{ true , false , false , false , past , past , false } ,
{ true , false , false , false , future , future , true } ,
{ true , true , false , false , future , future , true } ,
{ false , true , false , false , future , past , false } ,
// buildDrafts and draft
{ true , true , false , true , past , future , false } ,
{ true , true , true , true , past , future , true } ,
{ true , true , true , true , past , future , true } ,
}
for _ , ps := range publishSettings {
2016-06-14 09:53:49 -04:00
s := shouldBuild ( ps . buildFuture , ps . buildExpired , ps . buildDrafts , ps . draft ,
2016-05-11 11:45:09 -04:00
ps . publishDate , ps . expiryDate )
if s != ps . out {
t . Errorf ( "AssertShouldBuild unexpected output with params: %+v" , ps )
}
}
}
2017-01-02 05:44:17 -05:00
2017-06-06 03:15:42 -04:00
// "dot" in path: #1885 and #2110
// disablePathToLower regression: #3374
func TestPathIssues ( t * testing . T ) {
for _ , disablePathToLower := range [ ] bool { false , true } {
for _ , uglyURLs := range [ ] bool { false , true } {
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
disablePathToLower := disablePathToLower
uglyURLs := uglyURLs
2017-06-06 03:15:42 -04:00
t . Run ( fmt . Sprintf ( "disablePathToLower=%t,uglyURLs=%t" , disablePathToLower , uglyURLs ) , func ( t * testing . T ) {
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
t . Parallel ( )
2017-06-06 03:15:42 -04:00
cfg , fs := newTestCfg ( )
2019-08-10 15:05:17 -04:00
th := newTestHelper ( cfg , fs , t )
c := qt . New ( t )
2017-03-09 13:19:29 -05:00
2017-06-06 03:15:42 -04:00
cfg . Set ( "permalinks" , map [ string ] string {
"post" : ":section/:title" ,
} )
2017-03-09 13:19:29 -05:00
2017-06-06 03:15:42 -04:00
cfg . Set ( "uglyURLs" , uglyURLs )
cfg . Set ( "disablePathToLower" , disablePathToLower )
cfg . Set ( "paginate" , 1 )
2017-03-09 13:19:29 -05:00
2017-06-06 03:15:42 -04:00
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>" )
2017-03-09 13:19:29 -05:00
2017-06-06 03:15:42 -04:00
for i := 0 ; i < 3 ; i ++ {
writeSource ( t , fs , filepath . Join ( "content" , "post" , fmt . Sprintf ( "doc%d.md" , i ) ) ,
fmt . Sprintf ( ` -- -
2017-03-09 13:19:29 -05:00
title : "test%d.dot"
tags :
- ".net"
-- -
# doc1
* some content * ` , i ) )
2017-06-06 03:15:42 -04:00
}
writeSource ( t , fs , filepath . Join ( "content" , "Blog" , "Blog1.md" ) ,
fmt . Sprintf ( ` -- -
title : "testBlog"
tags :
- "Blog"
-- -
# doc1
* some blog content * ` ) )
2017-03-09 13:19:29 -05:00
2017-06-06 03:15:42 -04:00
s := buildSingleSite ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } , BuildCfg { } )
: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
2019-08-10 15:05:17 -04:00
c . Assert ( len ( s . RegularPages ( ) ) , qt . Equals , 4 )
2017-03-09 13:19:29 -05:00
2017-06-06 03:15:42 -04:00
pathFunc := func ( s string ) string {
if uglyURLs {
return strings . Replace ( s , "/index.html" , ".html" , 1 )
}
return s
2017-03-09 13:19:29 -05:00
}
2017-06-06 03:15:42 -04:00
blog := "blog"
2017-03-09 13:19:29 -05:00
2017-06-06 03:15:42 -04:00
if disablePathToLower {
blog = "Blog"
}
2017-03-09 13:19:29 -05:00
2017-06-06 03:15:42 -04:00
th . assertFileContent ( pathFunc ( "public/" + blog + "/" + blog + "1/index.html" ) , "some blog content" )
2017-03-09 13:19:29 -05:00
2017-06-06 03:15:42 -04:00
th . assertFileContent ( pathFunc ( "public/post/test0.dot/index.html" ) , "some content" )
if uglyURLs {
2022-03-01 23:27:52 -05:00
th . assertFileContent ( "public/post/page/1.html" , ` canonical" href="/post.html" ` )
2017-06-06 03:15:42 -04:00
th . assertFileContent ( "public/post.html" , ` <body>P1|URL: /post.html|Next: /post/page/2.html</body> ` )
th . assertFileContent ( "public/post/page/2.html" , ` <body>P2|URL: /post/page/2.html|Next: /post/page/3.html</body> ` )
} else {
2022-03-01 23:27:52 -05:00
th . assertFileContent ( "public/post/page/1/index.html" , ` canonical" href="/post/" ` )
2017-06-06 03:15:42 -04:00
th . assertFileContent ( "public/post/index.html" , ` <body>P1|URL: /post/|Next: /post/page/2/</body> ` )
th . assertFileContent ( "public/post/page/2/index.html" , ` <body>P2|URL: /post/page/2/|Next: /post/page/3/</body> ` )
th . assertFileContent ( "public/tags/.net/index.html" , ` <body>P1|URL: /tags/.net/|Next: /tags/.net/page/2/</body> ` )
}
2019-01-02 06:33:26 -05:00
p := s . RegularPages ( ) [ 0 ]
2017-06-06 03:15:42 -04:00
if uglyURLs {
2019-08-10 15:05:17 -04:00
c . Assert ( p . RelPermalink ( ) , qt . Equals , "/post/test0.dot.html" )
2017-06-06 03:15:42 -04:00
} else {
2019-08-10 15:05:17 -04:00
c . Assert ( p . RelPermalink ( ) , qt . Equals , "/post/test0.dot/" )
2017-06-06 03:15:42 -04:00
}
} )
}
2017-03-09 13:19:29 -05:00
}
}
2018-04-27 04:17:01 -04:00
// https://github.com/gohugoio/hugo/issues/4675
func TestWordCountAndSimilarVsSummary ( t * testing . T ) {
t . Parallel ( )
2019-08-10 15:05:17 -04:00
c := qt . New ( t )
2018-04-27 04:17:01 -04:00
single := [ ] string { "_default/single.html" , `
WordCount : { { . WordCount } }
FuzzyWordCount : { { . FuzzyWordCount } }
ReadingTime : { { . ReadingTime } }
Len Plain : { { len . Plain } }
Len PlainWords : { { len . PlainWords } }
Truncated : { { . Truncated } }
Len Summary : { { len . Summary } }
Len Content : { { len . Content } }
2018-10-30 15:24:34 -04:00
SUMMARY : { { . Summary } } : { { len . Summary } } : END
2018-04-27 04:17:01 -04:00
` }
b := newTestSitesBuilder ( t )
b . WithSimpleConfigFile ( ) . WithTemplatesAdded ( single ... ) . WithContent ( "p1.md" , fmt . Sprintf ( ` -- -
title : p1
-- -
% s
` , strings . Repeat ( "word " , 510 ) ) ,
"p2.md" , fmt . Sprintf ( ` -- -
title : p2
-- -
This is a summary .
< ! -- more -- >
% s
` , strings . Repeat ( "word " , 310 ) ) ,
"p3.md" , fmt . Sprintf ( ` -- -
title : p3
isCJKLanguage : true
-- -
Summary : In Chinese , 好 means good .
< ! -- more -- >
% s
` , strings . Repeat ( "好" , 200 ) ) ,
"p4.md" , fmt . Sprintf ( ` -- -
title : p4
isCJKLanguage : false
-- -
Summary : In Chinese , 好 means good .
< ! -- more -- >
% s
` , strings . Repeat ( "好" , 200 ) ) ,
"p5.md" , fmt . Sprintf ( ` -- -
title : p4
isCJKLanguage : true
-- -
Summary : In Chinese , 好 means good .
% s
` , strings . Repeat ( "好" , 200 ) ) ,
"p6.md" , fmt . Sprintf ( ` -- -
title : p4
isCJKLanguage : false
-- -
Summary : In Chinese , 好 means good .
% s
` , strings . Repeat ( "好" , 200 ) ) ,
)
b . CreateSites ( ) . Build ( BuildCfg { } )
2019-08-10 15:05:17 -04:00
c . Assert ( len ( b . H . Sites ) , qt . Equals , 1 )
c . Assert ( len ( b . H . Sites [ 0 ] . RegularPages ( ) ) , qt . Equals , 6 )
2018-04-27 04:17:01 -04:00
b . AssertFileContent ( "public/p1/index.html" , "WordCount: 510\nFuzzyWordCount: 600\nReadingTime: 3\nLen Plain: 2550\nLen PlainWords: 510\nTruncated: false\nLen Summary: 2549\nLen Content: 2557" )
2019-11-06 14:10:47 -05:00
b . AssertFileContent ( "public/p2/index.html" , "WordCount: 314\nFuzzyWordCount: 400\nReadingTime: 2\nLen Plain: 1569\nLen PlainWords: 314\nTruncated: true\nLen Summary: 25\nLen Content: 1582" )
2018-04-27 04:17:01 -04:00
2019-11-06 14:10:47 -05:00
b . AssertFileContent ( "public/p3/index.html" , "WordCount: 206\nFuzzyWordCount: 300\nReadingTime: 1\nLen Plain: 638\nLen PlainWords: 7\nTruncated: true\nLen Summary: 43\nLen Content: 651" )
b . AssertFileContent ( "public/p4/index.html" , "WordCount: 7\nFuzzyWordCount: 100\nReadingTime: 1\nLen Plain: 638\nLen PlainWords: 7\nTruncated: true\nLen Summary: 43\nLen Content: 651" )
b . AssertFileContent ( "public/p5/index.html" , "WordCount: 206\nFuzzyWordCount: 300\nReadingTime: 1\nLen Plain: 638\nLen PlainWords: 7\nTruncated: true\nLen Summary: 229\nLen Content: 652" )
b . AssertFileContent ( "public/p6/index.html" , "WordCount: 7\nFuzzyWordCount: 100\nReadingTime: 1\nLen Plain: 638\nLen PlainWords: 7\nTruncated: false\nLen Summary: 637\nLen Content: 652" )
2018-04-27 04:17:01 -04:00
}
2022-02-22 08:42:33 -05:00
func TestScratch ( t * testing . T ) {
2018-07-06 08:12:10 -04:00
t . Parallel ( )
b := newTestSitesBuilder ( t )
b . WithSimpleConfigFile ( ) . WithTemplatesAdded ( "index.html" , `
{ { . Scratch . Set "b" "bv" } }
B : { { . Scratch . Get "b" } }
` ,
"shortcodes/scratch.html" , `
{ { . Scratch . Set "c" "cv" } }
C : { { . Scratch . Get "c" } }
` ,
)
b . WithContentAdded ( "scratchme.md" , `
-- -
title : Scratch Me !
-- -
{ { < scratch > } }
` )
b . Build ( BuildCfg { } )
b . AssertFileContent ( "public/index.html" , "B: bv" )
b . AssertFileContent ( "public/scratchme/index.html" , "C: cv" )
}
2019-07-28 06:31:32 -04:00
2022-02-22 08:42:33 -05:00
func TestScratchRebuild ( t * testing . T ) {
t . Parallel ( )
files := `
-- config . toml --
-- content / p1 . md --
-- -
title : "p1"
-- -
{ { < scratchme > } }
-- layouts / shortcodes / foo . html --
notused
-- layouts / shortcodes / scratchme . html --
{ { . Page . Scratch . Set "scratch" "foo" } }
{ { . Page . Store . Set "scratch" "bar" } }
-- layouts / _default / single . html --
{ { . Content } }
Scratch : { { . Scratch . Get "scratch" } } |
Store : { { . Store . Get "scratch" } } |
`
b := NewIntegrationTestBuilder (
IntegrationTestConfig {
T : t ,
TxtarString : files ,
Running : true ,
} ,
) . Build ( )
b . AssertFileContent ( "public/p1/index.html" , `
Scratch : foo |
Store : bar |
` )
b . EditFiles ( "layouts/shortcodes/foo.html" , "edit" )
b . Build ( )
b . AssertFileContent ( "public/p1/index.html" , `
Scratch : |
Store : bar |
` )
}
2019-07-28 06:31:32 -04:00
func TestPageParam ( t * testing . T ) {
t . Parallel ( )
b := newTestSitesBuilder ( t ) . WithConfigFile ( "toml" , `
baseURL = "https://example.org"
[ params ]
[ params . author ]
name = "Kurt Vonnegut"
` )
b . WithTemplatesAdded ( "index.html" , `
{ { $ withParam := . Site . GetPage "withparam" } }
{ { $ noParam := . Site . GetPage "noparam" } }
{ { $ withStringParam := . Site . GetPage "withstringparam" } }
Author page : { { $ withParam . Param "author.name" } }
2019-11-21 15:59:38 -05:00
Author name page string : { { $ withStringParam . Param "author.name" } } |
Author page string : { { $ withStringParam . Param "author" } } |
2019-07-28 06:31:32 -04:00
Author site config : { { $ noParam . Param "author.name" } }
` ,
)
b . WithContent ( "withparam.md" , `
++ +
title = "With Param!"
[ author ]
name = "Ernest Miller Hemingway"
++ +
` ,
"noparam.md" , `
-- -
title : "No Param!"
-- -
` , "withstringparam.md", `
++ +
title = "With string Param!"
author = "Jo Nesbø"
++ +
` )
b . Build ( BuildCfg { } )
2019-11-21 15:59:38 -05:00
b . AssertFileContent ( "public/index.html" ,
"Author page: Ernest Miller Hemingway" ,
"Author name page string: Kurt Vonnegut|" ,
"Author page string: Jo Nesbø|" ,
"Author site config: Kurt Vonnegut" )
2019-07-28 06:31:32 -04:00
}
2019-11-06 14:10:47 -05:00
func TestGoldmark ( t * testing . T ) {
t . Parallel ( )
b := newTestSitesBuilder ( t ) . WithConfigFile ( "toml" , `
baseURL = "https://example.org"
[ markup ]
defaultMarkdownHandler = "goldmark"
[ markup . goldmark ]
[ markup . goldmark . renderer ]
unsafe = false
[ markup . highlight ]
noClasses = false
` )
b . WithTemplatesAdded ( "_default/single.html" , `
Title : { { . Title } }
ToC : { { . TableOfContents } }
Content : { { . Content } }
` , "shortcodes/t.html", ` T - SHORT ` , "shortcodes/s.html", ` # # Code
{ { . Inner } }
` )
content := `
++ +
title = "A Page!"
++ +
# # Shortcode { { % t % } } in header
# # Code Fense in Shortcode
{ { % s % } }
$ $ $ bash { hl_lines = [ 1 ] }
SHORT
$ $ $
{ { % / s % } }
# # Code Fence
$ $ $ bash { hl_lines = [ 1 ] }
MARKDOWN
$ $ $
2019-12-20 14:37:47 -05:00
Link with URL as text
[ https : //google.com](https://google.com)
2019-11-06 14:10:47 -05:00
`
content = strings . ReplaceAll ( content , "$$$" , "```" )
b . WithContent ( "page.md" , content )
b . Build ( BuildCfg { } )
b . AssertFileContent ( "public/page/index.html" ,
2019-12-20 14:37:47 -05:00
` < nav id = "TableOfContents" >
< li > < a href = "#shortcode-t-short-in-header" > Shortcode T - SHORT in header < / a > < / li >
2022-02-14 07:27:17 -05:00
< code class = "language-bash" data - lang = "bash" > < span class = "line hl" > < span class = "cl" > SHORT
< code class = "language-bash" data - lang = "bash" > < span class = "line hl" > < span class = "cl" > MARKDOWN
2019-12-20 14:37:47 -05:00
< p > < a href = "https://google.com" > https : //google.com</a></p>
` )
2019-11-06 14:10:47 -05:00
}
func TestBlackfridayDefault ( t * testing . T ) {
t . Parallel ( )
b := newTestSitesBuilder ( t ) . WithConfigFile ( "toml" , `
baseURL = "https://example.org"
[ markup ]
defaultMarkdownHandler = "blackfriday"
[ markup . highlight ]
noClasses = false
[ markup . goldmark ]
[ markup . goldmark . renderer ]
unsafe = true
` )
// Use the new attribute syntax to make sure it's not Goldmark.
b . WithTemplatesAdded ( "_default/single.html" , `
Title : { { . Title } }
Content : { { . Content } }
` , "shortcodes/s.html", ` # # Code
{ { . Inner } }
` )
content := `
++ +
title = "A Page!"
++ +
# # Code Fense in Shortcode
{ { % s % } }
S :
{ { % s % } }
$ $ $ bash { hl_lines = [ 1 ] }
SHORT
$ $ $
{ { % / s % } }
{ { % / s % } }
# # Code Fence
$ $ $ bash { hl_lines = [ 1 ] }
MARKDOWN
$ $ $
`
content = strings . ReplaceAll ( content , "$$$" , "```" )
for i , ext := range [ ] string { "md" , "html" } {
b . WithContent ( fmt . Sprintf ( "page%d.%s" , i + 1 , ext ) , content )
}
b . Build ( BuildCfg { } )
// Blackfriday does not support this extended attribute syntax.
b . AssertFileContent ( "public/page1/index.html" ,
2021-07-15 10:48:39 -04:00
` <pre tabindex="0"><code class="language-bash { hl_lines=[1]}" data-lang="bash { hl_lines=[1]}">SHORT</code></pre> ` ,
` <pre tabindex="0"><code class="language-bash { hl_lines=[1]}" data-lang="bash { hl_lines=[1]}">MARKDOWN ` ,
2019-11-06 14:10:47 -05:00
)
b . AssertFileContent ( "public/page2/index.html" ,
2021-07-15 10:48:39 -04:00
` <pre tabindex="0"><code class="language-bash { hl_lines=[1]}" data-lang="bash { hl_lines=[1]}">SHORT ` ,
2019-11-06 14:10:47 -05:00
)
}
2020-10-05 14:01:52 -04:00
func TestPageCaseIssues ( t * testing . T ) {
t . Parallel ( )
b := newTestSitesBuilder ( t )
b . WithConfigFile ( "toml" , ` defaultContentLanguage = "no"
[ languages ]
[ languages . NO ]
title = "Norsk"
` )
b . WithContent ( "a/B/C/Page1.md" , "---\ntitle: Page1\n---" )
b . WithTemplates ( "index.html" , `
{ { $ p1 := site . GetPage "a/B/C/Page1" } }
Lang : { { . Lang } }
Page1 : { { $ p1 . Path } }
` )
b . Build ( BuildCfg { } )
b . AssertFileContent ( "public/index.html" , "Lang: no" , filepath . FromSlash ( "Page1: a/B/C/Page1.md" ) )
}