Merge pull request #11 from IanKeen/event_refactor

Event refactor

Sources/RTMAPI/Events/ChannelBuilder.swift

@@ -0,0 +1,59 @@
+//
+//  ChannelBuilder.swift
+//  Chameleon
+//
+//  Created by Ian Keen on 20/07/2016.
+//
+//
+
+import Models
+import Vapor
+
+private enum ChannelEvent: String, RTMAPIEventBuilderEventType {
+    case
+    channel_marked, channel_created, channel_joined, channel_left,
+    channel_deleted, channel_archive, channel_unarchive
+
+    static var all: [ChannelEvent] {
+        return [.channel_marked, .channel_created, .channel_joined, .channel_left,
+                .channel_deleted, .channel_archive, .channel_unarchive]
+    }
+}
+
+/// Handler for the channel events
+struct ChannelBuilder: RTMAPIEventBuilder {
+    static var eventTypes: [String] { return ChannelEvent.all.map({ $0.rawValue }) }
+
+    static func make(withJson json: JSON, builderFactory: (json: JSON) -> SlackModelBuilder) throws -> RTMAPIEvent {
+        guard let event = ChannelEvent.eventType(fromJson: json)
+            else { throw RTMAPIEventBuilderError.invalidBuilder(builder: self) }
+
+        let builder = builderFactory(json: json)
+
+        switch event {
+        case .channel_marked:
+            return .channel_marked(
+                channel: try builder.slackModel("channel"),
+                timestamp: try builder.property("ts")
+            )
+        case .channel_created:
+            return .channel_created(channel: try builder.property("channel"))
+        case .channel_joined:
+            return .channel_joined(channel: try builder.property("channel"))
+        case .channel_left:
+            return .channel_left(channel: try builder.slackModel("channel"))
+        case .channel_deleted:
+            return .channel_deleted(channel: try builder.slackModel("channel"))
+        case .channel_archive:
+            return .channel_archive(
+                channel: try builder.slackModel("channel"),
+                user: try builder.slackModel("user")
+            )
+        case .channel_unarchive:
+            return .channel_archive(
+                channel: try builder.slackModel("channel"),
+                user: try builder.slackModel("user")
+            )
+        }
+    }
+}

Sources/RTMAPI/Events/ChannelRenameBuilder.swift

@@ -11,7 +11,7 @@ import Vapor
 
 /// Handler for the `channel_rename` event
 struct ChannelRenameBuilder: RTMAPIEventBuilder {
-    static var eventType: String { return "channel_rename" }
+    static var eventTypes: [String] { return ["channel_rename"] }
 
     static func make(withJson json: JSON, builderFactory: (json: JSON) -> SlackModelBuilder) throws -> RTMAPIEvent {
         guard self.canMake(fromJson: json) else { throw RTMAPIEventBuilderError.invalidBuilder(builder: self) }

Sources/RTMAPI/Events/DNDBuilder.swift

@@ -0,0 +1,36 @@
+//
+//  DNDBuilder.swift
+//  Chameleon
+//
+//  Created by Ian Keen on 20/07/2016.
+//
+//
+
+import Models
+import Vapor
+
+private enum DNDEvent: String, RTMAPIEventBuilderEventType {
+    case dnd_updated, dnd_updated_user
+
+    static var all: [DNDEvent] { return [.dnd_updated, .dnd_updated_user] }
+}
+
+/// Handler for the dnd events
+struct DNDBuilder: RTMAPIEventBuilder {
+    static var eventTypes: [String] { return DNDEvent.all.map({ $0.rawValue }) }
+
+    static func make(withJson json: JSON, builderFactory: (json: JSON) -> SlackModelBuilder) throws -> RTMAPIEvent {
+        guard let event = DNDEvent.eventType(fromJson: json)
+            else { throw RTMAPIEventBuilderError.invalidBuilder(builder: self) }
+
+        let builder = builderFactory(json: json)
+
+        let user: User = try builder.slackModel("user")
+        let status: DNDStatus = try builder.property("dnd_status")
+
+        switch event {
+        case .dnd_updated:      return .dnd_updated(user: user, status: status)
+        case .dnd_updated_user: return .dnd_updated_user(user: user, status: status)
+        }
+    }
+}

Sources/RTMAPI/Events/ErrorBuilder.swift

@@ -11,7 +11,7 @@ import Vapor
 
 /// Handler for the `error` event
 struct ErrorBuilder: RTMAPIEventBuilder {
-    static var eventType: String { return "error" }
+    static var eventTypes: [String] { return ["error"] }
 
     static func make(withJson json: JSON, builderFactory: (json: JSON) -> SlackModelBuilder) throws -> RTMAPIEvent {
         guard self.canMake(fromJson: json) else { throw RTMAPIEventBuilderError.invalidBuilder(builder: self) }