fix: cleanup type names

Author: jonathannorris

DevCycle/DevCycleClient.swift

@@ -391,11 +391,11 @@ public class DevCycleClient {
         return self.config?.userConfig?.variables ?? [:]
     }
 
-    public func subscribe(_ handler: SubscribeHandlers) {
+    public func subscribe(_ handler: DevCycleEventHandlers) {
         self.eventEmitter.subscribe(handler)
     }
 
-    public func unsubscribe(_ handler: SubscribeHandlers) {
+    public func unsubscribe(_ handler: DevCycleEventHandlers) {
         self.eventEmitter.unsubscribe(handler)
     }
 

DevCycle/Utils/EventEmitter.swift

@@ -8,39 +8,36 @@ public typealias EventHandler = (Any?) -> Void
 public typealias SubscribeErrorHandler = (Error) -> Void
 public typealias SubscribeInitializedHandler = (Bool) -> Void
 
-public struct SubscribeError {
+public struct ErrorHandler {
     // Had to add this index field, because I can't make this struct Equitable to do a equality comparison
     // because you can't compare anon function pointers... so it was either this or generate a UUID to compare.
     fileprivate var index: Int?
     var handler: SubscribeErrorHandler
-    let key = "error"
-    
 
     public init(_ handler: @escaping SubscribeErrorHandler) {
         self.handler = handler
     }
 }
 
-public struct SubscribeInitialized {
+public struct InitializedHandler {
     fileprivate var index: Int?
     var handler: SubscribeInitializedHandler
-    let key = "initialized"
 
     public init(_ handler: @escaping SubscribeInitializedHandler) {
         self.handler = handler
     }
 }
 
-public enum SubscribeHandlers {
-    case error(SubscribeError)
-    case initialized(SubscribeInitialized)
+public enum DevCycleEventHandlers {
+    case error(ErrorHandler)
+    case initialized(InitializedHandler)
 }
 
 class EventEmitter {
-    var errorHandlers: [SubscribeError] = []
-    var initHandlers: [SubscribeInitialized] = []
+    var errorHandlers: [ErrorHandler] = []
+    var initHandlers: [InitializedHandler] = []
 
-    func subscribe(_ handler: SubscribeHandlers) {
+    func subscribe(_ handler: DevCycleEventHandlers) {
         switch handler {
         case .error(var errorHandler):
             self.errorHandlers.append(errorHandler)
@@ -53,7 +50,7 @@ class EventEmitter {
         }
     }
 
-    func unsubscribe(_ handler: SubscribeHandlers) {
+    func unsubscribe(_ handler: DevCycleEventHandlers) {
         switch handler {
         case .error(let errorHandler):
             if let index = errorHandler.index {
@@ -69,9 +66,7 @@ class EventEmitter {
     }
 
     func emitError(_ err: Error) {
-        self.errorHandlers.forEach { errSub in
-            errSub.handler(err)
-        }
+        self.errorHandlers.forEach { errHandler in errHandler.handler(err) }
     }
 
     func emitInitialized(_ success: Bool) {

Examples/DevCycle-iOS-Example-App-Swift/DevCycle-iOS-Example-App-Swift/DevCycleManager.swift

@@ -32,11 +32,11 @@ class DevCycleManager {
         self.client = client
 
 
-        client.subscribe(SubscribeHandlers.error(SubscribeError { error in
+        client.subscribe(DevCycleEventHandlers.error(ErrorHandler { error in
             print("DevCycle Error: \(error.localizedDescription)")
         }))
-        client.subscribe(SubscribeHandlers.initialized(SubscribeInitialized({ success in
+        client.subscribe(DevCycleEventHandlers.initialized(InitializedHandler { success in
             print("DevCycle Initialized: \(success) from subscription")
-        })))
+        }))
     }
 }