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 /hugolib/site_output_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 'hugolib/site_output_test.go')
| -rw-r--r-- | hugolib/site_output_test.go | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/hugolib/site_output_test.go b/hugolib/site_output_test.go index 86e1a55ca..06c55a69c 100644 --- a/hugolib/site_output_test.go +++ b/hugolib/site_output_test.go @@ -90,9 +90,15 @@ outputs: %s Alt Output: {{ .Name -}}| {{- end -}}| {{- range .OutputFormats -}} -Output/Rel: {{ .Name -}}/{{ .Rel }}| +Output/Rel: {{ .Name -}}/{{ .Rel }}|{{ .MediaType }} {{- end -}} + {{ with .OutputFormats.Get "JSON" }} +<atom:link href={{ .Permalink }} rel="self" type="{{ .MediaType }}" /> +{{ end }} `, + "layouts/_default/list.html", `List HTML|{{ with .OutputFormats.Get "HTML" -}} +<atom:link href={{ .Permalink }} rel="self" type="{{ .MediaType }}" /> +{{- end -}}`, ) require.Len(t, h.Sites, 1) @@ -113,7 +119,6 @@ Output/Rel: {{ .Name -}}/{{ .Rel }}| require.Len(t, home.outputFormats, lenOut) - // TODO(bep) output assert template/text // There is currently always a JSON output to make it simpler ... altFormats := lenOut - 1 hasHTML := helpers.InStringArray(outputs, "html") @@ -128,9 +133,16 @@ Output/Rel: {{ .Name -}}/{{ .Rel }}| "Output/Rel: JSON/alternate|", "Output/Rel: HTML/canonical|", ) + th.assertFileContent("public/index.html", + // The HTML entity is a deliberate part of this test: The HTML templates are + // parsed with html/template. + `List HTML|<atom:link href=http://example.com/blog/ rel="self" type="text/html+html" />`, + ) } else { th.assertFileContent("public/index.json", "Output/Rel: JSON/canonical|", + // JSON is plain text, so no need to safeHTML this and that + `<atom:link href=http://example.com/blog/index.json rel="self" type="application/json+json" />`, ) } |