Start refactoring escaping

Alexis Aubry Radanovic · Alexis Aubry Radanovic · commit 5dbaffe61fb3 · 2017-01-03T10:58:44.000+01:00
diff --git a/Sources/HTMLString.swift b/Sources/HTMLString.swift
@@ -81,9 +81,33 @@ public extension String {
     ///
 
     fileprivate func escapeHTML(isEncodingUnicode: Bool) -> String {
-        return self.characters.map {
-            isEncodingUnicode ? $0.escapingForUnicode : $0.escapingForASCII
-        }.joined()
+
+        return self.characters.reduce(String()) {
+
+            let character = String($1)
+
+            // ignore alphanumerical characters
+            guard character < "\u{2f}" || character > "\u{7a}" else {
+                return $0 + character
+            }
+
+            var escaped: String
+
+            if !(isEncodingUnicode) {
+
+                guard let escapeSequence = HTMLTables.escapingTable[character] else {
+                    return $0 + character.unicodeScalars.map { $0.escapingForASCII }.joined()
+                }
+
+                escaped = "&" + escapeSequence + ";"
+
+            } else {
+                escaped = character.unicodeScalars.map { $0.escapingIfNeeded }.joined()
+            }
+
+            return $0 + escaped
+
+        }
     }
 
     // MARK: - Unescaping
diff --git a/Tests/HTMLStringTests/HTMLStringTests.swift b/Tests/HTMLStringTests/HTMLStringTests.swift
@@ -167,6 +167,9 @@ class HTMLStringTests: XCTestCase {
         let twoSequences = "a &amp;&amp; b".unescapingFromHTML
         XCTAssertEqual(twoSequences, "a && b")
 
+        let doubleEmojiEscape = ("Going to the &#127482;&#127480; next June").escapingForASCIIHTML
+        XCTAssertEqual(doubleEmojiEscape, "Going to the 🇺🇸 next June")
+
     }
 
     // MARK: - Benchmark

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,9 @@ class HTMLStringTests: XCTestCase {`
`167`	`167`	`let twoSequences = "a && b".unescapingFromHTML`
`168`	`168`	`XCTAssertEqual(twoSequences, "a && b")`
`169`	`169`
	`170`	`+ let doubleEmojiEscape = ("Going to the 🇺🇸 next June").escapingForASCIIHTML`
	`171`	`+ XCTAssertEqual(doubleEmojiEscape, "Going to the 🇺🇸 next June")`
	`172`	`+`
`170`	`173`	`}`
`171`	`174`
`172`	`175`	`// MARK: - Benchmark`