Merge pull request #46 from 3lvis/improve/formatting-with-escaping

Add percent encoding
3lvis · Dec 23, 2015 · 8c30585 · 8c30585
2 parents 50a42b2 + ba94ed7
commit 8c30585
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Source/Dictionary+FormURLEncoded.swift b/Source/Dictionary+FormURLEncoded.swift
@@ -1,3 +1,5 @@
+import Foundation
+
 public extension Dictionary where Key: StringLiteralConvertible {
     func formURLEncodedFormat() -> String {
         var converted = ""
@@ -8,6 +10,6 @@ public extension Dictionary where Key: StringLiteralConvertible {
             converted.appendContentsOf("\(entry.0)=\(entry.1)")
         }
 
-        return converted
+        return converted.stringByAddingPercentEncodingWithAllowedCharacters(NSCharacterSet.URLQueryAllowedCharacterSet())!
     }
 }
diff --git a/Tests/Dictionary+FormURLEncodedTests.swift b/Tests/Dictionary+FormURLEncodedTests.swift
@@ -16,9 +16,9 @@ class Dictionary_FormURLEncodedTests: XCTestCase {
     }
 
     func testFormattingOneParameter() {
-        let parameters = ["password" : "secret"]
+        let parameters = ["name" : "Elvis Nuñez"]
         let formatted = parameters.formURLEncodedFormat()
-        XCTAssertEqual(formatted, "password=secret")
+        XCTAssertEqual(formatted, "name=Elvis%20Nu%C3%B1ez")
     }
 
     func testFormattingWithEmpty() {