Replace 4 strings.Replace with 1 strings.Replacer

Consumes less memory, slightly faster.

diff --git a/helpers/content.go b/helpers/content.go
index 3b33b6b174fcc62e952030325699de2a7fdc5603..fe5f26e543f82242b31166ceae6f27ec5caf5f10 100644 (file)
--- a/helpers/content.go
+++ b/helpers/content.go
@@ -69,18 +69,16 @@ var blackfridayExtensionMap = map[string]int{
        "autoHeaderIds":          blackfriday.EXTENSION_AUTO_HEADER_IDS,
 }
 
+var stripHTMLReplacer = strings.NewReplacer("\n", " ", "</p>", "\n", "<br>", "\n", "<br />", "\n")
+
 // StripHTML accepts a string, strips out all HTML tags and returns it.
 func StripHTML(s string) string {
-       output := ""
 
        // Shortcut strings with no tags in them
        if !strings.ContainsAny(s, "<>") {
-               output = s
+               return s
        } else {
-               s = strings.Replace(s, "\n", " ", -1)
-               s = strings.Replace(s, "</p>", "\n", -1)
-               s = strings.Replace(s, "<br>", "\n", -1)
-               s = strings.Replace(s, "<br />", "\n", -1) // <br /> is the xhtml line break tag
+               s = stripHTMLReplacer.Replace(s)
 
                // Walk through the string removing all tags
                b := new(bytes.Buffer)
@@ -97,9 +95,8 @@ func StripHTML(s string) string {
                                }
                        }
                }
-               output = b.String()
+               return b.String()
        }
-       return output
 }
 
 // StripEmptyNav strips out empty <nav> tags from content.

diff --git a/helpers/content_test.go b/helpers/content_test.go
index 63ef82f2f6585b2d8e52509ffa7a6b20f7993f27..6191eb1585b9f53b1afe2a71904d00a5ee1a4627 100644 (file)
--- a/helpers/content_test.go
+++ b/helpers/content_test.go
@@ -14,6 +14,8 @@ func TestStripHTML(t *testing.T) {
                {"<h1>strip h1 tag <h1>", "strip h1 tag "},
                {"<p> strip p tag </p>", " strip p tag \n"},
                {"</br> strip br<br>", " strip br\n"},
+               {"</br> strip br2<br />", " strip br2\n"},
+               {"This <strong>is</strong> a\nnewline", "This is a newline"},
        }
        for i, d := range data {
                output := StripHTML(d.input)