Merge branch 'merge/74'

Author: ishkawa

APIKit/URLEncodedSerialization.swift

@@ -1,7 +1,17 @@
 import Foundation
 
 private func escape(string: String) -> String {
-    return CFURLCreateStringByAddingPercentEscapes(nil, string, nil, "!*'();:@&=+$,/?%#[]", CFStringBuiltInEncodings.UTF8.rawValue) as String
+    // Reserved characters defined by RFC 3986
+    // Reference: https://www.ietf.org/rfc/rfc3986.txt
+    let generalDelimiters = ":/?#[]@"
+    let subDelimiters = "!$&'()*+,;="
+    let reservedCharacters = generalDelimiters + subDelimiters
+    
+    let allowedCharacterSet = NSMutableCharacterSet()
+    allowedCharacterSet.formUnionWithCharacterSet(NSCharacterSet.URLQueryAllowedCharacterSet())
+    allowedCharacterSet.removeCharactersInString(reservedCharacters)
+    
+    return string.stringByAddingPercentEncodingWithAllowedCharacters(allowedCharacterSet) ?? string
 }
 
 private func unescape(string: String) -> String {

APIKitTests/RequestTests.swift

@@ -33,7 +33,7 @@ class RequestTests: XCTestCase {
         super.tearDown()
     }
 
-    func testURLQueryParameterEncoding() {
+    func testJapanesesURLQueryParameterEncoding() {
         OHHTTPStubs.stubRequestsPassingTest({ request in
             XCTAssert(request.URL?.query == "q=%E3%81%93%E3%82%93%E3%81%AB%E3%81%A1%E3%81%AF")
             return true
@@ -50,4 +50,22 @@ class RequestTests: XCTestCase {
 
         waitForExpectationsWithTimeout(1.0, handler: nil)
     }
+    
+    func testSymbolURLQueryParameterEncoding() {
+        OHHTTPStubs.stubRequestsPassingTest({ request in
+            XCTAssert(request.URL?.query == "q=%21%22%23%24%25%26%27%28%290%3D~%7C%60%7B%7D%2A%2B%3C%3E%3F_")
+            return true
+        }, withStubResponse: { request in
+            return OHHTTPStubsResponse(data: NSData(), statusCode: 200, headers: nil)
+        })
+        
+        let request = SearchRequest(query: "!\"#$%&'()0=~|`{}*+<>?_")
+        let expectation = expectationWithDescription("waiting for the response.")
+        
+        API.sendRequest(request) { result in
+            expectation.fulfill()
+        }
+        
+        waitForExpectationsWithTimeout(1.0, handler: nil)
+    }
 }