Merge branch 'develop'

Author: rubikzube

.gitignore

@@ -8,6 +8,7 @@
 ## Build generated
 build/
 DerivedData/
+Index/
 
 ## Various settings
 *.pbxuser

.swift-version

@@ -0,0 +1 @@
+3.2

AutocompleteClient.xcodeproj/project.pbxproj

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

AutocompleteClient.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -57,7 +56,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

AutocompleteClient.xcodeproj/xcshareddata/xcschemes/AutocompleteClient.xcscheme

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

AutocompleteClient.xcworkspace/contents.xcworkspacedata

@@ -50,29 +50,31 @@ struct Constants {
     }
 
     struct Query {
-        static let autocompleteKey = "autocomplete_key"
+        static let apiKey = "key"
         static let baseURLString = "https://ac.cnstrc.com"
         static let httpMethod = "GET"
         static let queryStringFormat = "%@/%@/%@"
 
         static let sessionIncrementTimeoutInSeconds: TimeInterval = 1800 // 30 mins
     }
 
+    struct ClientID {
+        static let key = "kClientID"
+    }
+    
     struct AutocompleteQuery {
         static let pathString = "autocomplete"
         static let numResults = "num_results"
         static let numResultsForSectionNamePrefix = "num_results_"
-    }
-
-    struct SearchQuery {
-        static let pathString = "search"
-        static let page = "page"
-        static let numResultsPerPage = "num_results_per_page"
-        static let numResultsPerPageForSectionNamePrefix = "num_results_per_page_"
+        static let queryItemForSection = { (name: String) -> String in return Constants.AutocompleteQuery.numResultsForSectionNamePrefix + name }
+        
+        static let sectionNameSearchSuggestions = "Search Suggestions"
+        static let sectionNameProducts = "Products"
+        
+        static let defaultItemCountPerSection = 10
     }
 
     struct Response {
-//        static let expectedStatusCode = 200
         static let singleSectionResultField = "suggestions"
         static let multiSectionResultField = "sections"
     }
@@ -91,54 +93,52 @@ struct Constants {
 
     struct Track {
         static let httpMethod = "GET"
-        static let autocompleteKey = "autocomplete_key"
+        static let apiKey = "key"
         static let baseURLString = "https://ac.cnstrc.com"
-        static let trackStringFormat = "%@/%@/%@/%@"
-        static let trackBehaviorStringFormat = "%@/%@"
         static let expectedStatusCode = 204
-        
-        static let dateTime = "_dt"
-        static let defaultTrackingSectionName = "Products"
-    }
-
-    struct TrackAutocomplete {
-        static let pathString = "autocomplete"
+    
         static let autocompleteSection = "autocomplete_section"
         static let searchTerm = "term"
-        static let action = "action"
-        static let actionSearchResults = "search-results"
-        static let actionFocus = "focus"
-        static let actionSessionStart = "session_start"
-    }
-
-    struct TrackSearch{
-        static let format = "%@/autocomplete/%@/search"
-        static let originalQuery = "original_query"
-        static let pathBehavior = "behavior"
-    }
-    
-    struct TrackAutocompleteResultClicked {
-        static let selectType = "select"
-        static let searchType = "search"
-        static let type = "select"
         static let trigger = "tr"
         static let triggerType = "click"
         static let originalQuery = "original_query"
         static let groupName = "group[group_name]"
         static let groupID = "group[group_id]"
-    }
-
-    struct TrackConversion {
-        static let type = "conversion"
-        static let item = "item"
         static let itemId = "item_id"
         static let revenue = "revenue"
+        static let dateTime = "_dt"
+        static let defaultItemSectionName = "Products"
+    }
+
+    struct TrackSessionStart {
+        static let format = "%@/behavior?action=session_start"
+    }
+    
+    struct TrackInputFocus {
+        static let format = "%@/behavior?action=focus"
+    }
+    
+    struct TrackAutocompleteSelect {
+        static let format = "%@/autocomplete/%@/select"
     }
 
-    struct TrackSearchTermTyped {
-        static let type = "search"
+    struct TrackSearchSubmit {
+        static let format = "%@/autocomplete/%@/search"
+    }
+    
+    struct TrackSearchResultsLoaded {
+        static let format = "%@/behavior?action=search-results"
+    }
+    
+    struct TrackSearchClickThrough {
+        static let format = "%@/autocomplete/%@/click_through"
     }
 
+    struct TrackConversion {
+        static let format = "%@/autocomplete/%@/conversion"
+
+    }
+
     struct Logging{
         private static let prefix = "[ConstructorIO]:"
         private static let format: (_ message: String) -> String = { message in return "\(Logging.prefix) \(message)" }

AutocompleteClient.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -6,15 +6,15 @@
 //  http://constructor.io/
 //
 
-import UIKit
+import Foundation
 
 /**
  Task response must be constructed through one of the two constructors so it's impossible to have a response
  that has no data and no error
 */
 public class TaskResponse<T, E> {
-    let data: T?
-    let error: E?
+    public let data: T?
+    public let error: E?
 
     init(data: T) {
         self.data = data