diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-03-27 20:43:49 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-04-02 11:37:30 +0200 |
| commit | 5c5efa03d2512749950b0d05a7d4bde35ecbdc37 (patch) | |
| tree | 9f3e31a7e30c51fab5ed3f7c323393fcafadc5e8 /output/layout_base_test.go | |
| parent | 73c1c7b69d8302000fa5c5b804ad3eeac36da12f (diff) | |
tpl: Rework to handle both text and HTML templates
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
Diffstat (limited to 'output/layout_base_test.go')
| -rw-r--r-- | output/layout_base_test.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/output/layout_base_test.go b/output/layout_base_test.go index f20d99bef..16be615f2 100644 --- a/output/layout_base_test.go +++ b/output/layout_base_test.go @@ -141,6 +141,7 @@ func TestLayoutBase(t *testing.T) { return this.needsBase, nil } + this.d.OutputFormats = Formats{AMPFormat, HTMLFormat, RSSFormat, JSONFormat} this.d.WorkingDir = filepath.FromSlash(this.d.WorkingDir) this.d.LayoutDir = filepath.FromSlash(this.d.LayoutDir) this.d.RelPath = filepath.FromSlash(this.d.RelPath) @@ -150,6 +151,11 @@ func TestLayoutBase(t *testing.T) { this.expect.MasterFilename = filepath.FromSlash(this.expect.MasterFilename) this.expect.OverlayFilename = filepath.FromSlash(this.expect.OverlayFilename) + if strings.Contains(this.d.RelPath, "json") { + // currently the only plain text templates in this test. + this.expect.Name = "_text/" + this.expect.Name + } + id, err := CreateTemplateNames(this.d) require.NoError(t, err) |