Merge pull request ochococo#69 from ennioma/master

Tried to make the Mediator pattern more generic
hungdlv · Jul 5, 2017 · b6e4877 · b6e4877
2 parents a2c9004 + e1f63cb
commit b6e4877
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 39 deletions.
diff --git a/Design-Patterns.playground.zip b/Design-Patterns.playground.zip
diff --git a/Design-Patterns.playground/Pages/Behavioral.xcplaygroundpage/Contents.swift b/Design-Patterns.playground/Pages/Behavioral.xcplaygroundpage/Contents.swift
@@ -311,41 +311,50 @@ The mediator pattern is used to reduce coupling between classes that communicate
 
 ### Example
 */
-struct Programmer {
+protocol Receiver {
+    associatedtype MessageType
+    func receive(message: MessageType)
+}
 
-    let name: String
+protocol Sender {
+    associatedtype MessageType
+    associatedtype ReceiverType: Receiver
+
+    var recipients: [ReceiverType] { get }
+
+    func send(message: MessageType)
+}
 
+struct Programmer: Receiver {
+    let name: String
+
     init(name: String) {
         self.name = name
     }
-
+    
     func receive(message: String) {
         print("\(name) received: \(message)")
     }
 }
 
-protocol MessageSending {
-    func send(message: String)
-}
-
-final class MessageMediator: MessageSending {
-
-    private var recipients: [Programmer] = []
-
+final class MessageMediator: Sender {
+    internal var recipients: [Programmer] = []
+
     func add(recipient: Programmer) {
         recipients.append(recipient)
     }
-
+    
     func send(message: String) {
         for recipient in recipients {
             recipient.receive(message: message)
         }
     }
 }
+
 /*:
 ### Usage
 */
-func spamMonster(message: String, worker: MessageSending) {
+func spamMonster(message: String, worker: MessageMediator) {
     worker.send(message: message)
 }
 

diff --git a/README.md b/README.md
@@ -365,44 +365,53 @@ The mediator pattern is used to reduce coupling between classes that communicate
 
 ```swift
 
-struct Programmer {
+protocol Receiver {
+    associatedtype MessageType
+    func receive(message: MessageType)
+}
 
-    let name: String
+protocol Sender {
+    associatedtype MessageType
+    associatedtype ReceiverType: Receiver
+
+    var recipients: [ReceiverType] { get }
+
+    func send(message: MessageType)
+}
 
+struct Programmer: Receiver {
+    let name: String
+
     init(name: String) {
         self.name = name
     }
-
+    
     func receive(message: String) {
         print("\(name) received: \(message)")
     }
 }
 
-protocol MessageSending {
-    func send(message: String)
-}
-
-final class MessageMediator: MessageSending {
-
-    private var recipients: [Programmer] = []
-
+final class MessageMediator: Sender {
+    internal var recipients: [Programmer] = []
+
     func add(recipient: Programmer) {
         recipients.append(recipient)
     }
-
+    
     func send(message: String) {
         for recipient in recipients {
             recipient.receive(message: message)
         }
     }
 }
+
 ```
 
 ### Usage
 
 ```swift
 
-func spamMonster(message: String, worker: MessageSending) {
+func spamMonster(message: String, worker: MessageMediator) {
     worker.send(message: message)
 }
 

diff --git a/source/behavioral/mediator.swift b/source/behavioral/mediator.swift
@@ -6,41 +6,50 @@ The mediator pattern is used to reduce coupling between classes that communicate
 
 ### Example
 */
-struct Programmer {
+protocol Receiver {
+    associatedtype MessageType
+    func receive(message: MessageType)
+}
 
-    let name: String
+protocol Sender {
+    associatedtype MessageType
+    associatedtype ReceiverType: Receiver
+
+    var recipients: [ReceiverType] { get }
+
+    func send(message: MessageType)
+}
 
+struct Programmer: Receiver {
+    let name: String
+
     init(name: String) {
         self.name = name
     }
-
+    
     func receive(message: String) {
         print("\(name) received: \(message)")
     }
 }
 
-protocol MessageSending {
-    func send(message: String)
-}
-
-final class MessageMediator: MessageSending {
-
-    private var recipients: [Programmer] = []
-
+final class MessageMediator: Sender {
+    internal var recipients: [Programmer] = []
+
     func add(recipient: Programmer) {
         recipients.append(recipient)
     }
-
+    
     func send(message: String) {
         for recipient in recipients {
             recipient.receive(message: message)
         }
     }
 }
+
 /*:
 ### Usage
 */
-func spamMonster(message: String, worker: MessageSending) {
+func spamMonster(message: String, worker: MessageMediator) {
     worker.send(message: message)
 }