Merge branch 'master' into v3

Author: Clément Le Provost

AlgoliaSearch-Client-Swift.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
     s.name = 'AlgoliaSearch-Client-Swift'
     s.module_name = 'AlgoliaSearch'
-    s.version = '2.2.1'
+    s.version = '2.3'
     s.license = 'MIT'
     s.summary = 'Algolia Search API Client for iOS & OS X written in Swift.'
     s.homepage = 'https://github.com/algolia/algoliasearch-client-swift'

AlgoliaSearch.xcodeproj/project.pbxproj

@@ -677,6 +677,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -695,6 +696,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Tests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

Source/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.1</string>
+	<string>2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Tests/ClientTests.swift

@@ -58,6 +58,56 @@ class ClientTests: XCTestCase {
         waitForExpectationsWithTimeout(expectationTimeout, handler: nil)
     }
 
+    func testKeepAlive() {
+        // Setup index
+        let expectationAdd = expectationWithDescription("testAdd")
+        let object = ["city": "San Francisco"]
+        index.addObject(object, completionHandler: { (content, error) -> Void in
+            XCTAssertNil(error, "Error during addObject: \(error?.description)")
+            if content != nil {
+                self.index.waitTask(content!["taskID"] as! Int) {
+                    (content, error) -> Void in
+                    if let error = error {
+                        XCTFail("Error during waitTask: \(error)")
+                    } else {
+                        XCTAssertEqual((content!["status"] as! String), "published", "Wait task failed")
+                    }
+                    expectationAdd.fulfill()
+                }
+            }
+        })
+        waitForExpectationsWithTimeout(expectationTimeout, handler: nil)
+        
+        // Reset client to avoid reuse of connection (Keep-Alive)
+        let appID = NSProcessInfo.processInfo().environment["ALGOLIA_APPLICATION_ID"] ?? APP_ID
+        let apiKey = NSProcessInfo.processInfo().environment["ALGOLIA_API_KEY"] ?? API_KEY
+        let testClient = AlgoliaSearch.Client(appID: appID, apiKey: apiKey)
+        let testIndex = testClient.getIndex(safeIndexName("algol?à-swift"))
+        
+        let bench = 10
+        var mesuredTime = [Double]()
+        mesuredTime.reserveCapacity(bench)
+        
+        for _ in 1...bench {
+            let expectation = expectationWithDescription("testKeepAlive")
+            
+            let startTime = CACurrentMediaTime()
+            testIndex.search(Query(query: ""), completionHandler: { (content, error) -> Void in
+                XCTAssertNil(error, "Error during search: \(error?.description)")
+                expectation.fulfill()
+            })
+            waitForExpectationsWithTimeout(expectationTimeout, handler: nil)
+            mesuredTime.append(CACurrentMediaTime() - startTime)
+        }
+        
+        let avgTime = average(Array(mesuredTime.dropFirst()))
+        let ratio = (mesuredTime[0] - avgTime) / max(mesuredTime[0], avgTime)
+        
+        if ratio < 0.5 {
+            XCTFail("Maybe keep-alive doesn't work")
+        }
+    }
+    
     func testListIndexes() {
         let expectation = expectationWithDescription("testListIndexes")
         let object = ["city": "San Francisco", "objectID": "a/go/?à"]

Tests/Helpers.swift

@@ -36,3 +36,7 @@ func safeIndexName(name: String) -> String {
         return name
     }
 }
+
+func average(values: [Double]) -> Double {
+    return values.reduce(0, combine: +) / Double(values.count)
+}