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
// Copyright 2018 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 (
2017-01-02 05:44:17 -05:00
"bytes"
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"
2018-03-11 13:59:11 -04:00
2014-11-06 11:52:01 -05:00
"path/filepath"
2015-01-24 06:44:35 -05:00
"reflect"
2015-07-26 09:28:56 -04:00
"sort"
2014-01-29 17:50:31 -05:00
"strings"
"testing"
"time"
2014-10-16 20:20:09 -04:00
2018-03-11 13:59:11 -04:00
"github.com/gohugoio/hugo/hugofs"
"github.com/spf13/afero"
"github.com/spf13/viper"
2017-06-13 12:42:45 -04:00
"github.com/gohugoio/hugo/deps"
"github.com/gohugoio/hugo/helpers"
2017-06-13 13:07:35 -04:00
"github.com/spf13/cast"
2015-05-27 21:19:59 -04:00
"github.com/stretchr/testify/assert"
2016-08-01 17:04:44 -04:00
"github.com/stretchr/testify/require"
2013-08-05 10:53:58 -04:00
)
2016-03-24 09:42:03 -04:00
var emptyPage = ""
2013-08-05 10:53:58 -04:00
2013-09-18 13:17:43 -04:00
const (
2017-12-29 04:16:50 -05:00
homePage = "---\ntitle: Home\n---\nHome Page Content\n"
2016-03-24 09:42:03 -04:00
simplePage = "---\ntitle: Simple\n---\nSimple Page\n"
renderNoFrontmatter = "<!doctype><html><head></head><body>This is a test</body></html>"
2018-01-24 09:21:55 -05:00
contentNoFrontmatter = "Page without front matter.\n"
2016-03-24 09:42:03 -04:00
contentWithCommentedFrontmatter = "<!--\n+++\ntitle = \"Network configuration\"\ndescription = \"Docker networking\"\nkeywords = [\"network\"]\n[menu.main]\nparent= \"smn_administrate\"\n+++\n-->\n\n# Network configuration\n\n##\nSummary"
contentWithCommentedTextFrontmatter = "<!--[metaData]>\n+++\ntitle = \"Network configuration\"\ndescription = \"Docker networking\"\nkeywords = [\"network\"]\n[menu.main]\nparent= \"smn_administrate\"\n+++\n<![end-metadata]-->\n\n# Network configuration\n\n##\nSummary"
contentWithCommentedLongFrontmatter = "<!--[metaData123456789012345678901234567890]>\n+++\ntitle = \"Network configuration\"\ndescription = \"Docker networking\"\nkeywords = [\"network\"]\n[menu.main]\nparent= \"smn_administrate\"\n+++\n<![end-metadata]-->\n\n# Network configuration\n\n##\nSummary"
contentWithCommentedLong2Frontmatter = "<!--[metaData]>\n+++\ntitle = \"Network configuration\"\ndescription = \"Docker networking\"\nkeywords = [\"network\"]\n[menu.main]\nparent= \"smn_administrate\"\n+++\n<![end-metadata123456789012345678901234567890]-->\n\n# Network configuration\n\n##\nSummary"
invalidFrontmatterShortDelim = `
2013-08-05 10:53:58 -04:00
--
title : Short delim start
-- -
Short Delim
`
2016-03-24 09:42:03 -04:00
invalidFrontmatterShortDelimEnding = `
2013-08-05 10:53:58 -04:00
-- -
title : Short delim ending
--
Short Delim
`
2016-03-24 09:42:03 -04:00
invalidFrontmatterLadingWs = `
2013-08-14 08:57:14 -04:00
2013-08-05 10:53:58 -04:00
-- -
title : Leading WS
-- -
Leading
`
2016-03-24 09:42:03 -04:00
simplePageJSON = `
2013-08-07 02:04:49 -04:00
{
"title" : "spf13-vim 3.0 release and new website" ,
"description" : "spf13-vim is a cross platform distribution of vim plugins and resources for Vim." ,
2014-09-09 16:58:02 -04:00
"tags" : [ ".vimrc" , "plugins" , "spf13-vim" , "VIm" ] ,
2013-08-07 02:04:49 -04:00
"date" : "2012-04-06" ,
"categories" : [
"Development" ,
"VIM"
] ,
2014-10-02 18:25:52 -04:00
"slug" : "-spf13-vim-3-0-release-and-new-website-"
2013-08-07 02:04:49 -04:00
}
2013-10-01 22:45:24 -04:00
Content of the file goes Here
`
2016-03-24 09:42:03 -04:00
simplePageRFC3339Date = "---\ntitle: RFC3339 Date\ndate: \"2013-05-17T16:59:30Z\"\n---\nrfc3339 content"
simplePageJSONMultiple = `
2013-08-07 02:04:49 -04:00
{
"title" : "foobar" ,
"customData" : { "foo" : "bar" } ,
"date" : "2012-08-06"
}
Some 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
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
2014-05-29 23:42:12 -04:00
`
2016-03-24 09:42:03 -04:00
simplePageWithEmbeddedScript = ` -- -
2014-05-29 23:42:12 -04:00
title : Simple
-- -
< script type = ' text / javascript ' > alert ( ' the script tags are still there , right ? ' ) ; < / script >
2013-08-21 05:37:14 -04:00
`
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
2017-01-26 14:58:25 -05:00
`
simplePageWithSummaryDelimiterOnlySummary = ` -- -
title : Simple
-- -
Summary text
< ! -- more -- >
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
2016-03-24 09:42:03 -04:00
var pageWithVariousFrontmatterTypes = ` ++ +
2013-10-24 17:31:04 -04:00
a_string = "bar"
an_integer = 1
a_float = 1.3
2014-01-28 23:24:59 -05:00
a_bool = false
2013-10-24 17:31:04 -04:00
a_date = 1979 - 05 - 27 T07 : 32 : 00 Z
2015-01-24 06:44:35 -05:00
[ a_table ]
a_key = "a_value"
2013-10-24 17:31:04 -04:00
++ +
Front Matter with various frontmatter types `
2016-03-24 09:42:03 -04:00
var pageWithCalendarYAMLFrontmatter = ` -- -
2015-07-26 09:28:56 -04:00
type : calendar
weeks :
-
start : "Jan 5"
days :
- activity : class
room : EN1000
- activity : lab
- activity : class
- activity : lab
- activity : class
-
start : "Jan 12"
days :
- activity : class
- activity : lab
- activity : class
- activity : lab
- activity : exam
-- -
Hi .
`
2016-03-24 09:42:03 -04:00
var pageWithCalendarJSONFrontmatter = ` {
2015-07-26 09:28:56 -04:00
"type" : "calendar" ,
"weeks" : [
{
"start" : "Jan 5" ,
"days" : [
{ "activity" : "class" , "room" : "EN1000" } ,
{ "activity" : "lab" } ,
{ "activity" : "class" } ,
{ "activity" : "lab" } ,
{ "activity" : "class" }
]
} ,
{
"start" : "Jan 12" ,
"days" : [
{ "activity" : "class" } ,
{ "activity" : "lab" } ,
{ "activity" : "class" } ,
{ "activity" : "lab" } ,
{ "activity" : "exam" }
]
}
]
}
Hi .
`
2016-03-24 09:42:03 -04:00
var pageWithCalendarTOMLFrontmatter = ` ++ +
2015-07-26 09:28:56 -04:00
type = "calendar"
[ [ weeks ] ]
start = "Jan 5"
[ [ weeks . days ] ]
activity = "class"
room = "EN1000"
[ [ weeks . days ] ]
activity = "lab"
[ [ weeks . days ] ]
activity = "class"
[ [ weeks . days ] ]
activity = "lab"
[ [ weeks . days ] ]
activity = "class"
[ [ weeks ] ]
start = "Jan 12"
[ [ weeks . days ] ]
activity = "class"
[ [ weeks . days ] ]
activity = "lab"
[ [ weeks . days ] ]
activity = "class"
[ [ weeks . days ] ]
activity = "lab"
[ [ weeks . days ] ]
activity = "exam"
++ +
Hi .
`
2013-08-05 10:53:58 -04:00
func checkError ( t * testing . T , err error , expected string ) {
2014-01-29 17:50:31 -05:00
if err == nil {
t . Fatalf ( "err is nil. Expected: %s" , expected )
}
2018-04-17 04:28:32 -04:00
if ! strings . Contains ( err . Error ( ) , expected ) {
2014-01-29 17:50:31 -05:00
t . Errorf ( "err.Error() returned: '%s'. Expected: '%s'" , err . Error ( ) , expected )
}
2013-08-05 10:53:58 -04:00
}
func TestDegenerateEmptyPageZeroLengthName ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
s := newTestSite ( t )
_ , err := s . NewPage ( "" )
2014-01-29 17:50:31 -05:00
if err == nil {
t . Fatalf ( "A zero length page name must return an error" )
}
2013-08-05 10:53:58 -04:00
2014-01-29 17:50:31 -05:00
checkError ( t , err , "Zero length page name" )
2013-08-05 10:53:58 -04:00
}
func TestDegenerateEmptyPage ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
s := newTestSite ( t )
_ , err := s . NewPageFrom ( strings . NewReader ( emptyPage ) , "test" )
2014-01-29 17:50:31 -05:00
if err != nil {
t . Fatalf ( "Empty files should not trigger an error. Should be able to touch a file while watching without erroring out." )
}
2013-08-05 10:53:58 -04:00
}
func checkPageTitle ( t * testing . T , page * Page , title string ) {
2018-01-15 14:40:39 -05:00
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
}
2016-08-01 17:04:44 -04:00
func checkPageContent ( t * testing . T , page * Page , content string , msg ... interface { } ) {
a := normalizeContent ( content )
2018-04-19 12:06:40 -04:00
b := normalizeContent ( string ( page . content ( ) ) )
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 )
}
2014-01-28 23:09:24 -05:00
func checkPageTOC ( t * testing . T , page * Page , toc string ) {
2014-01-29 17:50:31 -05:00
if page . TableOfContents != template . HTML ( toc ) {
t . Fatalf ( "Page TableOfContents is: %q.\nExpected %q" , page . TableOfContents , toc )
}
2013-08-05 10:53:58 -04:00
}
2016-08-01 17:04:44 -04:00
func checkPageSummary ( t * testing . T , page * Page , summary string , msg ... interface { } ) {
2018-04-19 12:06:40 -04: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
}
2013-08-05 10:53:58 -04:00
func checkPageType ( t * testing . T , page * Page , pageType string ) {
2014-01-29 17:50:31 -05:00
if page . Type ( ) != pageType {
t . Fatalf ( "Page type is: %s. Expected: %s" , page . Type ( ) , pageType )
}
2013-08-05 10:53:58 -04:00
}
2013-09-03 17:51:06 -04:00
func checkPageDate ( t * testing . T , page * Page , time time . Time ) {
2014-01-29 17:50:31 -05:00
if page . Date != time {
t . Fatalf ( "Page date is: %s. Expected: %s" , page . Date , time )
}
2013-09-03 17:51:06 -04:00
}
2013-11-10 15:04:51 -05:00
func checkTruncation ( t * testing . T , page * Page , shouldBe bool , msg string ) {
2018-04-23 23:57:33 -04:00
if page . Summary ( ) == "" {
2014-01-29 17:50:31 -05:00
t . Fatal ( "page has no summary, can not check truncation" )
}
2018-04-19 12:06:40 -04:00
if page . truncated != shouldBe {
2014-01-29 17:50:31 -05:00
if shouldBe {
t . Fatalf ( "page wasn't truncated: %s" , msg )
} else {
t . Fatalf ( "page was truncated: %s" , msg )
}
}
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 )
}
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 ,
2016-10-28 03:34:47 -04:00
assertFunc func ( t * testing . T , ext string , pages Pages ) , settings map [ string ] interface { } , pageSources ... string ) {
2016-08-01 17:04:44 -04:00
engines := [ ] struct {
ext string
shouldExecute func ( ) bool
} {
{ "md" , func ( ) bool { return true } } ,
{ "mmark" , func ( ) bool { return true } } ,
2017-11-30 06:15:52 -05:00
{ "ad" , func ( ) bool { return helpers . HasAsciidoc ( ) } } ,
2016-08-01 17:04:44 -04:00
// TODO(bep) figure a way to include this without too much work.{"html", func() bool { return true }},
{ "rst" , func ( ) bool { return helpers . HasRst ( ) } } ,
}
for _ , e := range engines {
if ! e . shouldExecute ( ) {
continue
}
2017-02-04 22:20:06 -05:00
cfg , fs := newTestCfg ( )
2017-01-10 04:55:03 -05:00
2016-10-28 03:34:47 -04:00
if settings != nil {
for k , v := range settings {
2017-02-04 22:20:06 -05:00
cfg . Set ( k , v )
2016-10-28 03:34:47 -04:00
}
}
contentDir := "content"
2017-02-04 22:20:06 -05:00
if s := cfg . GetString ( "contentDir" ) ; s != "" {
2016-10-28 03:34:47 -04:00
contentDir = s
}
var fileSourcePairs [ ] string
2016-10-18 02:43:44 -04:00
for i , source := range pageSources {
2016-10-28 03:34:47 -04:00
fileSourcePairs = append ( fileSourcePairs , fmt . Sprintf ( "p%d.%s" , i , e . ext ) , source )
2016-10-18 02:43:44 -04:00
}
2016-08-01 17:04:44 -04:00
2016-10-28 03:34:47 -04:00
for i := 0 ; i < len ( fileSourcePairs ) ; i += 2 {
2017-01-10 04:55:03 -05:00
writeSource ( t , fs , filepath . Join ( contentDir , fileSourcePairs [ i ] ) , fileSourcePairs [ i + 1 ] )
2016-10-28 03:34:47 -04:00
}
2017-12-29 04:16:50 -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 )
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
2016-11-13 08:27:10 -05:00
require . Len ( t , s . RegularPages , len ( pageSources ) )
2016-08-01 17:04:44 -04:00
2016-11-13 08:27:10 -05:00
assertFunc ( t , e . ext , s . RegularPages )
2016-08-01 17:04:44 -04:00
2017-12-29 04:16:50 -05:00
home , err := s . Info . Home ( )
require . NoError ( t , err )
require . NotNil ( t , home )
require . Equal ( t , homePath , home . Path ( ) )
2018-04-19 12:06:40 -04:00
require . Contains ( t , home . content ( ) , "Home Page Content" )
2017-12-29 04:16:50 -05:00
2016-08-01 17:04:44 -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 ( )
2016-10-18 02:43:44 -04:00
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
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.
require . Equal ( t , filepath . FromSlash ( fmt . Sprintf ( "p0.%s" , ext ) ) , p . Path ( ) )
2016-10-30 12:59:24 -04:00
assert . False ( t , p . IsHome ( ) )
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" )
checkPageType ( t , p , "page" )
checkTruncation ( t , p , false , "simple short page" )
2014-01-29 17:50:31 -05:00
}
2015-05-27 21:19:59 -04:00
2016-10-28 04:35:19 -04:00
settings := map [ string ] interface { } {
"contentDir" : "mycontent" ,
}
testAllMarkdownEnginesForPages ( t , assertFunc , settings , simplePage )
2016-08-01 17:04:44 -04:00
}
func TestSplitSummaryAndContent ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2016-08-01 17:04:44 -04:00
for i , this := range [ ] struct {
2017-01-26 14:58:25 -05:00
markup string
content string
expectedSummary string
expectedContent string
2016-08-01 17:04:44 -04:00
} {
{ "markdown" , ` < p > Summary Same LineHUGOMORE42 < / p >
2017-01-26 14:58:25 -05:00
< p > Some more text < / p > ` , "<p>Summary Same Line</p>" , "<p>Summary Same Line</p>\n\n<p>Some more text</p>" } ,
2016-08-01 17:04:44 -04:00
{ "asciidoc" , ` <div class="paragraph"><p>sn</p></div><div class="paragraph"><p>HUGOMORE42Some more text</p></div> ` ,
"<div class=\"paragraph\"><p>sn</p></div>" ,
2017-01-26 14:58:25 -05:00
"<div class=\"paragraph\"><p>sn</p></div><div class=\"paragraph\"><p>Some more text</p></div>" } ,
2016-08-01 17:04:44 -04:00
{ "rst" ,
"<div class=\"document\"><p>Summary Next Line</p><p>HUGOMORE42Some more text</p></div>" ,
"<div class=\"document\"><p>Summary Next Line</p></div>" ,
2017-01-26 14:58:25 -05:00
"<div class=\"document\"><p>Summary Next Line</p><p>Some more text</p></div>" } ,
{ "markdown" , "<p>a</p><p>b</p><p>HUGOMORE42c</p>" , "<p>a</p><p>b</p>" , "<p>a</p><p>b</p><p>c</p>" } ,
{ "markdown" , "<p>a</p><p>b</p><p>cHUGOMORE42</p>" , "<p>a</p><p>b</p><p>c</p>" , "<p>a</p><p>b</p><p>c</p>" } ,
{ "markdown" , "<p>a</p><p>bHUGOMORE42</p><p>c</p>" , "<p>a</p><p>b</p>" , "<p>a</p><p>b</p><p>c</p>" } ,
{ "markdown" , "<p>aHUGOMORE42</p><p>b</p><p>c</p>" , "<p>a</p>" , "<p>a</p><p>b</p><p>c</p>" } ,
{ "markdown" , " HUGOMORE42 " , "" , "" } ,
{ "markdown" , "HUGOMORE42" , "" , "" } ,
{ "markdown" , "<p>HUGOMORE42" , "<p>" , "<p>" } ,
{ "markdown" , "HUGOMORE42<p>" , "" , "<p>" } ,
{ "markdown" , "\n\n<p>HUGOMORE42</p>\n" , "<p></p>" , "<p></p>" } ,
2016-10-18 02:43:44 -04:00
// Issue #2586
// Note: Hugo will not split mid-sentence but will look for the closest
// paragraph end marker. This may be a change from Hugo 0.16, but it makes sense.
{ "markdown" , ` <p>this is an example HUGOMORE42of the issue.</p> ` ,
"<p>this is an example of the issue.</p>" ,
2017-01-26 14:58:25 -05:00
"<p>this is an example of the issue.</p>" } ,
2016-10-18 02:43:44 -04:00
// Issue: #2538
{ "markdown" , fmt . Sprintf ( ` < p class = "lead" > % s < / p > HUGOMORE42 < p > % s < / p >
` ,
strings . Repeat ( "A" , 10 ) , strings . Repeat ( "B" , 31 ) ) ,
fmt . Sprintf ( ` <p class="lead">%s</p> ` , strings . Repeat ( "A" , 10 ) ) ,
fmt . Sprintf ( ` <p class="lead">%s</p><p>%s</p> ` , strings . Repeat ( "A" , 10 ) , strings . Repeat ( "B" , 31 ) ) ,
} ,
2016-08-01 17:04:44 -04:00
} {
2016-10-18 02:43:44 -04:00
sc , err := splitUserDefinedSummaryAndContent ( this . markup , [ ] byte ( this . content ) )
2016-08-01 17:04:44 -04:00
2016-10-18 02:43:44 -04:00
require . NoError ( t , err )
2016-08-01 17:04:44 -04:00
require . NotNil ( t , sc , fmt . Sprintf ( "[%d] Nil %s" , i , this . markup ) )
require . Equal ( t , this . expectedSummary , string ( sc . summary ) , fmt . Sprintf ( "[%d] Summary markup %s" , i , this . markup ) )
require . Equal ( t , this . expectedContent , string ( sc . content ) , fmt . Sprintf ( "[%d] Content markup %s" , i , this . markup ) )
}
2013-08-21 05:37:14 -04:00
}
func TestPageWithDelimiter ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2016-10-18 02:43:44 -04:00
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
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 )
checkPageType ( t , p , "page" )
checkTruncation ( t , p , true , "page with summary delimiter" )
}
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages ( t , assertFunc , nil , simplePageWithSummaryDelimiter )
2016-08-01 17:04:44 -04:00
}
// Issue #1076
func TestPageWithDelimiterForMarkdownThatCrossesBorder ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
cfg , fs := newTestCfg ( )
2017-01-10 04:55:03 -05:00
writeSource ( t , fs , filepath . Join ( "content" , "simple.md" ) , simplePageWithSummaryDelimiterAndMarkdownThatCrossesBorder )
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
2016-11-13 08:27:10 -05:00
require . Len ( t , s . RegularPages , 1 )
2016-08-01 17:04:44 -04:00
2016-11-13 08:27:10 -05:00
p := s . RegularPages [ 0 ]
2016-08-01 17:04:44 -04:00
2018-04-23 23:57:33 -04:00
if p . Summary ( ) != template . HTML ( "<p>The <a href=\"http://gohugo.io/\">best static site generator</a>.<sup class=\"footnote-ref\" id=\"fnref:1\"><a href=\"#fn:1\">1</a></sup>\n</p>" ) {
t . Fatalf ( "Got summary:\n%q" , p . Summary ( ) )
2016-08-01 17:04:44 -04:00
}
2018-04-19 12:06:40 -04:00
if p . content ( ) != template . HTML ( "<p>The <a href=\"http://gohugo.io/\">best static site generator</a>.<sup class=\"footnote-ref\" id=\"fnref:1\"><a href=\"#fn:1\">1</a></sup>\n</p>\n<div class=\"footnotes\">\n\n<hr />\n\n<ol>\n<li id=\"fn:1\">Many people say so.\n <a class=\"footnote-return\" href=\"#fnref:1\"><sup>[return]</sup></a></li>\n</ol>\n</div>" ) {
t . Fatalf ( "Got content:\n%q" , p . content ( ) )
2014-01-29 17:50:31 -05:00
}
2013-10-04 12:28:28 -04:00
}
2013-09-01 00:07:22 -04:00
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 ) {
assert := require . New ( t )
pageWithDate := ` -- -
title : P % d
weight : % d
% s : 2017 - 10 - 13
-- -
Simple Page With Some Date `
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
hasDate := func ( p * 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 ( )
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
assert . True ( len ( pages ) > 0 )
for _ , p := range pages {
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
assert . True ( hasDate ( p ) )
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
func TestPageRawContent ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
cfg , fs := newTestCfg ( )
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
require . Len ( t , s . RegularPages , 1 )
p := s . RegularPages [ 0 ]
require . Contains ( t , p . RawContent ( ) , "**Raw**" )
}
2013-10-04 12:28:28 -04:00
func TestPageWithShortCodeInSummary ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2016-10-18 02:43:44 -04:00
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
p := pages [ 0 ]
2016-08-01 17:04:44 -04:00
checkPageTitle ( t , p , "Simple" )
2018-02-05 14:06:29 -05:00
checkPageContent ( t , p , normalizeExpected ( ext , "<p>Summary Next Line. \n<figure>\n \n <img src=\"/not/real\" />\n \n \n</figure>\n.\nMore text here.</p>\n\n<p>Some more text</p>\n" ) )
2016-08-17 07:41:48 -04:00
checkPageSummary ( t , p , "Summary Next Line. . More text here. Some more text" )
2016-08-01 17:04:44 -04: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
}
2014-05-29 23:42:12 -04:00
func TestPageWithEmbeddedScriptTag ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2016-10-18 02:43:44 -04:00
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
p := pages [ 0 ]
2016-08-01 17:04:44 -04:00
if ext == "ad" || ext == "rst" {
// TOD(bep)
return
}
checkPageContent ( t , p , "<script type='text/javascript'>alert('the script tags are still there, right?');</script>\n" , ext )
2014-05-29 23:42:12 -04:00
}
2016-08-01 17:04:44 -04:00
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages ( t , assertFunc , nil , simplePageWithEmbeddedScript )
2014-05-29 23:42:12 -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 ( )
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
2016-11-13 08:27:10 -05:00
require . Len ( t , s . RegularPages , 1 )
2016-08-01 17:04:44 -04:00
2016-11-13 08:27:10 -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 ) {
2016-08-01 17:04:44 -04:00
2017-02-04 22:20:06 -05:00
cfg , fs := newTestCfg ( )
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
2016-11-13 08:27:10 -05:00
require . Len ( t , s . RegularPages , 1 )
2016-08-01 17:04:44 -04:00
2016-11-13 08:27:10 -05:00
p := s . RegularPages [ 0 ]
2016-08-01 17:04:44 -04:00
2016-04-12 13:18:02 -04:00
checkPageContent ( t , p , "\n\n<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>\n\n<h2 id=\"aa\">AA</h2>\n\n<p>I have no idea, of course, how long it took me to reach the limit of the plain,\nbut at last I entered the foothills, following a pretty little canyon upward\ntoward the mountains. Beside me frolicked a laughing brooklet, hurrying upon\nits noisy way down to the silent sea. In its quieter pools I discovered many\nsmall fish, of four-or five-pound weight I should imagine. In appearance,\nexcept as to size and color, they were not unlike the whale of our own seas. As\nI watched them playing about I discovered, not only that they suckled their\nyoung, but that at intervals they rose to the surface to breathe as well as to\nfeed upon certain grasses and a strange, scarlet lichen which grew upon the\nrocks just above the water line.</p>\n\n<h3 id=\"aaa\">AAA</h3>\n\n<p>I remember I felt an extraordinary persuasion that I was being played with,\nthat presently, when I was upon the very verge of safety, this mysterious\ndeath–as swift as the passage of light–would leap after me from the pit about\nthe cylinder and strike me down. ## BB</p>\n\n<h3 id=\"bbb\">BBB</h3>\n\n<p>“You’re a great Granser,” he cried delightedly, “always making believe them little marks mean something.”</p>\n" )
checkPageTOC ( t , p , "<nav id=\"TableOfContents\">\n<ul>\n<li>\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></li>\n</ul></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 ( )
2016-10-18 02:43:44 -04:00
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
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>" ) )
checkPageType ( t , p , "page" )
2016-10-18 02:43:44 -04:00
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-01-26 14:58:25 -05:00
func TestPageWithMoreTagOnlySummary ( t * testing . T ) {
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
p := pages [ 0 ]
checkTruncation ( t , p , false , "page with summary delimiter at end" )
}
testAllMarkdownEnginesForPages ( t , assertFunc , nil , simplePageWithSummaryDelimiterOnlySummary )
}
2017-06-28 14:30:26 -04:00
// #2973
func TestSummaryWithHTMLTagsOnNextLine ( t * testing . T ) {
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
p := pages [ 0 ]
2018-04-23 23:57:33 -04:00
require . Contains ( t , p . Summary ( ) , "Happy new year everyone!" )
require . NotContains ( t , p . Summary ( ) , "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 >
` )
}
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 ( )
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
2016-11-13 08:27:10 -05:00
require . Len ( t , s . RegularPages , 1 )
2016-08-01 17:04:44 -04:00
2016-11-13 08:27:10 -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 ) {
assrt := require . New ( t )
// We need to use the OS fs for this.
cfg := viper . New ( )
fs := hugofs . NewFrom ( hugofs . Os , cfg )
fs . Destination = & afero . MemMapFs { }
cfg . Set ( "frontmatter" , map [ string ] interface { } {
"lastmod" : [ ] string { ":git" , "lastmod" } ,
} )
2018-08-11 10:37:00 -04:00
cfg . Set ( "defaultContentLanguage" , "en" )
2018-03-11 13:59:11 -04:00
2018-08-11 10:37:00 -04:00
langConfig := map [ string ] interface { } {
"en" : map [ string ] interface { } {
"weight" : 1 ,
"languageName" : "English" ,
"contentDir" : "content" ,
} ,
"nn" : map [ string ] interface { } {
"weight" : 2 ,
"languageName" : "Nynorsk" ,
"contentDir" : "content_nn" ,
} ,
}
cfg . Set ( "languages" , langConfig )
2018-03-11 13:59:11 -04:00
cfg . Set ( "enableGitInfo" , true )
assrt . NoError ( loadDefaultSettingsFor ( cfg ) )
2018-08-11 10:37:00 -04:00
assrt . NoError ( loadLanguageSettings ( cfg , nil ) )
2018-03-11 13:59:11 -04:00
wd , err := os . Getwd ( )
assrt . NoError ( err )
cfg . Set ( "workingDir" , filepath . Join ( wd , "testsite" ) )
2018-08-11 10:37:00 -04:00
h , err := NewHugoSites ( deps . DepsCfg { Fs : fs , Cfg : cfg } )
2018-03-11 13:59:11 -04:00
2018-08-11 10:37:00 -04:00
assrt . NoError ( err )
assrt . Len ( h . Sites , 2 )
require . NoError ( t , h . Build ( BuildCfg { SkipRender : true } ) )
enSite := h . Sites [ 0 ]
assrt . Len ( enSite . RegularPages , 1 )
2018-03-11 16:17:41 -04:00
// 2018-03-11 is the Git author date for testsite/content/first-post.md
2018-08-11 10:37:00 -04:00
assrt . Equal ( "2018-03-11" , enSite . RegularPages [ 0 ] . Lastmod . Format ( "2006-01-02" ) )
nnSite := h . Sites [ 1 ]
assrt . Len ( nnSite . RegularPages , 1 )
// 2018-08-11 is the Git author date for testsite/content_nn/first-post.md
assrt . Equal ( "2018-08-11" , nnSite . RegularPages [ 0 ] . Lastmod . Format ( "2006-01-02" ) )
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 ) {
t . Parallel ( )
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
for _ , dateHandler := range [ ] string { ":filename" , ":fileModTime" } {
t . Run ( fmt . Sprintf ( "dateHandler=%q" , dateHandler ) , func ( t * testing . T ) {
assrt := require . New ( t )
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
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 . Set ( "frontmatter" , map [ string ] interface { } {
"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 )
assrt . NoError ( err )
c2fi , err := fs . Source . Stat ( c2 )
assrt . NoError ( err )
2018-01-25 22:54:15 -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
s := buildSingleSite ( t , deps . DepsCfg { Fs : fs , Cfg : cfg } , BuildCfg { SkipRender : true } )
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
assrt . Len ( s . RegularPages , 2 )
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
noSlug := s . RegularPages [ 0 ]
slug := s . RegularPages [ 1 ]
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
assrt . Equal ( 28 , noSlug . Lastmod . Day ( ) )
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" :
assrt . False ( noSlug . Date . IsZero ( ) )
assrt . False ( slug . Date . IsZero ( ) )
assrt . Equal ( 2012 , noSlug . Date . Year ( ) )
assrt . Equal ( 2012 , slug . Date . Year ( ) )
assrt . Equal ( "noslug" , noSlug . Slug )
assrt . Equal ( "aslug" , slug . Slug )
case ":filemodtime" :
assrt . Equal ( c1fi . ModTime ( ) . Year ( ) , noSlug . Date . Year ( ) )
assrt . Equal ( c2fi . ModTime ( ) . Year ( ) , slug . Date . Year ( ) )
fallthrough
default :
assrt . Equal ( "" , noSlug . Slug )
assrt . Equal ( "aslug" , slug . Slug )
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 ( )
2016-10-18 02:43:44 -04:00
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
p := pages [ 0 ]
2016-08-17 07:41:48 -04:00
if p . WordCount ( ) != 8 {
t . Fatalf ( "[%s] incorrect word count for content '%s'. expected %v, got %v" , ext , p . plain , 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
}
func TestWordCountWithAllCJKRunesHasCJKLanguage ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2016-10-28 03:34:47 -04:00
settings := map [ string ] interface { } { "hasCJKLanguage" : true }
2015-09-03 06:22:20 -04:00
2016-10-18 02:43:44 -04:00
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
p := pages [ 0 ]
2016-08-17 07:41:48 -04:00
if p . WordCount ( ) != 15 {
t . Fatalf ( "[%s] incorrect word count for content '%s'. expected %v, got %v" , ext , p . plain , 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
}
func TestWordCountWithMainEnglishWithCJKRunes ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2016-10-28 03:34:47 -04:00
settings := map [ string ] interface { } { "hasCJKLanguage" : true }
2015-09-03 06:22:20 -04:00
2016-10-18 02:43:44 -04:00
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
p := pages [ 0 ]
2016-08-17 07:41:48 -04:00
if p . WordCount ( ) != 74 {
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-07-12 05:05:37 -04:00
2018-04-19 12:06:40 -04:00
if p . summary != simplePageWithMainEnglishWithCJKRunesSummary {
2016-08-01 17:04:44 -04:00
t . Fatalf ( "[%s] incorrect Summary for content '%s'. expected %v, got %v" , ext , p . plain ,
2018-04-19 12:06:40 -04:00
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 ( )
settings := map [ string ] interface { } {
"hasCJKLanguage" : true ,
}
2015-09-03 06:22:20 -04:00
2016-10-18 02:43:44 -04:00
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
p := pages [ 0 ]
2016-08-17 07:41:48 -04:00
if p . WordCount ( ) != 75 {
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
2018-04-19 12:06:40 -04:00
if p . summary != simplePageWithIsCJKLanguageFalseSummary {
2016-08-01 17:04:44 -04:00
t . Fatalf ( "[%s] incorrect Summary for content '%s'. expected %v, got %v" , ext , p . plain ,
2018-04-19 12:06:40 -04:00
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 )
2016-08-01 17:04:44 -04:00
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 ( )
2016-10-18 02:43:44 -04:00
assertFunc := func ( t * testing . T , ext string , pages Pages ) {
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 {
t . Fatalf ( "[%s] incorrect word count. expected %v, got %v" , ext , 500 , p . WordCount ( ) )
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-08-01 17:04:44 -04:00
checkTruncation ( t , p , true , "long page" )
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
}
2013-08-07 02:04:49 -04:00
func TestCreatePage ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2014-01-29 17:50:31 -05:00
var tests = [ ] struct {
r string
} {
2016-03-24 09:42:03 -04:00
{ simplePageJSON } ,
{ simplePageJSONMultiple } ,
2014-01-29 17:50:31 -05:00
//{strings.NewReader(SIMPLE_PAGE_JSON_COMPACT)},
}
2017-06-19 10:45:52 -04:00
for i , test := range tests {
2017-02-04 22:20:06 -05:00
s := newTestSite ( t )
p , _ := s . NewPage ( "page" )
2015-04-03 15:41:12 -04:00
if _ , err := p . ReadFrom ( strings . NewReader ( test . r ) ) ; err != nil {
2017-06-19 10:45:52 -04:00
t . Fatalf ( "[%d] Unable to parse page: %s" , i , err )
2014-01-29 17:50:31 -05:00
}
}
2013-08-07 02:04:49 -04:00
}
2013-08-05 10:53:58 -04:00
func TestDegenerateInvalidFrontMatterShortDelim ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2014-01-29 17:50:31 -05:00
var tests = [ ] struct {
r string
err string
} {
2016-03-24 09:42:03 -04:00
{ invalidFrontmatterShortDelimEnding , "unable to read frontmatter at filepos 45: EOF" } ,
2014-01-29 17:50:31 -05:00
}
for _ , test := range tests {
2017-02-04 22:20:06 -05:00
s := newTestSite ( t )
p , _ := s . NewPage ( "invalid/front/matter/short/delim" )
2015-04-03 15:41:12 -04:00
_ , err := p . ReadFrom ( strings . NewReader ( test . r ) )
2014-01-29 17:50:31 -05:00
checkError ( t , err , test . err )
}
2013-08-05 10:53:58 -04:00
}
2013-09-18 13:17:43 -04:00
func TestShouldRenderContent ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2014-01-29 17:50:31 -05:00
var tests = [ ] struct {
text string
render bool
} {
2018-01-24 09:21:55 -05:00
{ contentNoFrontmatter , true } ,
2014-01-29 17:50:31 -05:00
// TODO how to deal with malformed frontmatter. In this case it'll be rendered as markdown.
2016-03-24 09:42:03 -04:00
{ invalidFrontmatterShortDelim , true } ,
{ renderNoFrontmatter , false } ,
{ contentWithCommentedFrontmatter , true } ,
{ contentWithCommentedTextFrontmatter , true } ,
{ contentWithCommentedLongFrontmatter , false } ,
{ contentWithCommentedLong2Frontmatter , true } ,
2014-01-29 17:50:31 -05:00
}
for _ , test := range tests {
2017-02-04 22:20:06 -05:00
s := newTestSite ( t )
p , _ := s . NewPage ( "render/front/matter" )
2015-04-03 15:41:12 -04:00
_ , err := p . ReadFrom ( strings . NewReader ( test . text ) )
2014-05-01 14:11:56 -04:00
p = pageMust ( p , err )
2014-01-29 17:50:31 -05:00
if p . IsRenderable ( ) != test . render {
t . Errorf ( "expected p.IsRenderable() == %t, got %t" , test . render , p . IsRenderable ( ) )
}
}
2013-09-18 13:17:43 -04:00
}
2015-07-26 09:28:56 -04:00
// Issue #768
func TestCalendarParamsVariants ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
s := newTestSite ( t )
pageJSON , _ := s . NewPage ( "test/fileJSON.md" )
2016-03-24 09:42:03 -04:00
_ , _ = pageJSON . ReadFrom ( strings . NewReader ( pageWithCalendarJSONFrontmatter ) )
2015-07-26 09:28:56 -04:00
2017-02-04 22:20:06 -05:00
pageYAML , _ := s . NewPage ( "test/fileYAML.md" )
2016-03-24 09:42:03 -04:00
_ , _ = pageYAML . ReadFrom ( strings . NewReader ( pageWithCalendarYAMLFrontmatter ) )
2015-07-26 09:28:56 -04:00
2017-02-04 22:20:06 -05:00
pageTOML , _ := s . NewPage ( "test/fileTOML.md" )
2016-03-24 09:42:03 -04:00
_ , _ = pageTOML . ReadFrom ( strings . NewReader ( pageWithCalendarTOMLFrontmatter ) )
2015-07-26 09:28:56 -04:00
2018-01-15 14:40:39 -05:00
assert . True ( t , compareObjects ( pageJSON . params , pageYAML . params ) )
assert . True ( t , compareObjects ( pageJSON . params , pageTOML . params ) )
2015-07-26 09:28:56 -04:00
}
2013-10-24 17:31:04 -04:00
func TestDifferentFrontMatterVarTypes ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
s := newTestSite ( t )
page , _ := s . NewPage ( "test/file1.md" )
2016-03-24 09:42:03 -04:00
_ , _ = page . ReadFrom ( strings . NewReader ( pageWithVariousFrontmatterTypes ) )
2014-01-29 17:50:31 -05:00
dateval , _ := time . Parse ( time . RFC3339 , "1979-05-27T07:32:00Z" )
2017-12-29 02:58:38 -05:00
if page . getParamToLower ( "a_string" ) != "bar" {
t . Errorf ( "frontmatter not handling strings correctly should be %s, got: %s" , "bar" , page . getParamToLower ( "a_string" ) )
2014-01-29 17:50:31 -05:00
}
2017-12-29 02:58:38 -05:00
if page . getParamToLower ( "an_integer" ) != 1 {
t . Errorf ( "frontmatter not handling ints correctly should be %s, got: %s" , "1" , page . getParamToLower ( "an_integer" ) )
2014-01-29 17:50:31 -05:00
}
2017-12-29 02:58:38 -05:00
if page . getParamToLower ( "a_float" ) != 1.3 {
t . Errorf ( "frontmatter not handling floats correctly should be %f, got: %s" , 1.3 , page . getParamToLower ( "a_float" ) )
2014-01-29 17:50:31 -05:00
}
2017-12-29 02:58:38 -05:00
if page . getParamToLower ( "a_bool" ) != false {
t . Errorf ( "frontmatter not handling bools correctly should be %t, got: %s" , false , page . getParamToLower ( "a_bool" ) )
2014-01-29 17:50:31 -05:00
}
2017-12-29 02:58:38 -05:00
if page . getParamToLower ( "a_date" ) != dateval {
t . Errorf ( "frontmatter not handling dates correctly should be %s, got: %s" , dateval , page . getParamToLower ( "a_date" ) )
2014-01-29 17:50:31 -05:00
}
2017-12-29 02:58:38 -05:00
param := page . getParamToLower ( "a_table" )
2015-01-24 06:44:35 -05:00
if param == nil {
2018-01-15 14:40:39 -05:00
t . Errorf ( "frontmatter not handling tables correctly should be type of %v, got: type of %v" , reflect . TypeOf ( page . params [ "a_table" ] ) , reflect . TypeOf ( param ) )
2015-01-24 06:44:35 -05:00
}
if cast . ToStringMap ( param ) [ "a_key" ] != "a_value" {
2018-01-15 14:40:39 -05:00
t . Errorf ( "frontmatter not handling values inside a table correctly should be %s, got: %s" , "a_value" , cast . ToStringMap ( page . params [ "a_table" ] ) [ "a_key" ] )
2015-01-24 06:44:35 -05:00
}
2013-10-24 17:31:04 -04:00
}
2013-08-05 10:53:58 -04:00
func TestDegenerateInvalidFrontMatterLeadingWhitespace ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
s := newTestSite ( t )
p , _ := s . NewPage ( "invalid/front/matter/leading/ws" )
2016-03-24 09:42:03 -04:00
_ , err := p . ReadFrom ( strings . NewReader ( invalidFrontmatterLadingWs ) )
2014-01-29 17:50:31 -05:00
if err != nil {
t . Fatalf ( "Unable to parse front matter given leading whitespace: %s" , err )
}
2013-08-05 10:53:58 -04:00
}
2013-08-14 18:22:57 -04:00
2013-08-30 20:14:36 -04:00
func TestSectionEvaluation ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
s := newTestSite ( t )
page , _ := s . NewPage ( filepath . FromSlash ( "blue/file1.md" ) )
2016-03-24 09:42:03 -04:00
page . ReadFrom ( strings . NewReader ( simplePage ) )
2014-10-16 20:20:09 -04:00
if page . Section ( ) != "blue" {
2014-12-07 13:48:00 -05:00
t . Errorf ( "Section should be %s, got: %s" , "blue" , page . Section ( ) )
2014-01-29 17:50:31 -05:00
}
2013-08-30 20:14:36 -04:00
}
2014-09-09 16:58:02 -04:00
func TestSliceToLower ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2014-10-02 18:25:52 -04:00
tests := [ ] struct {
value [ ] string
2014-09-09 16:58:02 -04:00
expected [ ] string
} {
2014-10-02 18:25:52 -04:00
{ [ ] string { "a" , "b" , "c" } , [ ] string { "a" , "b" , "c" } } ,
{ [ ] string { "a" , "B" , "c" } , [ ] string { "a" , "b" , "c" } } ,
{ [ ] string { "A" , "B" , "C" } , [ ] string { "a" , "b" , "c" } } ,
2014-09-09 16:58:02 -04:00
}
for _ , test := range tests {
2014-10-16 20:20:09 -04:00
res := helpers . SliceToLower ( test . value )
2014-09-09 16:58:02 -04:00
for i , val := range res {
if val != test . expected [ i ] {
t . Errorf ( "Case mismatch. Expected %s, got %s" , test . expected [ i ] , res [ i ] )
}
}
}
}
2017-08-14 02:42:30 -04:00
func TestReplaceDivider ( t * testing . T ) {
t . Parallel ( )
tests := [ ] struct {
content string
from string
to string
expectedContent string
expectedTruncated bool
} {
{ "none" , "a" , "b" , "none" , false } ,
2017-08-14 03:24:38 -04:00
{ "summary <!--more--> content" , "<!--more-->" , "HUGO" , "summary HUGO content" , true } ,
2017-08-14 02:42:30 -04:00
{ "summary\n\ndivider" , "divider" , "HUGO" , "summary\n\nHUGO" , false } ,
{ "summary\n\ndivider\n\r" , "divider" , "HUGO" , "summary\n\nHUGO\n\r" , false } ,
}
for i , test := range tests {
replaced , truncated := replaceDivider ( [ ] byte ( test . content ) , [ ] byte ( test . from ) , [ ] byte ( test . to ) )
if truncated != test . expectedTruncated {
t . Fatalf ( "[%d] Expected truncated to be %t, was %t" , i , test . expectedTruncated , truncated )
}
if string ( replaced ) != test . expectedContent {
t . Fatalf ( "[%d] Expected content to be %q, was %q" , i , test . expectedContent , replaced )
}
}
}
func BenchmarkReplaceDivider ( b * testing . B ) {
divider := "HUGO_DIVIDER"
from , to := [ ] byte ( divider ) , [ ] byte ( "HUGO_REPLACED" )
withDivider := make ( [ ] [ ] byte , b . N )
noDivider := make ( [ ] [ ] byte , b . N )
for i := 0 ; i < b . N ; i ++ {
withDivider [ i ] = [ ] byte ( strings . Repeat ( "Summary " , 5 ) + "\n" + divider + "\n" + strings . Repeat ( "Word " , 300 ) )
noDivider [ i ] = [ ] byte ( strings . Repeat ( "Word " , 300 ) )
}
b . ResetTimer ( )
for i := 0 ; i < b . N ; i ++ {
_ , t1 := replaceDivider ( withDivider [ i ] , from , to )
_ , t2 := replaceDivider ( noDivider [ i ] , from , to )
if ! t1 {
b . Fatal ( "Should be truncated" )
}
if t2 {
b . Fatal ( "Should not be truncated" )
}
}
}
2015-05-31 12:54:50 -04:00
func TestPagePaths ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
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 } )
require . Len ( t , s . RegularPages , 1 )
2015-05-09 06:12:30 -04:00
}
}
2016-03-24 09:42:03 -04:00
var pageWithDraftAndPublished = ` -- -
2015-08-02 02:02:20 -04:00
title : broken
published : false
draft : true
-- -
some content
`
func TestDraftAndPublishedFrontMatterError ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
s := newTestSite ( t )
_ , err := s . NewPageFrom ( strings . NewReader ( pageWithDraftAndPublished ) , "content/post/broken.md" )
2015-08-02 02:02:20 -04:00
if err != ErrHasDraftAndPublished {
t . Errorf ( "expected ErrHasDraftAndPublished, was %#v" , err )
}
}
2016-10-11 12:12:28 -04:00
var pagesWithPublishedFalse = ` -- -
2015-08-30 18:51:25 -04:00
title : okay
published : false
-- -
some content
`
2016-03-24 09:42:03 -04:00
var pageWithPublishedTrue = ` -- -
2015-08-30 18:51:25 -04:00
title : okay
published : true
-- -
some content
`
func TestPublishedFrontMatter ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
s := newTestSite ( t )
p , err := s . NewPageFrom ( strings . NewReader ( pagesWithPublishedFalse ) , "content/post/broken.md" )
2015-08-30 18:51:25 -04:00
if err != nil {
t . Fatalf ( "err during parse: %s" , err )
}
if ! p . Draft {
t . Errorf ( "expected true, got %t" , p . Draft )
}
2017-02-04 22:20:06 -05:00
p , err = s . NewPageFrom ( strings . NewReader ( pageWithPublishedTrue ) , "content/post/broken.md" )
2015-08-30 18:51:25 -04:00
if err != nil {
t . Fatalf ( "err during parse: %s" , err )
}
if p . Draft {
t . Errorf ( "expected false, got %t" , p . Draft )
}
}
2016-10-11 12:12:28 -04:00
var pagesDraftTemplate = [ ] string { ` -- -
title : "okay"
draft : % t
-- -
some content
` ,
` ++ +
title = "okay"
draft = % t
++ +
some content
` ,
}
func TestDraft ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
s := newTestSite ( t )
2016-10-11 12:12:28 -04:00
for _ , draft := range [ ] bool { true , false } {
for i , templ := range pagesDraftTemplate {
pageContent := fmt . Sprintf ( templ , draft )
2017-02-04 22:20:06 -05:00
p , err := s . NewPageFrom ( strings . NewReader ( pageContent ) , "content/post/broken.md" )
2016-10-11 12:12:28 -04:00
if err != nil {
t . Fatalf ( "err during parse: %s" , err )
}
if p . Draft != draft {
t . Errorf ( "[%d] expected %t, got %t" , i , draft , p . Draft )
}
}
}
}
2016-12-27 21:08:24 -05:00
var pagesParamsTemplate = [ ] string { ` ++ +
title = "okay"
draft = false
tags = [ "hugo" , "web" ]
social = [
[ "a" , "#" ] ,
[ "b" , "#" ] ,
]
++ +
some content
` ,
` -- -
title : "okay"
draft : false
tags :
- hugo
- web
social :
- - a
- "#"
- - b
- "#"
-- -
some content
` ,
` {
"title" : "okay" ,
"draft" : false ,
"tags" : [ "hugo" , "web" ] ,
"social" : [
[ "a" , "#" ] ,
[ "b" , "#" ]
]
}
some content
` ,
}
func TestPageParams ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
s := newTestSite ( t )
2017-02-19 02:50:08 -05:00
wantedMap := map [ string ] interface { } {
2016-12-27 21:08:24 -05:00
"tags" : [ ] string { "hugo" , "web" } ,
// Issue #2752
"social" : [ ] interface { } {
[ ] interface { } { "a" , "#" } ,
[ ] interface { } { "b" , "#" } ,
} ,
}
for i , c := range pagesParamsTemplate {
2017-02-04 22:20:06 -05:00
p , err := s . NewPageFrom ( strings . NewReader ( c ) , "content/post/params.md" )
2016-12-27 21:08:24 -05:00
require . NoError ( t , err , "err during parse" , "#%d" , i )
2017-03-09 08:18:12 -05:00
for key := range wantedMap {
2018-01-15 14:40:39 -05:00
assert . Equal ( t , wantedMap [ key ] , p . params [ key ] , "#%d" , key )
2017-02-19 02:50:08 -05:00
}
2016-12-27 21:08:24 -05:00
}
}
2017-02-19 02:50:08 -05:00
func TestTraverse ( t * testing . T ) {
exampleParams := ` -- -
rating : "5 stars"
tags :
- hugo
- web
social :
twitter : "@jxxf"
facebook : "https://example.com"
-- - `
t . Parallel ( )
s := newTestSite ( t )
p , _ := s . NewPageFrom ( strings . NewReader ( exampleParams ) , "content/post/params.md" )
topLevelKeyValue , _ := p . Param ( "rating" )
assert . Equal ( t , "5 stars" , topLevelKeyValue )
nestedStringKeyValue , _ := p . Param ( "social.twitter" )
assert . Equal ( t , "@jxxf" , nestedStringKeyValue )
nonexistentKeyValue , _ := p . Param ( "doesn't.exist" )
assert . Nil ( t , nonexistentKeyValue )
}
2016-02-07 07:32:08 -05:00
func TestPageSimpleMethods ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
s := newTestSite ( t )
2016-02-07 07:32:08 -05:00
for i , this := range [ ] struct {
assertFunc func ( p * Page ) bool
} {
{ func ( p * Page ) bool { return ! p . IsNode ( ) } } ,
{ func ( p * Page ) bool { return p . IsPage ( ) } } ,
{ func ( p * Page ) bool { return p . Plain ( ) == "Do Be Do Be Do" } } ,
{ func ( p * Page ) bool { return strings . Join ( p . PlainWords ( ) , " " ) == "Do Be Do Be Do" } } ,
} {
2017-02-04 22:20:06 -05:00
p , _ := s . NewPage ( "Test" )
2018-04-23 23:57:33 -04:00
p . workContent = [ ] byte ( "<h1>Do Be Do Be Do</h1>" )
p . resetContent ( )
2016-02-07 07:32:08 -05:00
if ! this . assertFunc ( p ) {
t . Errorf ( "[%d] Page method error" , i )
}
}
}
2016-11-11 03:19:16 -05:00
func TestIndexPageSimpleMethods ( t * testing . T ) {
2017-03-06 07:18:33 -05:00
s := newTestSite ( t )
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2016-11-11 03:19:16 -05:00
for i , this := range [ ] struct {
assertFunc func ( n * Page ) bool
} {
{ func ( n * Page ) bool { return n . IsNode ( ) } } ,
{ func ( n * Page ) bool { return ! n . IsPage ( ) } } ,
{ func ( n * Page ) bool { return n . Scratch ( ) != nil } } ,
{ func ( n * Page ) bool { return n . Hugo ( ) != nil } } ,
} {
2017-03-06 07:18:33 -05:00
n := s . newHomePage ( )
2016-11-23 11:26:13 -05:00
2016-11-11 03:19:16 -05:00
if ! this . assertFunc ( n ) {
t . Errorf ( "[%d] Node method error" , i )
}
}
}
2016-11-13 06:33:11 -05:00
func TestKind ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2016-11-11 03:19:16 -05:00
// Add tests for these constants to make sure they don't change
2016-11-13 06:33:11 -05:00
require . Equal ( t , "page" , KindPage )
require . Equal ( t , "home" , KindHome )
require . Equal ( t , "section" , KindSection )
require . Equal ( t , "taxonomy" , KindTaxonomy )
require . Equal ( t , "taxonomyTerm" , KindTaxonomyTerm )
2016-11-11 03:19:16 -05:00
}
2017-11-17 10:28:35 -05:00
func TestTranslationKey ( t * testing . T ) {
t . Parallel ( )
assert := require . New ( t )
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 } )
require . Len ( t , s . RegularPages , 2 )
home , _ := s . Info . Home ( )
assert . NotNil ( home )
assert . Equal ( "home" , home . TranslationKey ( ) )
assert . Equal ( "page/k1" , s . RegularPages [ 0 ] . TranslationKey ( ) )
p2 := s . RegularPages [ 1 ]
: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
assert . Equal ( "page/sect/simple" , p2 . TranslationKey ( ) )
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 ( )
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
2016-11-13 08:27:10 -05:00
require . Len ( t , s . RegularPages , 1 )
2016-08-01 17:04:44 -04:00
2016-11-13 08:27:10 -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" )
}
2015-07-26 09:28:56 -04:00
// TODO(bep) this may be useful for other tests.
func compareObjects ( a interface { } , b interface { } ) bool {
aStr := strings . Split ( fmt . Sprintf ( "%v" , a ) , "" )
sort . Strings ( aStr )
bStr := strings . Split ( fmt . Sprintf ( "%v" , b ) , "" )
sort . Strings ( bStr )
return strings . Join ( aStr , "" ) == strings . Join ( bStr , "" )
}
2016-05-11 11:45:09 -04:00
2016-06-14 09:53:49 -04:00
func TestShouldBuild ( t * testing . T ) {
2017-02-04 22:20:06 -05:00
t . Parallel ( )
2016-05-11 11:45:09 -04:00
var past = time . Date ( 2009 , 11 , 17 , 20 , 34 , 58 , 651387237 , time . UTC )
var future = time . Date ( 2037 , 11 , 17 , 20 , 34 , 58 , 651387237 , time . UTC )
var zero = time . Time { }
var publishSettings = [ ] struct {
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 ) {
2017-03-09 13:19:29 -05:00
t . Parallel ( )
2017-06-06 03:15:42 -04:00
for _ , disablePathToLower := range [ ] bool { false , true } {
for _ , uglyURLs := range [ ] bool { false , true } {
t . Run ( fmt . Sprintf ( "disablePathToLower=%t,uglyURLs=%t" , disablePathToLower , uglyURLs ) , func ( t * testing . T ) {
2017-03-09 13:19:29 -05:00
2017-06-06 03:15:42 -04:00
cfg , fs := newTestCfg ( )
th := testHelper { cfg , fs , 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
2017-06-06 03:15:42 -04:00
require . Len ( t , s . RegularPages , 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 {
th . assertFileContent ( "public/post/page/1.html" , ` canonical" href="/post.html"/ ` )
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 {
th . assertFileContent ( "public/post/page/1/index.html" , ` canonical" href="/post/"/ ` )
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> ` )
}
p := s . RegularPages [ 0 ]
if uglyURLs {
require . Equal ( t , "/post/test0.dot.html" , p . RelPermalink ( ) )
} else {
require . Equal ( t , "/post/test0.dot/" , p . RelPermalink ( ) )
}
2017-03-09 13:19:29 -05:00
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 ( )
assert := require . New ( t )
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 } }
` }
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 { } )
assert . Equal ( 1 , len ( b . H . Sites ) )
require . Len ( t , b . H . Sites [ 0 ] . RegularPages , 6 )
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" )
b . AssertFileContent ( "public/p2/index.html" , "WordCount: 314\nFuzzyWordCount: 400\nReadingTime: 2\nLen Plain: 1570\nLen PlainWords: 314\nTruncated: true\nLen Summary: 34\nLen Content: 1592" )
b . AssertFileContent ( "public/p3/index.html" , "WordCount: 206\nFuzzyWordCount: 300\nReadingTime: 1\nLen Plain: 639\nLen PlainWords: 7\nTruncated: true\nLen Summary: 52\nLen Content: 661" )
b . AssertFileContent ( "public/p4/index.html" , "WordCount: 7\nFuzzyWordCount: 100\nReadingTime: 1\nLen Plain: 639\nLen PlainWords: 7\nTruncated: true\nLen Summary: 52\nLen Content: 661" )
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: 653" )
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: 653" )
}
2018-07-06 08:12:10 -04:00
func TestScratchSite ( t * testing . T ) {
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" )
}
2017-01-02 05:44:17 -05:00
func BenchmarkParsePage ( b * testing . B ) {
2017-02-04 22:20:06 -05:00
s := newTestSite ( b )
2017-01-02 05:44:17 -05:00
f , _ := os . Open ( "testdata/redis.cn.md" )
var buf bytes . Buffer
buf . ReadFrom ( f )
b . ResetTimer ( )
for i := 0 ; i < b . N ; i ++ {
2017-02-04 22:20:06 -05:00
page , _ := s . NewPage ( "bench" )
2017-01-02 05:44:17 -05:00
page . ReadFrom ( bytes . NewReader ( buf . Bytes ( ) ) )
}
}