github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-03-19 05:34:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug where Url specified in front matter as pretty url wouldnt render

Browse source 
Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
This commit is contained in:
Mark Sanborn 2013-08-29 09:37:37 -07:00 committed by Noah Campbell
parent 71678a7183
commit 4ed43e8076
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hugolib/site.go
View file

@ -332,6 +332,10 @@ func (s *Site) setOutFile(p *Page) {
// Always use Url if it's specified
if len(strings.TrimSpace(p.Url)) > 2 {
p.OutFile = strings.TrimSpace(p.Url)
if strings.HasSuffix(p.OutFile, "/") {
p.OutFile = p.OutFile + "index.html"
}
return
}

18
hugolib/site_test.go
View file

@ -16,6 +16,12 @@ content`
var TEMPLATE_MISSING_FUNC = "{{ .Title | funcdoesnotexists }}"
var TEMPLATE_FUNC = "{{ .Title | urlize }}"
var PAGE_URL_SPECIFIED = `---
title: simple template
url: "mycategory/my-whatever-content/"
---
content`
func pageMust(p *Page, err error) *Page {
if err != nil {
panic(err)
@ -159,3 +165,15 @@ func TestRenderThingOrDefault(t *testing.T) {
t.Errorf("Content does not match. Expected '%s', got '%s'", test.expected, html)
}
}}
func TestSetOutFile(t *testing.T) {
s := new(Site)
p := pageMust(ReadFrom(strings.NewReader(PAGE_URL_SPECIFIED), "content/a/file.md"))
s.setOutFile(p)
expected := "mycategory/my-whatever-content/index.html"
if p.OutFile != "mycategory/my-whatever-content/index.html" {
t.Errorf("Outfile does not match. Expected '%s', got '%s'", expected, p.OutFile)
}
}