From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Fri, 6 May 2016 08:11:17 +0000 (+0200)
Subject: Add non-string support in markdownify
X-Git-Tag: v0.16~31
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=273a6840;p=brevno-suite%2Fhugo

Add non-string support in markdownify
---

diff --git a/tpl/template_funcs.go b/tpl/template_funcs.go
index 8b99cc09..80ecdfe0 100644
--- a/tpl/template_funcs.go
+++ b/tpl/template_funcs.go
@@ -1203,7 +1203,8 @@ var markdownTrimPrefix = []byte("<p>")
 var markdownTrimSuffix = []byte("</p>\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 3152b13a..32871f6f 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 <strong>World!</strong>")
-
-	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 <strong>World!</strong>")},
+		{[]byte("Hello Bytes **World!**"), template.HTML("Hello Bytes <strong>World!</strong>")},
+	} {
+		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) {