the use of built-in function

voynovia · voynovia · commit 82894dcfd5df · 2016-12-26T10:36:53.000+03:00
diff --git a/Sources/HttpParser.swift b/Sources/HttpParser.swift
@@ -38,8 +38,8 @@ public class HttpParser {
         }
         return query.split("&").reduce([(String, String)]()) { (c, s) -> [(String, String)] in
             let tokens = s.split(1, separator: "=")
-            if let name = tokens.first, let value = tokens.last {
-                return c + [(name.removePercentEncoding(), value.removePercentEncoding())]
+            if let name = tokens.first?.removingPercentEncoding, let value = tokens.last?.removingPercentEncoding {
+                return c + [(name, value)]
             }
             return c
         }
diff --git a/Sources/HttpRequest.swift b/Sources/HttpRequest.swift
@@ -34,9 +34,9 @@ public class HttpRequest {
         }
         return String.fromUInt8(body).split("&").map { param -> (String, String) in
             let tokens = param.split("=")
-            if let name = tokens.first, let value = tokens.last, tokens.count == 2 {
-                return (name.replace(old: "+", " ").removePercentEncoding(),
-                        value.replace(old: "+", " ").removePercentEncoding())
+            if let name = tokens.first?.removingPercentEncoding, let value = tokens.last?.removingPercentEncoding, tokens.count == 2 {
+                return (name.replace(old: "+", " "),
+                        value.replace(old: "+", " "))
             }
             return ("","")
         }
diff --git a/Sources/String+Misc.swift b/Sources/String+Misc.swift
@@ -46,38 +46,6 @@ extension String {
         return array.reduce("", { $0.0 + String(UnicodeScalar($0.1)) })
     }
     
-    public func removePercentEncoding() -> String {
-        var scalars = self.unicodeScalars
-        var output = ""
-        var decodeBuffer = [UInt8]()
-        while let scalar = scalars.popFirst() {
-            if scalar == "%" {
-                let first = scalars.popFirst()
-                let secon = scalars.popFirst()
-                if let first = first?.asAlpha(), let secon = secon?.asAlpha() {
-                    decodeBuffer.append(first*16+secon)
-                } else {
-                    if !decodeBuffer.isEmpty {
-                        output.append(String.fromUInt8(decodeBuffer))
-                        decodeBuffer.removeAll()
-                    }
-                    if let first = first { output.append(Character(first)) }
-                    if let secon = secon { output.append(Character(secon)) }
-                }
-            } else {
-                if !decodeBuffer.isEmpty {
-                    output.append(String.fromUInt8(decodeBuffer))
-                    decodeBuffer.removeAll()
-                }
-                output.append(Character(scalar))
-            }
-        }
-        if !decodeBuffer.isEmpty {
-            output.append(String.fromUInt8(decodeBuffer))
-            decodeBuffer.removeAll()
-        }
-        return output
-    }
 }
 
 extension UnicodeScalar {
@@ -92,16 +60,4 @@ extension UnicodeScalar {
         return nil
     }
     
-    public func asAlpha() -> UInt8? {
-        if self.value >= 48 && self.value <= 57 {
-            return UInt8(self.value) - 48
-        }
-        if self.value >= 97 && self.value <= 102 {
-            return UInt8(self.value) - 87
-        }
-        if self.value >= 65 && self.value <= 70 {
-            return UInt8(self.value) - 55
-        }
-        return nil
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ public class HttpParser {`
`38`	`38`	`}`
`39`	`39`	`return query.split("&").reduce([(String, String)]()) { (c, s) -> [(String, String)] in`
`40`	`40`	`let tokens = s.split(1, separator: "=")`
`41`		`- if let name = tokens.first, let value = tokens.last {`
`42`		`- return c + [(name.removePercentEncoding(), value.removePercentEncoding())]`
	`41`	`+ if let name = tokens.first?.removingPercentEncoding, let value = tokens.last?.removingPercentEncoding {`
	`42`	`+ return c + [(name, value)]`
`43`	`43`	`}`
`44`	`44`	`return c`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,9 @@ public class HttpRequest {`
`34`	`34`	`}`
`35`	`35`	`return String.fromUInt8(body).split("&").map { param -> (String, String) in`
`36`	`36`	`let tokens = param.split("=")`
`37`		`- if let name = tokens.first, let value = tokens.last, tokens.count == 2 {`
`38`		`- return (name.replace(old: "+", " ").removePercentEncoding(),`
`39`		`- value.replace(old: "+", " ").removePercentEncoding())`
	`37`	`+ if let name = tokens.first?.removingPercentEncoding, let value = tokens.last?.removingPercentEncoding, tokens.count == 2 {`
	`38`	`+ return (name.replace(old: "+", " "),`
	`39`	`+ value.replace(old: "+", " "))`
`40`	`40`	`}`
`41`	`41`	`return ("","")`
`42`	`42`	`}`