Resolve SwiftLint 'line_length' warnings.

Author: danielrbrowne

Sources/ObjectiveC.swift

@@ -14,15 +14,21 @@ import Foundation
     }
 
     func subscribeToPresenceChannel(channelName: String) -> PusherPresenceChannel {
-        return self.subscribeToPresenceChannel(channelName: channelName, auth: nil, onMemberAdded: nil, onMemberRemoved: nil)
+        return self.subscribeToPresenceChannel(channelName: channelName,
+                                               auth: nil,
+                                               onMemberAdded: nil,
+                                               onMemberRemoved: nil)
     }
 
     func subscribeToPresenceChannel(
         channelName: String,
         onMemberAdded: ((PusherPresenceChannelMember) -> Void)? = nil,
         onMemberRemoved: ((PusherPresenceChannelMember) -> Void)? = nil
     ) -> PusherPresenceChannel {
-        return self.subscribeToPresenceChannel(channelName: channelName, auth: nil, onMemberAdded: onMemberAdded, onMemberRemoved: onMemberRemoved)
+        return self.subscribeToPresenceChannel(channelName: channelName,
+                                               auth: nil,
+                                               onMemberAdded: onMemberAdded,
+                                               onMemberRemoved: onMemberRemoved)
     }
 
     convenience init(withAppKey key: String, options: PusherClientOptions) {

Sources/PusherChannel.swift

@@ -173,7 +173,8 @@ open class PusherChannel: NSObject {
     open func trigger(eventName: String, data: Any) {
         if PusherEncryptionHelpers.isEncryptedChannel(channelName: self.name) {
             let error = """
-            ERROR: Client events are not supported on encrypted channels: '\(self.name)'. Client event '\(eventName)' will not be sent.
+            ERROR: Client events are not supported on encrypted channels: '\(self.name)'. \
+            Client event '\(eventName)' will not be sent.
             """
             print(error)
             return

Sources/PusherConnection.swift

@@ -43,7 +43,11 @@ import Starscream
         let reachability = try? Reachability()
         reachability?.whenReachable = { [weak self] reachability in
             guard let self = self else {
-                print("Your Pusher instance has probably become deallocated. See https://github.com/pusher/pusher-websocket-swift/issues/109 for more information")
+                print("""
+                    Your Pusher instance has probably become deallocated. \
+                    See https://github.com/pusher/pusher-websocket-swift/issues/109 \
+                    for more information
+                    """)
                 return
             }
 
@@ -72,7 +76,11 @@ import Starscream
         }
         reachability?.whenUnreachable = { [weak self] reachability in
             guard let self = self else {
-                print("Your Pusher instance has probably become deallocated. See https://github.com/pusher/pusher-websocket-swift/issues/109 for more information")
+                print("""
+                    Your Pusher instance has probably become deallocated. \
+                    See https://github.com/pusher/pusher-websocket-swift/issues/109 \
+                    for more information
+                    """)
                 return
             }
 
@@ -487,7 +495,8 @@ import Starscream
 
             if PusherChannelType.isPresenceChannel(name: channelName) {
                 if let presChan = self.channels.find(name: channelName) as? PusherPresenceChannel {
-                    if let dataJSON = event.dataToJSONObject() as? [String: Any], let presenceData = dataJSON["presence"] as? [String: AnyObject],
+                    if let dataJSON = event.dataToJSONObject() as? [String: Any],
+                        let presenceData = dataJSON["presence"] as? [String: AnyObject],
                        let presenceHash = presenceData["hash"] as? [String: AnyObject] {
                         presChan.addExistingMembers(memberHash: presenceHash)
                     }
@@ -524,7 +533,8 @@ import Starscream
             self.reconnectAttempts = 0
             self.reconnectTimer?.invalidate()
 
-            if options.activityTimeout == nil, let activityTimeoutFromServer = connectionData["activity_timeout"] as? TimeInterval {
+            if options.activityTimeout == nil,
+                let activityTimeoutFromServer = connectionData["activity_timeout"] as? TimeInterval {
                 self.activityTimeoutInterval = activityTimeoutFromServer
             }
 
@@ -550,7 +560,8 @@ import Starscream
         - parameter event: The event to be processed
     */
     fileprivate func handleMemberAddedEvent(event: PusherEvent) {
-        if let channelName = event.channelName, let chan = self.channels.find(name: channelName) as? PusherPresenceChannel {
+        if let channelName = event.channelName,
+            let chan = self.channels.find(name: channelName) as? PusherPresenceChannel {
             if let memberJSON = event.dataToJSONObject() as? [String: Any] {
                 chan.addMember(memberJSON: memberJSON)
             } else {
@@ -565,7 +576,8 @@ import Starscream
         - parameter event: The event to be processed
     */
     fileprivate func handleMemberRemovedEvent(event: PusherEvent) {
-        if let channelName = event.channelName, let chan = self.channels.find(name: channelName) as? PusherPresenceChannel {
+        if let channelName = event.channelName,
+            let chan = self.channels.find(name: channelName) as? PusherPresenceChannel {
             if let memberJSON = event.dataToJSONObject() as? [String: Any] {
                 chan.removeMember(memberJSON: memberJSON)
             } else {
@@ -607,7 +619,10 @@ import Starscream
             if let message = error.message {
                 print(message)
             }
-            self.delegate?.failedToSubscribeToChannel?(name: channelName, response: error.response, data: error.data, error: error.error)
+            self.delegate?.failedToSubscribeToChannel?(name: channelName,
+                                                       response: error.response,
+                                                       data: error.data,
+                                                       error: error.error)
         }
     }
 
@@ -682,7 +697,8 @@ import Starscream
         }
     }
 
-    fileprivate func requestPusherAuthFromAuthMethod(channel: PusherChannel, completionHandler:@escaping (PusherAuth?, PusherAuthError?) -> Void) -> Bool {
+    fileprivate func requestPusherAuthFromAuthMethod(channel: PusherChannel,
+                                                     completionHandler: @escaping (PusherAuth?, PusherAuthError?) -> Void) -> Bool {
         guard let socketId = self.socketId else {
             let message = "socketId value not found. You may not be connected."
             completionHandler(nil, PusherAuthError(kind: .notConnected, message: message))
@@ -692,7 +708,9 @@ import Starscream
         switch self.options.authMethod {
         case .noMethod:
             let errorMessage = "Authentication method required for private / presence channels but none provided."
-            let error = NSError(domain: "com.pusher.PusherSwift", code: 0, userInfo: [NSLocalizedFailureReasonErrorKey: errorMessage])
+            let error = NSError(domain: "com.pusher.PusherSwift",
+                                code: 0,
+                                userInfo: [NSLocalizedFailureReasonErrorKey: errorMessage])
             completionHandler(nil, PusherAuthError(kind: .noMethod, message: errorMessage, error: error))
             return false
         case .endpoint(authEndpoint: let authEndpoint):
@@ -705,8 +723,12 @@ import Starscream
                 return true
             } else {
                 let errorMessage = "Authentication request could not be built"
-                let error = NSError(domain: "com.pusher.PusherSwift", code: 0, userInfo: [NSLocalizedFailureReasonErrorKey: errorMessage])
-                completionHandler(nil, PusherAuthError(kind: .couldNotBuildRequest, message: errorMessage, error: error))
+                let error = NSError(domain: "com.pusher.PusherSwift",
+                                    code: 0,
+                                    userInfo: [NSLocalizedFailureReasonErrorKey: errorMessage])
+                completionHandler(nil, PusherAuthError(kind: .couldNotBuildRequest,
+                                                       message: errorMessage,
+                                                       error: error))
                 return false
             }
         case .authorizer(authorizer: let authorizer):
@@ -807,36 +829,53 @@ import Starscream
         - parameter request: The request to send
         - parameter channel: The PusherChannel to authenticate subsciption for
     */
-    fileprivate func sendAuthorisationRequest(request: URLRequest, channel: PusherChannel, completionHandler: @escaping (PusherAuth?, PusherAuthError?) -> Void) {
+    fileprivate func sendAuthorisationRequest(request: URLRequest,
+                                              channel: PusherChannel,
+                                              completionHandler: @escaping (PusherAuth?, PusherAuthError?) -> Void) {
         let task = URLSession.dataTask(with: request, completionHandler: { data, response, sessionError in
             if let error = sessionError {
                 let message = "Error authorizing channel [\(channel.name)]: \(error)"
-                completionHandler(nil, PusherAuthError(kind: .requestFailure, message: message, response: response, error: error as NSError?))
+                completionHandler(nil, PusherAuthError(kind: .requestFailure,
+                                                       message: message,
+                                                       response: response,
+                                                       error: error as NSError?))
                 return
             }
 
             guard let data = data else {
                 let message = "Error authorizing channel [\(channel.name)]"
-                completionHandler(nil, PusherAuthError(kind: .invalidAuthResponse, message: message, response: response))
+                completionHandler(nil, PusherAuthError(kind: .invalidAuthResponse,
+                                                       message: message,
+                                                       response: response))
                 return
             }
 
-            guard let httpResponse = response as? HTTPURLResponse, (httpResponse.statusCode == 200 || httpResponse.statusCode == 201) else {
+            guard let httpResponse = response as? HTTPURLResponse,
+                (httpResponse.statusCode == 200 || httpResponse.statusCode == 201) else {
                 let dataString = String(data: data, encoding: String.Encoding.utf8)
                 let message = "Error authorizing channel [\(channel.name)]: \(String(describing: dataString))"
-                completionHandler(nil, PusherAuthError(kind: .invalidAuthResponse, message: message, response: response, data: dataString))
+                completionHandler(nil, PusherAuthError(kind: .invalidAuthResponse,
+                                                       message: message,
+                                                       response: response,
+                                                       data: dataString))
                 return
             }
 
-            guard let jsonObject = try? JSONSerialization.jsonObject(with: data, options: []), let json = jsonObject as? [String: AnyObject] else {
+            guard let jsonObject = try? JSONSerialization.jsonObject(with: data,
+                                                                     options: []),
+                let json = jsonObject as? [String: AnyObject] else {
                 let message = "Error authorizing channel [\(channel.name)]: Could not parse response from auth endpoint"
-                completionHandler(nil, PusherAuthError(kind: .invalidAuthResponse, message: message, response: httpResponse))
+                completionHandler(nil, PusherAuthError(kind: .invalidAuthResponse,
+                                                       message: message,
+                                                       response: httpResponse))
                 return
             }
 
             guard let auth = json["auth"] as? String else {
                 let message = "Error authorizing channel [\(channel.name)]: No auth field in response"
-                completionHandler(nil, PusherAuthError(kind: .invalidAuthResponse, message: message, response: httpResponse))
+                completionHandler(nil, PusherAuthError(kind: .invalidAuthResponse,
+                                                       message: message,
+                                                       response: httpResponse))
                 return
             }
 
@@ -919,7 +958,9 @@ extension PusherConnection: PusherEventQueueDelegate {
         }
     }
 
-    func eventQueue(_ eventQueue: PusherEventQueue, didFailToDecryptEventWithPayload payload: PusherEventPayload, forChannelName channelName: String) {
+    func eventQueue(_ eventQueue: PusherEventQueue,
+                    didFailToDecryptEventWithPayload payload: PusherEventPayload,
+                    forChannelName channelName: String) {
         DispatchQueue.main.async {
             if let eventName = payload["event"] as? String {
                 let data = payload["data"] as? String
@@ -929,7 +970,9 @@ extension PusherConnection: PusherEventQueueDelegate {
         }
     }
 
-    func eventQueue(_ eventQueue: PusherEventQueue, didReceiveEvent event: PusherEvent, forChannelName channelName: String?) {
+    func eventQueue(_ eventQueue: PusherEventQueue,
+                    didReceiveEvent event: PusherEvent,
+                    forChannelName channelName: String?) {
         DispatchQueue.main.async {
             self.handleEvent(event: event)
         }

Sources/PusherCrypto.swift

@@ -20,7 +20,12 @@ struct PusherCrypto {
         _ = digest.withUnsafeMutableBytes { (digestBytes: UnsafeMutableRawBufferPointer) in
             _ = secretData.withUnsafeBytes { (secretBytes: UnsafeRawBufferPointer) in
                 _ = messageData.withUnsafeBytes { (messageBytes: UnsafeRawBufferPointer) in
-                    CCHmac(algorithm, secretBytes.baseAddress, secretData.count, messageBytes.baseAddress, messageData.count, digestBytes.baseAddress)
+                    CCHmac(algorithm,
+                           secretBytes.baseAddress,
+                           secretData.count,
+                           messageBytes.baseAddress,
+                           messageData.count,
+                           digestBytes.baseAddress)
                 }
             }
         }

Sources/PusherError.swift

@@ -3,7 +3,8 @@ import Foundation
 @objcMembers
 open class PusherError: NSObject {
 
-    // Code is optional, message is not: https://pusher.com/docs/channels/library_auth_reference/pusher-websockets-protocol#-pusher-error-channels-client-
+    /// Code is optional, message is not:
+    /// https://pusher.com/docs/channels/library_auth_reference/pusher-websockets-protocol#-pusher-error-channels-client-
     /// The error code.
     public let code: Int?
     /// The error message.

Sources/PusherEvent.swift

@@ -6,11 +6,13 @@ open class PusherEvent: NSObject, NSCopying {
     /// The JSON object received from the websocket
     @nonobjc internal let raw: [String: Any]
 
-    // According to Channels protocol, there is always an event https://pusher.com/docs/channels/library_auth_reference/pusher-websockets-protocol#events
+    /// According to Channels protocol, there is always an event
+    /// https://pusher.com/docs/channels/library_auth_reference/pusher-websockets-protocol#events
     /// The name of the event.
     public let eventName: String
 
-    /// The name of the channel that the event was triggered on. Not present in events without an associated channel, e.g. "pusher:error" events relating to the connection.
+    /// The name of the channel that the event was triggered on.
+    /// Not present in events without an associated channel, e.g. "pusher:error" events relating to the connection.
     public let channelName: String?
 
     /// The data that was passed when the event was triggered.
@@ -19,7 +21,11 @@ open class PusherEvent: NSObject, NSCopying {
     /// The ID of the user who triggered the event. Only present in client event on presence channels.
     public let userId: String?
 
-    @nonobjc internal init(eventName: String, channelName: String?, data: String?, userId: String?, raw: [String: Any]) {
+    @nonobjc internal init(eventName: String,
+                           channelName: String?,
+                           data: String?,
+                           userId: String?,
+                           raw: [String: Any]) {
         self.eventName = eventName
         self.channelName = channelName
         self.data = data
@@ -65,11 +71,19 @@ open class PusherEvent: NSObject, NSCopying {
     @nonobjc internal func copy(withEventName eventName: String) -> PusherEvent {
         var jsonObject = self.raw
         jsonObject["event"] = eventName
-        return PusherEvent(eventName: eventName, channelName: self.channelName, data: self.data, userId: self.userId, raw: jsonObject)
+        return PusherEvent(eventName: eventName,
+                           channelName: self.channelName,
+                           data: self.data,
+                           userId: self.userId,
+                           raw: jsonObject)
     }
 
     public func copy(with zone: NSZone? = nil) -> Any {
-        return PusherEvent(eventName: self.eventName, channelName: self.channelName, data: self.data, userId: self.userId, raw: self.raw)
+        return PusherEvent(eventName: self.eventName,
+                           channelName: self.channelName,
+                           data: self.data,
+                           userId: self.userId,
+                           raw: self.raw)
     }
 
 }

Sources/PusherEventFactory.swift

@@ -12,21 +12,28 @@ struct PusherConcreteEventFactory: PusherEventFactory {
 
     // MARK: - Event factory
 
-    func makeEvent(fromJSON json: PusherEventPayload, withDecryptionKey decryptionKey: String? = nil) throws -> PusherEvent {
+    func makeEvent(fromJSON json: PusherEventPayload,
+                   withDecryptionKey decryptionKey: String? = nil) throws -> PusherEvent {
         guard let eventName = json["event"] as? String else {
             throw PusherEventError.invalidFormat
         }
 
         let channelName = json["channel"] as? String
-        let data = try self.data(fromJSON: json, eventName: eventName, channelName: channelName, decryptionKey: decryptionKey)
+        let data = try self.data(fromJSON: json,
+                                 eventName: eventName,
+                                 channelName: channelName,
+                                 decryptionKey: decryptionKey)
         let userId = json["user_id"] as? String
 
         return PusherEvent(eventName: eventName, channelName: channelName, data: data, userId: userId, raw: json)
     }
 
     // MARK: - Private methods
 
-    private func data(fromJSON json: PusherEventPayload, eventName: String, channelName: String?, decryptionKey: String?) throws -> String? {
+    private func data(fromJSON json: PusherEventPayload,
+                      eventName: String,
+                      channelName: String?,
+                      decryptionKey: String?) throws -> String? {
         let data = json["data"] as? String
 
         if PusherEncryptionHelpers.shouldDecryptMessage(eventName: eventName, channelName: channelName) {