Move model objects to their own source files

Author: Daniel Browne

Sources/Helpers/PusherEventFactory.swift

@@ -45,12 +45,3 @@ struct PusherConcreteEventFactory: PusherEventFactory {
 // MARK: - Types
 
 typealias PusherEventPayload = [String: Any]
-
-// MARK: - Error handling
-
-enum PusherEventError: Error {
-
-    case invalidFormat
-    case invalidDecryptionKey
-    case invalidEncryptedData
-}

Sources/Models/AuthMethod.swift

@@ -0,0 +1,9 @@
+import Foundation
+
+public enum AuthMethod {
+    case endpoint(authEndpoint: String)
+    case authRequestBuilder(authRequestBuilder: AuthRequestBuilderProtocol)
+    case authorizer(authorizer: Authorizer)
+    case inline(secret: String)
+    case noMethod
+}

Sources/Models/ConnectionState.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+@objc public enum ConnectionState: Int {
+    case connecting
+    case connected
+    case disconnecting
+    case disconnected
+    case reconnecting
+
+    static let connectionStates = [
+        connecting: "connecting",
+        connected: "connected",
+        disconnecting: "disconnecting",
+        disconnected: "disconnected",
+        reconnecting: "reconnecting"
+    ]
+
+    public func stringValue() -> String {
+        return ConnectionState.connectionStates[self]!
+    }
+}

Sources/Models/EventHandler.swift

@@ -0,0 +1,6 @@
+import Foundation
+
+public struct EventHandler {
+    let id: String
+    let callback: (PusherEvent) -> Void
+}

Sources/Models/PusherAuth.swift

@@ -0,0 +1,13 @@
+import Foundation
+
+@objc public class PusherAuth: NSObject {
+    public let auth: String
+    public let channelData: String?
+    public let sharedSecret: String?
+
+    public init(auth: String, channelData: String? = nil, sharedSecret: String? = nil) {
+        self.auth = auth
+        self.channelData = channelData
+        self.sharedSecret = sharedSecret
+    }
+}

Sources/Models/PusherAuthError.swift

@@ -0,0 +1,19 @@
+import Foundation
+
+struct PusherAuthError: Error {
+    enum Kind {
+        case notConnected
+        case noMethod
+        case couldNotBuildRequest
+        case invalidAuthResponse
+        case requestFailure
+    }
+
+    let kind: Kind
+
+    var message: String?
+
+    var response: URLResponse?
+    var data: String?
+    var error: NSError?
+}

Sources/Models/PusherChannel.swift

@@ -1,29 +1,5 @@
 import Foundation
 
-public enum PusherChannelType {
-    case `private`
-    case presence
-    case normal
-
-    public init(name: String) {
-        self = Self.type(forName: name)
-    }
-
-    public static func type(forName name: String) -> PusherChannelType {
-        if name.components(separatedBy: "-")[0] == Constants.ChannelTypes.presence {
-            return .presence
-        } else if name.components(separatedBy: "-")[0] == Constants.ChannelTypes.private {
-            return .private
-        } else {
-            return .normal
-        }
-    }
-
-    public static func isPresenceChannel(name: String) -> Bool {
-        return PusherChannelType(name: name) == .presence
-    }
-}
-
 @objcMembers
 open class PusherChannel: NSObject {
     // Access via queue for thread safety if user binds/unbinds events to a channel off the main queue
@@ -202,13 +178,3 @@ open class PusherChannel: NSObject {
         }
     }
 }
-
-public struct EventHandler {
-    let id: String
-    let callback: (PusherEvent) -> Void
-}
-
-public struct QueuedClientEvent {
-    public let name: String
-    public let data: Any
-}

Sources/Models/PusherChannelType.swift

@@ -0,0 +1,25 @@
+import Foundation
+
+public enum PusherChannelType {
+    case `private`
+    case presence
+    case normal
+
+    public init(name: String) {
+        self = Self.type(forName: name)
+    }
+
+    public static func type(forName name: String) -> PusherChannelType {
+        if name.components(separatedBy: "-")[0] == Constants.ChannelTypes.presence {
+            return .presence
+        } else if name.components(separatedBy: "-")[0] == Constants.ChannelTypes.private {
+            return .private
+        } else {
+            return .normal
+        }
+    }
+
+    public static func isPresenceChannel(name: String) -> Bool {
+        return PusherChannelType(name: name) == .presence
+    }
+}

Sources/Models/PusherClientOptions.swift

@@ -1,25 +1,5 @@
 import Foundation
 
-public enum PusherHost {
-    case host(String)
-    case cluster(String)
-
-    public var stringValue: String {
-        switch self {
-        case .host(let host): return host
-        case .cluster(let cluster): return "ws-\(cluster).pusher.com"
-        }
-    }
-}
-
-public enum AuthMethod {
-    case endpoint(authEndpoint: String)
-    case authRequestBuilder(authRequestBuilder: AuthRequestBuilderProtocol)
-    case authorizer(authorizer: Authorizer)
-    case inline(secret: String)
-    case noMethod
-}
-
 @objcMembers
 @objc public class PusherClientOptions: NSObject {
     public var authMethod: AuthMethod

Sources/Models/PusherEventError.swift

@@ -0,0 +1,8 @@
+import Foundation
+
+enum PusherEventError: Error {
+
+    case invalidFormat
+    case invalidDecryptionKey
+    case invalidEncryptedData
+}