mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-21 21:35:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

tpl: Rework to handle both text and HTML templates

Browse Source 
Before this commit, Hugo used `html/template` for all Go templates.

While this is a fine choice for HTML and maybe also RSS feeds, it is painful for plain text formats such as CSV, JSON etc.

This commit fixes that by using the `IsPlainText` attribute on the output format to decide what to use.

A couple of notes:

* The above requires a nonambiguous template name to type mapping. I.e. `/layouts/_default/list.json` will only work if there is only one JSON output format, `/layouts/_default/list.mytype.json` will always work.
* Ambiguous types will fall back to HTML.
* Partials inherits the text vs HTML identificator of the container template. This also means that plain text templates can only include plain text partials.
* Shortcode templates are, by definition, currently HTML templates only.

Fixes #3221
This commit is contained in:
Bjørn Erik Pedersen
2017-03-27 20:43:49 +02:00
parent 27610ddd01
commit 8b5b558bb5
32 changed files with 1313 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
output/outputFormat_test.go
View File

@@ -65,7 +65,7 @@ func TestDefaultTypes(t *testing.T) {
}
func TestGetType(t *testing.T) {
func TestGetFormat(t *testing.T) {
tp, _ := GetFormat("html")
require.Equal(t, HTMLFormat, tp)
tp, _ = GetFormat("HTML")
@@ -73,3 +73,28 @@ func TestGetType(t *testing.T) {
_, found := GetFormat("FOO")
require.False(t, found)
}
func TestGeGetFormatByName(t *testing.T) {
formats := Formats{AMPFormat, CalendarFormat}
tp, _ := formats.GetByName("AMP")
require.Equal(t, AMPFormat, tp)
_, found := formats.GetByName("HTML")
require.False(t, found)
_, found = formats.GetByName("FOO")
require.False(t, found)
}
func TestGeGetFormatByExt(t *testing.T) {
formats1 := Formats{AMPFormat, CalendarFormat}
formats2 := Formats{AMPFormat, HTMLFormat, CalendarFormat}
tp, _ := formats1.GetBySuffix("html")
require.Equal(t, AMPFormat, tp)
tp, _ = formats1.GetBySuffix("ics")
require.Equal(t, CalendarFormat, tp)
_, found := formats1.GetBySuffix("not")
require.False(t, found)
// ambiguous
_, found = formats2.GetByName("html")
require.False(t, found)
}