From 1f5402ce1c0e74c21c239ae1568d56074ab4a1fe Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Thu, 27 Aug 2015 09:45:27 -0400
Subject: [PATCH] use computed variables

---
 SocketIOClientSwift/SocketPacket.swift | 43 +++++++++++++-------------
 SocketIOClientSwift/SocketParser.swift |  6 ++--
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/SocketIOClientSwift/SocketPacket.swift b/SocketIOClientSwift/SocketPacket.swift
index 221acff..e25bd9d 100644
--- a/SocketIOClientSwift/SocketPacket.swift
+++ b/SocketIOClientSwift/SocketPacket.swift
@@ -25,9 +25,11 @@
 import Foundation
 
 struct SocketPacket {
+    private var currentPlace = 0
+    private let placeholders: Int
+
     let nsp: String
     let id: Int
-    let placeholders: Int
     let type: PacketType
     
     enum PacketType: Int {
@@ -42,7 +44,21 @@ struct SocketPacket {
         }
     }
     
-    var currentPlace = 0
+    var args: [AnyObject]? {
+        var arr = data
+        
+        if data.count == 0 {
+            return nil
+        } else {
+            if type == PacketType.Event || type == PacketType.BinaryEvent {
+                arr.removeAtIndex(0)
+                return arr
+            } else {
+                return arr
+            }
+        }
+    }
+    
     var binary: [NSData]
     var data: [AnyObject]
     var description: String {
@@ -57,6 +73,10 @@ struct SocketPacket {
         return better
     }
     
+    var event: String {
+        return data[0] as! String
+    }
+    
     var packetString: String {
         return createPacketString()
     }
@@ -232,25 +252,6 @@ struct SocketPacket {
             return data
         }
     }
-    
-    func getEvent() -> String {
-        return data[0] as! String
-    }
-    
-    func getArgs() -> [AnyObject]? {
-        var arr = data
-
-        if data.count == 0 {
-            return nil
-        } else {
-            if type == PacketType.Event || type == PacketType.BinaryEvent {
-                arr.removeAtIndex(0)
-                return arr
-            } else {
-                return arr
-            }
-        }
-    }
 }
 
 extension SocketPacket {
diff --git a/SocketIOClientSwift/SocketParser.swift b/SocketIOClientSwift/SocketParser.swift
index ef92c46..f601bcd 100644
--- a/SocketIOClientSwift/SocketParser.swift
+++ b/SocketIOClientSwift/SocketParser.swift
@@ -66,7 +66,7 @@ class SocketParser {
             return
         }
         
-        socket.handleEvent(p.getEvent(), data: p.getArgs(),
+        socket.handleEvent(p.event, data: p.args,
             isInternalMessage: false, wantsAck: p.id)
     }
     
@@ -224,10 +224,10 @@ class SocketParser {
         packet.fillInPlaceholders()
         
         if packet.type != SocketPacket.PacketType.BinaryAck {
-            socket.handleEvent(packet.getEvent(), data: packet.getArgs(),
+            socket.handleEvent(packet.event, data: packet.args,
                 isInternalMessage: false, wantsAck: packet.id)
         } else {
-            socket.handleAck(packet.id, data: packet.getArgs())
+            socket.handleAck(packet.id, data: packet.args)
         }
     }
 }