Updated podspec + linting

rubikzube · rubikzube · commit 811f4555cab9 · 2019-07-06T13:52:55.000-07:00
diff --git a/.swift-version b/.swift-version
diff --git a/AutocompleteClient.xcodeproj/project.pbxproj b/AutocompleteClient.xcodeproj/project.pbxproj
@@ -839,7 +839,6 @@
 				F64F46B61F59767D0094C697 /* AutocompleteViewModelTests.swift */,
 				F64F46C21F59A63B0094C697 /* ClosureAutocompleteViewModelDelegate.swift */,
 				F66B216221DF837700AAB030 /* AutocompleteResultCountTests.swift */,
-				F67D42AA220360580053B9C3 /* AbstractAutocompleteViewModel.swift */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
@@ -1201,6 +1200,7 @@
 			children = (
 				F61A6B0E1F699E4D007826CA /* Delegate */,
 				F1B17CB11F58E5830015FF62 /* AutocompleteResult.swift */,
+				F67D42AA220360580053B9C3 /* AbstractAutocompleteViewModel.swift */,
 				F68A72F91F56D22B00FA4D1B /* AutocompleteViewModel.swift */,
 				F64F46C41F59A6890094C697 /* AutocompleteViewModelDelegate.swift */,
 				F63808EE1F5D2F5B00C3B322 /* AutocompleteViewModelSection.swift */,
@@ -1884,7 +1884,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.cio.UserApplication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1903,7 +1903,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.cio.UserApplication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1920,7 +1920,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.cio.UserApplicationTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UserApplication.app/UserApplication";
 			};
@@ -1938,7 +1938,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.cio.UserApplicationTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UserApplication.app/UserApplication";
 			};
@@ -2031,7 +2031,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -2084,7 +2084,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
diff --git a/AutocompleteClient/FW/Logic/Request/Builder/QueryItemCollection.swift b/AutocompleteClient/FW/Logic/Request/Builder/QueryItemCollection.swift
@@ -13,7 +13,7 @@ struct QueryItemCollection {
 
     init() {}
 
-    mutating func add(key: String,items: [URLQueryItem]) {
+    mutating func add(key: String, items: [URLQueryItem]) {
         queryItems[key] = items
     }
 
@@ -31,15 +31,15 @@ struct QueryItemCollection {
         }
         set {
             if let newValue = newValue {
-                if var existingArray = queryItems[value]{
+                if var existingArray = queryItems[value] {
                     existingArray.append(contentsOf: newValue)
                     queryItems[value] = existingArray
                 } else {
                     queryItems[value] = newValue
                 }
             } else {
                 queryItems.removeValue(forKey: value)
-            }   
+            }
         }
     }
 
diff --git a/AutocompleteClient/FW/Logic/Request/Builder/RequestBuilder.swift b/AutocompleteClient/FW/Logic/Request/Builder/RequestBuilder.swift
@@ -15,9 +15,9 @@ class RequestBuilder {
 
     let baseURL: String
 
-    internal(set) var trackData: CIORequestData!
+    var trackData: CIORequestData!
 
-    internal(set) var searchTerm = ""
+    var searchTerm = ""
 
     init(apiKey: String, dateProvider: DateProvider = CurrentTimeDateProvider(), baseURL: String) {
         self.dateProvider = dateProvider
diff --git a/AutocompleteClient/FW/Logic/Request/CIOAutocompleteQuery.swift b/AutocompleteClient/FW/Logic/Request/CIOAutocompleteQuery.swift
@@ -50,7 +50,7 @@ public struct CIOSearchQuery: CIORequestData {
         self.query = query.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!
         self.filters = filters
         self.page = page
-        self.section = section != nil ? section! : Constants.SearchQuery.defaultSectionName;
+        self.section = section != nil ? section! : Constants.SearchQuery.defaultSectionName
     }
 
     func decorateRequest(requestBuilder: RequestBuilder) {
@@ -60,4 +60,3 @@ public struct CIOSearchQuery: CIORequestData {
         requestBuilder.set(searchSection: self.section)
     }
 }
-
diff --git a/AutocompleteClient/FW/Logic/Request/CIOTrackConversionData.swift b/AutocompleteClient/FW/Logic/Request/CIOTrackConversionData.swift
@@ -20,7 +20,7 @@ struct CIOTrackConversionData: CIORequestData {
     let revenue: Double?
 
     func url(with baseURL: String) -> String {
-        return String(format: Constants.TrackConversion.format, baseURL,  self.searchTerm.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!)
+        return String(format: Constants.TrackConversion.format, baseURL, self.searchTerm.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!)
     }
 
     init(searchTerm: String, itemName: String, customerID: String, sectionName: String? = nil, revenue: Double? = nil) {
diff --git a/AutocompleteClient/FW/Logic/Request/CIOTrackSearchSubmitData.swift b/AutocompleteClient/FW/Logic/Request/CIOTrackSearchSubmitData.swift
@@ -17,7 +17,7 @@ struct CIOTrackSearchSubmitData: CIORequestData {
     let originalQuery: String
     let group: CIOGroup?
 
-    func url(with baseURL: String) -> String{
+    func url(with baseURL: String) -> String {
         return String(format: Constants.TrackSearchSubmit.format, baseURL, self.searchTerm.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!)
     }
 
diff --git a/AutocompleteClient/FW/Logic/Result/Search/SearchResultData.swift b/AutocompleteClient/FW/Logic/Result/Search/SearchResultData.swift
@@ -36,7 +36,7 @@ extension SearchResultData {
         self.url = json["url"] as? String
 
         var metadata = json
-        for key in [ "id", "facets", "groups", "image_url", "quantity", "url" ]{
+        for key in [ "id", "facets", "groups", "image_url", "quantity", "url" ] {
             metadata.removeValue(forKey: key)
         }
         self.metadata = metadata
diff --git a/AutocompleteClient/FW/Logic/Session/CIOSessionManager.swift b/AutocompleteClient/FW/Logic/Session/CIOSessionManager.swift
@@ -29,7 +29,7 @@ class CIOSessionManager: SessionManager {
 
         self.sessionLoader = sessionLoader
         self.session = self.sessionLoader.loadSession() ?? Session(id: 1, createdAt: dateProvider.provideDate().timeIntervalSince1970)
-        
+
         NotificationCenter.default.addObserver(self, selector: #selector(applicationDidEnterForeground(_:)), name: UIApplication.willEnterForegroundNotification, object: nil)
     }
 
diff --git a/AutocompleteClient/FW/UI/DefaultSearchItemCell.swift b/AutocompleteClient/FW/UI/DefaultSearchItemCell.swift
@@ -7,7 +7,6 @@
 //
 
 import UIKit
-import Foundation
 
 public class DefaultSearchItemCell: UITableViewCell, CIOAutocompleteCell {
 
diff --git a/AutocompleteClient/FW/UI/ViewModel/AbstractAutocompleteViewModel.swift b/AutocompleteClient/FW/UI/ViewModel/AbstractAutocompleteViewModel.swift
@@ -1,6 +1,6 @@
 //
 //  AbstractAutocompleteViewModel.swift
-//  AutocompleteClientTests
+//  AutocompleteClient
 //
 //  Copyright © Constructor.io. All rights reserved.
 //  http://constructor.io/
diff --git a/AutocompleteClient/Info.plist b/AutocompleteClient/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.1</string>
+	<string>1.7.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/AutocompleteClient/Utils/Color/UIColor+RGB.swift b/AutocompleteClient/Utils/Color/UIColor+RGB.swift
@@ -14,7 +14,7 @@ extension UIColor {
     }
 
     class func RGBA(_ red: Int, green: Int, blue: Int, alpha: CGFloat) -> UIColor {
-        return UIColor(red: CGFloat(red)/255.0, green: CGFloat(green)/255.0, blue: CGFloat(blue)/255.0, alpha: alpha)
+        return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green)/255.0, blue: CGFloat(blue)/255.0, alpha: alpha)
     }
 
     class func hex(rgb: Int) -> UIColor {
diff --git a/AutocompleteClientTests/FW/API/Parser/CIOAutocompleteResponseParserTests.swift b/AutocompleteClientTests/FW/API/Parser/CIOAutocompleteResponseParserTests.swift
@@ -70,7 +70,7 @@ class CIOAutocompleteResponseParserTests: XCTestCase {
             let response = try responseParser.parse(autocompleteResponseData: data)
 
             if let results = response.sections[Constants.Response.singleSectionResultField] {
-                XCTAssertEqual(results.count, TestResource.Response.numberOfGroupsInMultipleSectionsResponse+1, "Number of parsed items with multiple groups should match the number of groups plus one.")
+                XCTAssertEqual(results.count, TestResource.Response.numberOfGroupsInMultipleSectionsResponse + 1, "Number of parsed items with multiple groups should match the number of groups plus one.")
             } else {
                 XCTFail("Results incorrectly parsed, no results array for key \(Constants.Response.singleSectionResultField) when server returns a single section")
             }
diff --git a/AutocompleteClientTests/FW/Logic/Request/Mock/AbstractAutocompleteViewModel+Mock.swift b/AutocompleteClientTests/FW/Logic/Request/Mock/AbstractAutocompleteViewModel+Mock.swift
@@ -63,10 +63,3 @@ public class MockAutocompleteViewModel: AbstractAutocompleteViewModel {
         return results[index].sectionName
     }
 }
-
-
-//public extension AbstractAutocompleteViewModel {
-//    public class func mock() -> AbstractAutocompleteViewModel {
-//
-//    }
-//}
diff --git a/AutocompleteClientTests/FW/Logic/Request/QueryItemCollection/QueryItemCollectionTests.swift b/AutocompleteClientTests/FW/Logic/Request/QueryItemCollection/QueryItemCollectionTests.swift
@@ -11,14 +11,6 @@ import XCTest
 
 class QueryItemCollectionTests: XCTestCase {
 
-    override func setUp() {
-        // Put setup code here. This method is called before the invocation of each test method in the class.
-    }
-
-    override func tearDown() {
-        // Put teardown code here. This method is called after the invocation of each test method in the class.
-    }
-
     func testQueryItemCollection_Remove() {
         var collection = QueryItemCollection()
         collection.remove(name: "key")
diff --git a/AutocompleteClientTests/FW/Logic/Request/TrackAutocompleteSelectRequestBuilderTests.swift b/AutocompleteClientTests/FW/Logic/Request/TrackAutocompleteSelectRequestBuilderTests.swift
@@ -43,7 +43,7 @@ class TrackAutocompleteSelectRequestBuilderTests: XCTestCase {
         XCTAssertTrue(url.contains("c=\(Constants.versionString())"), "URL should contain the version string")
         XCTAssertTrue(url.contains("key=\(testACKey)"), "URL should contain the api key")
     }
-    
+
     func testTrackAutocompleteSelectBuilder_WithCustomBaseURL() {
         let customBaseURL = "https://custom-base-url.com"
         self.builder = RequestBuilder(apiKey: testACKey, baseURL: customBaseURL)
diff --git a/AutocompleteClientTests/FW/Logic/Request/TrackConversionRequestBuilderTests.swift b/AutocompleteClientTests/FW/Logic/Request/TrackConversionRequestBuilderTests.swift
@@ -46,15 +46,15 @@ class TrackConversionRequestBuilderTests: XCTestCase {
         XCTAssertTrue(url.contains("c=cioios-"), "URL should contain the version string.")
         XCTAssertTrue(url.contains("key=\(testACKey)"), "URL should contain the api key.")
     }
-    
+
     func testTrackConversionBuilder_WithCustomBaseURL() {
         let tracker = CIOTrackConversionData(searchTerm: self.searchTerm, itemName: self.itemName, customerID: self.customerID)
         let customBaseURL = "https://custom-base-url.com"
         self.builder = RequestBuilder(apiKey: testACKey, baseURL: customBaseURL)
         builder.build(trackData: tracker)
         let request = builder.getRequest()
         let url = request.url!.absoluteString
-        
+
         XCTAssertTrue(url.hasPrefix(customBaseURL))
     }
 
diff --git a/AutocompleteClientTests/FW/Logic/Request/TrackInputFocusRequestBuilderTests.swift b/AutocompleteClientTests/FW/Logic/Request/TrackInputFocusRequestBuilderTests.swift
@@ -36,16 +36,16 @@ class TrackInputFocusRequestBuilderTests: XCTestCase {
         XCTAssertTrue(url.contains("c=\(Constants.versionString())"), "URL should contain the version string")
         XCTAssertTrue(url.contains("key=\(testACKey)"), "URL should contain the api key")
     }
-    
+
     func testTrackInputFocusBuilder_WithCustomBaseURL() {
         let tracker = CIOTrackInputFocusData(searchTerm: searchTerm)
         let customBaseURL = "https://custom-base-url.com"
         self.builder = RequestBuilder(apiKey: testACKey, baseURL: customBaseURL)
         builder.build(trackData: tracker)
         let request = builder.getRequest()
         let url = request.url!.absoluteString
-        
+
         XCTAssertTrue(url.hasPrefix(customBaseURL))
     }
-    
+
 }
diff --git a/AutocompleteClientTests/FW/Logic/Request/TrackPurchaseRequestBuilderTests.swift b/AutocompleteClientTests/FW/Logic/Request/TrackPurchaseRequestBuilderTests.swift
@@ -43,15 +43,15 @@ class TrackPurchaseRequestBuilderTests: XCTestCase {
         XCTAssertTrue(url.contains("c=cioios-"), "URL should contain the version string.")
         XCTAssertTrue(url.contains("key=\(testACKey)"), "URL should contain the api key.")
     }
-    
+
     func testTrackPurchaseBuilder_WithCustomBaseURL() {
         let tracker = CIOTrackPurchaseData(customerIDs: self.customerIDs)
         let customBaseURL = "https://custom-base-url.com"
         self.builder = RequestBuilder(apiKey: testACKey, baseURL: customBaseURL)
         builder.build(trackData: tracker)
         let request = builder.getRequest()
         let url = request.url!.absoluteString
-        
+
         XCTAssertTrue(url.hasPrefix(customBaseURL))
     }
 
@@ -70,7 +70,7 @@ class TrackPurchaseRequestBuilderTests: XCTestCase {
         XCTAssertTrue(url.contains("key=\(testACKey)"), "URL should contain the api key.")
     }
 
-    func testTrackPurchaseBuilder_WithRevenue(){
+    func testTrackPurchaseBuilder_WithRevenue() {
         let tracker = CIOTrackPurchaseData(customerIDs: self.customerIDs, sectionName: self.sectionName, revenue: self.revenue)
         builder.build(trackData: tracker)
         let request = builder.getRequest()
diff --git a/AutocompleteClientTests/FW/Logic/Request/TrackSearchResultClickRequestBuilder.swift b/AutocompleteClientTests/FW/Logic/Request/TrackSearchResultClickRequestBuilder.swift
@@ -46,15 +46,15 @@ class TrackSearchResultClickRequestBuilderTests: XCTestCase {
         XCTAssertTrue(url.contains("c=\(Constants.versionString())"), "URL should contain the version string")
         XCTAssertTrue(url.contains("key=\(testACKey)"), "URL should contain the api key")
     }
-    
+
     func testTrackSearchResultClickBuilder_WithCustomBaseURL() {
         let tracker = CIOTrackSearchResultClickData(searchTerm: searchTerm, itemName: itemName, customerID: customerID)
         let customBaseURL = "https://custom-base-url.com"
         self.builder = RequestBuilder(apiKey: testACKey, baseURL: customBaseURL)
         builder.build(trackData: tracker)
         let request = builder.getRequest()
         let url = request.url!.absoluteString
-        
+
         XCTAssertTrue(url.hasPrefix(customBaseURL))
     }
 
diff --git a/AutocompleteClientTests/FW/Logic/Request/TrackSearchResultsLoadedRequestBuilder.swift b/AutocompleteClientTests/FW/Logic/Request/TrackSearchResultsLoadedRequestBuilder.swift
@@ -38,15 +38,15 @@ class TrackSearchResultsLoadedRequestBuilderTests: XCTestCase {
         XCTAssertTrue(url.contains("c=\(Constants.versionString())"), "URL should contain the version string")
         XCTAssertTrue(url.contains("key=\(testACKey)"), "URL should contain the api key")
     }
-    
+
     func testTrackSearchResultsLoadedBuilder_WithCustomBaseURL() {
         let tracker = CIOTrackSearchResultsLoadedData(searchTerm: searchTerm, resultCount: resultCount)
         let customBaseURL = "https://custom-base-url.com"
         self.builder = RequestBuilder(apiKey: testACKey, baseURL: customBaseURL)
         builder.build(trackData: tracker)
         let request = builder.getRequest()
         let url = request.url!.absoluteString
-        
+
         XCTAssertTrue(url.hasPrefix(customBaseURL))
-    }   
+    }
 }
diff --git a/AutocompleteClientTests/FW/Logic/Request/TrackSearchSubmitRequestBuilder.swift b/AutocompleteClientTests/FW/Logic/Request/TrackSearchSubmitRequestBuilder.swift
@@ -39,18 +39,18 @@ class TrackSearchSubmitRequestBuilderTests: XCTestCase {
         XCTAssertTrue(url.contains("c=\(Constants.versionString())"), "URL should contain the version string")
         XCTAssertTrue(url.contains("key=\(testACKey)"), "URL should contain the api key")
     }
-    
+
     func testTrackSearchSubmitBuilder_WithCustomBaseURL() {
         let tracker = CIOTrackSearchSubmitData(searchTerm: searchTerm, originalQuery: originalQuery)
         let customBaseURL = "https://custom-base-url.com"
         self.builder = RequestBuilder(apiKey: testACKey, baseURL: customBaseURL)
         builder.build(trackData: tracker)
         let request = builder.getRequest()
         let url = request.url!.absoluteString
-        
+
         XCTAssertTrue(url.hasPrefix(customBaseURL))
     }
-    
+
     func testTrackSearchSubmitBuilder_WithGroup() {
         let tracker = CIOTrackSearchSubmitData(searchTerm: searchTerm, originalQuery: originalQuery, group: group)
         builder.build(trackData: tracker)
diff --git a/AutocompleteClientTests/FW/Logic/Request/TrackSessionStartRequestBuilder.swift b/AutocompleteClientTests/FW/Logic/Request/TrackSessionStartRequestBuilder.swift
@@ -33,21 +33,20 @@ class TrackSessionStartRequestBuilderTests: XCTestCase {
         XCTAssertTrue(url.contains("c=\(Constants.versionString())"), "URL should contain the version string")
         XCTAssertTrue(url.contains("key=\(testACKey)"), "URL should contain the api key")
     }
-    
+
     func testTrackSessionStartBuilder_WithCustomBaseURL() {
         let tracker = CIOTrackSessionStartData(session: session)
         let customBaseURL = "https://custom-base-url.com"
         self.builder = RequestBuilder(apiKey: testACKey, baseURL: customBaseURL)
         builder.build(trackData: tracker)
         let request = builder.getRequest()
         let url = request.url!.absoluteString
-        
+
         XCTAssertEqual(request.httpMethod, "GET")
         XCTAssertTrue(url.hasPrefix(customBaseURL))
         XCTAssertTrue(url.contains("action=session_start"), "URL should contain the session start action")
         XCTAssertTrue(url.contains("c=\(Constants.versionString())"), "URL should contain the version string")
         XCTAssertTrue(url.contains("key=\(testACKey)"), "URL should contain the api key")
     }
-    
-    
+
 }
diff --git a/AutocompleteClientTests/FW/Logic/Session/SessionManagerTests.swift b/AutocompleteClientTests/FW/Logic/Session/SessionManagerTests.swift
@@ -38,7 +38,7 @@ class SessionManagerTests: XCTestCase {
 
         let nextSession = manager.getSessionWithIncrement()
 
-        XCTAssertEqual(nextSession, initialSession+1, "After reaching timeout, getSessionWithIncrement() should return incremented value.")
+        XCTAssertEqual(nextSession, initialSession + 1, "After reaching timeout, getSessionWithIncrement() should return incremented value.")
     }
 
     func testSession_Increments_IfTimeoutIsZero() {
diff --git a/AutocompleteClientTests/FW/Logic/Worker/ConstructorIOSearchTests.swift b/AutocompleteClientTests/FW/Logic/Worker/ConstructorIOSearchTests.swift
diff --git a/AutocompleteClientTests/FW/Logic/Worker/SearchTests.swift b/AutocompleteClientTests/FW/Logic/Worker/SearchTests.swift
diff --git a/AutocompleteClientTests/FW/UI/Other/DefaultSearchItemCellTests.swift b/AutocompleteClientTests/FW/UI/Other/DefaultSearchItemCellTests.swift
diff --git a/AutocompleteClientTests/FW/UI/ViewController/AutocompleteViewControllerTests.swift b/AutocompleteClientTests/FW/UI/ViewController/AutocompleteViewControllerTests.swift
diff --git a/AutocompleteClientTests/Utils/String/StringTrimTests.swift b/AutocompleteClientTests/Utils/String/StringTrimTests.swift
diff --git a/ConstructorAutocomplete.podspec b/ConstructorAutocomplete.podspec

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ struct QueryItemCollection {`
`13`	`13`
`14`	`14`	`init() {}`
`15`	`15`
`16`		`- mutating func add(key: String,items: [URLQueryItem]) {`
	`16`	`+ mutating func add(key: String, items: [URLQueryItem]) {`
`17`	`17`	`queryItems[key] = items`
`18`	`18`	`}`
`19`	`19`
`@@ -31,15 +31,15 @@ struct QueryItemCollection {`
`31`	`31`	`}`
`32`	`32`	`set {`
`33`	`33`	`if let newValue = newValue {`
`34`		`- if var existingArray = queryItems[value]{`
	`34`	`+ if var existingArray = queryItems[value] {`
`35`	`35`	`existingArray.append(contentsOf: newValue)`
`36`	`36`	`queryItems[value] = existingArray`
`37`	`37`	`} else {`
`38`	`38`	`queryItems[value] = newValue`
`39`	`39`	`}`
`40`	`40`	`} else {`
`41`	`41`	`queryItems.removeValue(forKey: value)`
`42`		`- }`
	`42`	`+ }`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public struct CIOSearchQuery: CIORequestData {`
`50`	`50`	`self.query = query.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!`
`51`	`51`	`self.filters = filters`
`52`	`52`	`self.page = page`
`53`		`- self.section = section != nil ? section! : Constants.SearchQuery.defaultSectionName;`
	`53`	`+ self.section = section != nil ? section! : Constants.SearchQuery.defaultSectionName`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func decorateRequest(requestBuilder: RequestBuilder) {`
`@@ -60,4 +60,3 @@ public struct CIOSearchQuery: CIORequestData {`
`60`	`60`	`requestBuilder.set(searchSection: self.section)`
`61`	`61`	`}`
`62`	`62`	`}`
`63`		`-`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ struct CIOTrackConversionData: CIORequestData {`
`20`	`20`	`let revenue: Double?`
`21`	`21`
`22`	`22`	`func url(with baseURL: String) -> String {`
`23`		`- return String(format: Constants.TrackConversion.format, baseURL, self.searchTerm.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!)`
	`23`	`+ return String(format: Constants.TrackConversion.format, baseURL, self.searchTerm.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`init(searchTerm: String, itemName: String, customerID: String, sectionName: String? = nil, revenue: Double? = nil) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ struct CIOTrackSearchSubmitData: CIORequestData {`
`17`	`17`	`let originalQuery: String`
`18`	`18`	`let group: CIOGroup?`
`19`	`19`
`20`		`- func url(with baseURL: String) -> String{`
	`20`	`+ func url(with baseURL: String) -> String {`
`21`	`21`	`return String(format: Constants.TrackSearchSubmit.format, baseURL, self.searchTerm.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!)`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ extension SearchResultData {`
`36`	`36`	`self.url = json["url"] as? String`
`37`	`37`
`38`	`38`	`var metadata = json`
`39`		`- for key in [ "id", "facets", "groups", "image_url", "quantity", "url" ]{`
	`39`	`+ for key in [ "id", "facets", "groups", "image_url", "quantity", "url" ] {`
`40`	`40`	`metadata.removeValue(forKey: key)`
`41`	`41`	`}`
`42`	`42`	`self.metadata = metadata`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class CIOSessionManager: SessionManager {`
`29`	`29`
`30`	`30`	`self.sessionLoader = sessionLoader`
`31`	`31`	`self.session = self.sessionLoader.loadSession() ?? Session(id: 1, createdAt: dateProvider.provideDate().timeIntervalSince1970)`
`32`		`-`
	`32`	`+`
`33`	`33`	`NotificationCenter.default.addObserver(self, selector: #selector(applicationDidEnterForeground(_:)), name: UIApplication.willEnterForegroundNotification, object: nil)`
`34`	`34`	`}`
`35`	`35`