From 273a68400ff081d05508afbcb6d158711b865307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 6 May 2016 10:11:17 +0200 Subject: [PATCH] Add non-string support in markdownify --- tpl/template_funcs.go | 3 ++- tpl/template_funcs_test.go | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tpl/template_funcs.go b/tpl/template_funcs.go index 8b99cc09d..80ecdfe0c 100644 --- a/tpl/template_funcs.go +++ b/tpl/template_funcs.go @@ -1203,7 +1203,8 @@ var markdownTrimPrefix = []byte("

") var markdownTrimSuffix = []byte("

\n") // markdownify renders a given string from Markdown to HTML. -func markdownify(text string) template.HTML { +func markdownify(in interface{}) template.HTML { + text := cast.ToString(in) m := helpers.RenderBytes(&helpers.RenderingContext{Content: []byte(text), PageFmt: "markdown"}) m = bytes.TrimPrefix(m, markdownTrimPrefix) m = bytes.TrimSuffix(m, markdownTrimSuffix) diff --git a/tpl/template_funcs_test.go b/tpl/template_funcs_test.go index 3152b13a1..32871f6f0 100644 --- a/tpl/template_funcs_test.go +++ b/tpl/template_funcs_test.go @@ -1699,13 +1699,19 @@ func TestReturnWhenSet(t *testing.T) { } func TestMarkdownify(t *testing.T) { - result := markdownify("Hello **World!**") - - expect := template.HTML("Hello World!") - - if result != expect { - t.Errorf("Markdownify: got '%s', expected '%s'", result, expect) + for i, this := range []struct { + in interface{} + expect interface{} + }{ + {"Hello **World!**", template.HTML("Hello World!")}, + {[]byte("Hello Bytes **World!**"), template.HTML("Hello Bytes World!")}, + } { + result := markdownify(this.in) + if !reflect.DeepEqual(result, this.expect) { + t.Errorf("[%d] markdownify got %v (type %v) but expected %v (type %v)", i, result, reflect.TypeOf(result), this.expect, reflect.TypeOf(this.expect)) + } } + } func TestApply(t *testing.T) {