Merge pull request #42 from vapor/ubuntu_render_issue

Ubuntu render issue

Author: BrettRToomey

Sources/Leaf/HTMLEscape.swift

@@ -1,11 +1,43 @@
 import Foundation
 
+extension Byte {
+    // <
+    static let lessThan: Byte = 0x3C
+
+    // >
+    static let greaterThan: Byte = 0x3E
+}
+
 extension String {
     func htmlEscaped() -> String {
-        return replacingOccurrences(of: "&", with: "&amp;")
-            .replacingOccurrences(of: "\"", with: "&quot;")
-            .replacingOccurrences(of: "'", with: "&#39;")
-            .replacingOccurrences(of: "<", with: "&lt;")
-            .replacingOccurrences(of: ">", with: "&gt;")
+        /**
+             ***** WARNING ******
+             
+             Temporary resolution to the following issue in swift on linux:
+             https://github.com/vapor/leaf/issues/41
+             
+             See:
+             https://bugs.swift.org/browse/SR-3448
+             
+             Replace when appropriate with:
+             
+             return replacingOccurrences(of: "&", with: "&amp;")
+                .replacingOccurrences(of: "\"", with: "&quot;")
+                .replacingOccurrences(of: "'", with: "&#39;")
+                .replacingOccurrences(of: "<", with: "&lt;")
+                .replacingOccurrences(of: ">", with: "&gt;")
+        */
+        return bytes
+            .split(separator: .ampersand, omittingEmptySubsequences: false)
+            .joined(separator: "&amp;".bytes)
+            .split(separator: .quotationMark, omittingEmptySubsequences: false)
+            .joined(separator: "&quot;".bytes)
+            .split(separator: .apostrophe, omittingEmptySubsequences: false)
+            .joined(separator: "&#39;".bytes)
+            .split(separator: .lessThan, omittingEmptySubsequences: false)
+            .joined(separator: "&lt;".bytes)
+            .split(separator: .greaterThan, omittingEmptySubsequences: false)
+            .joined(separator: "&gt;".bytes)
+            .string
     }
 }

Tests/LeafTests/HTMLEscapeTests.swift

@@ -0,0 +1,24 @@
+import Foundation
+import XCTest
+@testable import Leaf
+
+class HTMLEscapeTests: XCTestCase {
+    static let allTests = [
+        ("testHTMLEscape", testHTMLEscape),
+        ("testHTMLEscapeCRLFQuotes", testHTMLEscapeCRLFQuotes),
+    ]
+
+    func testHTMLEscape() throws {
+        let input = "&\"'<>"
+        let expected = "&amp;&quot;&#39;&lt;&gt;"
+        
+        XCTAssertEqual(input.htmlEscaped(), expected)
+    }
+    
+    func testHTMLEscapeCRLFQuotes() throws {
+        let input = "\r\n\""
+        let expected = "\r\n&quot;"
+        
+        XCTAssertEqual(input.htmlEscaped(), expected)
+    }
+}

Tests/LeafTests/VariableTests.swift

@@ -8,6 +8,7 @@ class VariableTests: XCTestCase {
         ("testVariableThrows", testVariableThrows),
         ("testVariableEscape", testVariableEscape),
         ("testConstant", testConstant),
+        ("testCarriageReturn", testCarriageReturn),
     ]
 
     func testVariable() throws {
@@ -40,4 +41,11 @@ class VariableTests: XCTestCase {
         let rendered = try stem.render(leaf, with: context).string
         XCTAssert(rendered == "Hello, World!")
     }
+
+    func testCarriageReturn() throws {
+        let leaf = try stem.spawnLeaf(raw: "This thing: #(content)")
+        let context = Context(["content": "\r\n\"/\""])
+        let rendered = try stem.render(leaf, with: context).string
+        XCTAssertEqual(rendered, "This thing: \r\n"/"")
+    }
 }

Tests/LinuxMain.swift

@@ -9,6 +9,7 @@ XCTMain([
      testCase(FileLoadTests.allTests),
      testCase(IfTests.allTests),
      testCase(IndexTests.allTests),
+     testCase(HTMLEscapeTests.allTests),
      testCase(LinkTests.allTests),
      testCase(LoopTests.allTests),
      testCase(NodeRenderTests.allTests),