Merge pull request #30 from pusher/fix-unsent-events

Store unsentEvents in array instead of a dictionary

Author: hamchapman

Source/PusherSwift.swift

@@ -255,9 +255,10 @@ public class PusherConnection: WebSocketDelegate {
                     }
                 }
             }
-            for (eventName, data) in chan.unsentEvents {
-                chan.unsentEvents.removeValueForKey(channelName)
-                chan.trigger(eventName, data: data)
+            while chan.unsentEvents.count > 0 {
+                if let pusherEvent = chan.unsentEvents.popLast() {
+                    chan.trigger(pusherEvent.name, data: pusherEvent.data)
+                }
             }
         }
     }
@@ -558,7 +559,7 @@ public class PusherChannel {
     public var subscribed = false
     public let name: String
     public let connection: PusherConnection
-    public var unsentEvents = [String: AnyObject]()
+    public var unsentEvents = [PusherEvent]()
 
     public init(name: String, connection: PusherConnection) {
         self.name = name
@@ -608,11 +609,16 @@ public class PusherChannel {
         if subscribed {
             self.connection.sendEvent(eventName, data: data, channelName: self.name)
         } else {
-            unsentEvents[eventName] = data
+            unsentEvents.insert(PusherEvent(name: eventName, data: data), atIndex: 0)
         }
     }
 }
 
+public struct PusherEvent {
+    public let name: String
+    public let data: AnyObject
+}
+
 public class PresencePusherChannel: PusherChannel {
     public var members: [PresenceChannelMember]
 

Tests/PusherSwiftTests.swift

@@ -633,14 +633,30 @@ class PusherChannelSpec: QuickSpec {
                 connection.channels.channels["private-channel"] = chan
                 expect(chan.unsentEvents).to(beEmpty())
                 chan.trigger("client-test-event", data: ["data": "testing client events"])
-                expect(chan.unsentEvents.keys).to(contain("client-test-event"))
+                expect(chan.unsentEvents.last!.name).to(equal("client-test-event"))
                 expect(socket.stubber.calls).to(beEmpty())
                 connection.connect()
                 let parsedSubscribeArgs = convertStringToDictionary(socket.stubber.calls.last?.args!.first as! String)
                 let expectedDict = ["data": ["data": "testing client events"], "event": "client-test-event", "channel": "private-channel"]
                 let parsedEqualsExpected = NSDictionary(dictionary: parsedSubscribeArgs!).isEqualToDictionary(NSDictionary(dictionary: expectedDict) as [NSObject : AnyObject])
                 expect(parsedEqualsExpected).to(beTrue())
             }
+            
+            it("should send multipe client events with the same event name that were triggered before subscription was successful") {
+                let chan = PusherChannel(name: "private-channel", connection: connection)
+                connection.channels.channels["private-channel"] = chan
+                expect(chan.unsentEvents).to(beEmpty())
+                chan.trigger("client-test-event", data: ["data": "testing client events"])
+                chan.trigger("client-test-event", data: ["data": "more testing client events"])
+                expect(chan.unsentEvents.last!.name).to(equal("client-test-event"))
+                expect(chan.unsentEvents.count).to(equal(2))
+                expect(socket.stubber.calls).to(beEmpty())
+                connection.connect()
+                let parsedSubscribeArgs = convertStringToDictionary(socket.stubber.calls.last?.args!.first as! String)
+                let expectedDict = ["data": ["data": "more testing client events"], "event": "client-test-event", "channel": "private-channel"]
+                let parsedEqualsExpected = NSDictionary(dictionary: parsedSubscribeArgs!).isEqualToDictionary(NSDictionary(dictionary: expectedDict) as [NSObject : AnyObject])
+                expect(parsedEqualsExpected).to(beTrue())
+            }
         }
     }
 }