From 20b28b2f4350bccb7f013a06fc0d651f4bccac1e Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Fri, 25 Sep 2015 11:57:31 -0400
Subject: [PATCH 1/2] bump version

---
 README.md                      | 4 ++--
 Socket.IO-Client-Swift.podspec | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7f35b95..a18e559 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Carthage
 -----------------
 Add this line to your `Cartfile`:
 ```
-github "socketio/socket.io-client-swift" ~> 3.1.0 # Or latest version
+github "socketio/socket.io-client-swift" ~> 3.1.1 # Or latest version
 ```
 
 Run `carthage update --platform ios,macosx`.
@@ -83,7 +83,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 use_frameworks!
 
-pod 'Socket.IO-Client-Swift', '~> 3.1.0' # Or latest version
+pod 'Socket.IO-Client-Swift', '~> 3.1.1' # Or latest version
 ```
 
 Install pods:
diff --git a/Socket.IO-Client-Swift.podspec b/Socket.IO-Client-Swift.podspec
index 47742e3..9fcdcec 100644
--- a/Socket.IO-Client-Swift.podspec
+++ b/Socket.IO-Client-Swift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Socket.IO-Client-Swift"
-  s.version      = "3.1.0"
+  s.version      = "3.1.1"
   s.summary      = "Socket.IO-client for iOS and OS X"
   s.description  = <<-DESC
                    Socket.IO-client for iOS and OS X.
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.author       = { "Erik" => "nuclear.ace@gmail.com" }
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.10'
-  s.source       = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v3.1.0' }
+  s.source       = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v3.1.1' }
   s.source_files  = "SocketIOClientSwift/**/*.swift"
   s.requires_arc = true
   # s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files

From 3754cd2c2dbd4e1f2dc66cccbd1c1a9809ebd4b7 Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Fri, 25 Sep 2015 12:42:22 -0400
Subject: [PATCH 2/2] fix namespaces

---
 SocketIOClientSwift/SocketParser.swift | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SocketIOClientSwift/SocketParser.swift b/SocketIOClientSwift/SocketParser.swift
index 8582531..64d359d 100644
--- a/SocketIOClientSwift/SocketParser.swift
+++ b/SocketIOClientSwift/SocketParser.swift
@@ -39,17 +39,15 @@ class SocketParser {
     }
     
     private static func handlePacket(pack: SocketPacket, withSocket socket: SocketIOClient) {
-        guard isCorrectNamespace(pack.nsp, socket) else { return }
-
         switch pack.type {
-        case .Event:
+        case .Event where isCorrectNamespace(pack.nsp, socket):
             socket.handleEvent(pack.event, data: pack.args ?? [],
                 isInternalMessage: false, wantsAck: pack.id)
-        case .Ack:
+        case .Ack where isCorrectNamespace(pack.nsp, socket):
             socket.handleAck(pack.id, data: pack.data)
-        case .BinaryEvent:
+        case .BinaryEvent where isCorrectNamespace(pack.nsp, socket):
             socket.waitingData.append(pack)
-        case .BinaryAck:
+        case .BinaryAck where isCorrectNamespace(pack.nsp, socket):
             socket.waitingData.append(pack)
         case .Connect:
             handleConnect(pack, socket: socket)
@@ -57,6 +55,8 @@ class SocketParser {
             socket.didDisconnect("Got Disconnect")
         case .Error:
             socket.didError("Error: \(pack.data)")
+        default:
+            Logger.log("Got invalid packet: %@", type: "SocketParser", args: pack.description)
         }
     }