v0.5.1

  Added method to pass cookies on conenct
  adjust cookie implementation
  add cookie example
  distinguish between handshake failed and unauthorized handshake
  add extra contributors file
  add examples for different event data types. ref #158
  clean up

Author: pkyeck

CONTRIBUTORS.md

@@ -0,0 +1,23 @@
+#Contributors
+
+Many thanks to the following people for helping me with this:
+
+- mennopruijssers
+- samlown
+- DanLite
+- bnadim
+- kayleg
+- psineur
+- dgthistle
+- paiv
+- antonholmquist
+- spesholized
+- insanehunter
+- RevCBH
+- elwerene
+- MichaelScaria
+- beepscore
+- progeddog
+- bridger
+- YannickL
+- taiyangc

SocketIO.h

@@ -1,24 +1,21 @@
 //
 //  SocketIO.h
-//  v0.5 ARC
+//  v0.5.1
 //
 //  based on 
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
 //  by Fred Potter <[email protected]>
 //
 //  using
 //  https://github.com/square/SocketRocket
-//  https://github.com/stig/json-framework/
 //
 //  reusing some parts of
 //  /socket.io/socket.io.js
 //
 //  Created by Philipp Kyeck http://beta-interactive.de
 //
-//  Updated by 
-//    samlown   https://github.com/samlown
-//    kayleg    https://github.com/kayleg
-//    taiyangc  https://github.com/taiyangc
+//  With help from
+//    https://github.com/pkyeck/socket.IO-objc/blob/master/CONTRIBUTORS.md
 //
 
 #import <Foundation/Foundation.h>
@@ -39,7 +36,8 @@ typedef enum {
     SocketIOWebSocketClosed = -4,
     SocketIOTransportsNotSupported = -5,
     SocketIOHandshakeFailed = -6,
-    SocketIODataCouldNotBeSend = -7
+    SocketIODataCouldNotBeSend = -7,
+    SocketIOUnauthorized = -8
 } SocketIOErrorCodes;
 
 
@@ -71,6 +69,8 @@ typedef enum {
     BOOL _isConnecting;
     BOOL _useSecure;
 
+    NSArray *_cookies;
+    
     NSURLConnection *_handshake;
 
     // heartbeat
@@ -95,6 +95,7 @@ typedef enum {
 @property (nonatomic, readonly) NSString *sid;
 @property (nonatomic, readonly) NSTimeInterval heartbeatTimeout;
 @property (nonatomic) BOOL useSecure;
+@property (nonatomic) NSArray *cookies;
 @property (nonatomic, readonly) BOOL isConnected, isConnecting;
 @property (nonatomic, weak) id<SocketIODelegate> delegate;
 @property (nonatomic) BOOL returnAllDataFromAck;

SocketIO.m

@@ -1,24 +1,21 @@
 //
 //  SocketIO.m
-//  v0.5 ARC
+//  v0.5.1
 //
 //  based on 
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
 //  by Fred Potter <[email protected]>
 //
 //  using
 //  https://github.com/square/SocketRocket
-//  https://github.com/stig/json-framework/
 //
 //  reusing some parts of
 //  /socket.io/socket.io.js
 //
 //  Created by Philipp Kyeck http://beta-interactive.de
 //
-//  Updated by 
-//    samlown   https://github.com/samlown
-//    kayleg    https://github.com/kayleg
-//    taiyangc  https://github.com/taiyangc
+//  With help from
+//    https://github.com/pkyeck/socket.IO-objc/blob/master/CONTRIBUTORS.md
 //
 
 #import "SocketIO.h"
@@ -78,7 +75,8 @@ @implementation SocketIO
 
 @synthesize isConnected = _isConnected, 
             isConnecting = _isConnecting, 
-            useSecure = _useSecure, 
+            useSecure = _useSecure,
+            cookies = _cookies,
             delegate = _delegate,
             heartbeatTimeout = _heartbeatTimeout,
             returnAllDataFromAck = _returnAllDataFromAck;
@@ -144,10 +142,18 @@ - (void) connectToHost:(NSString *)host
         query = nil;
 
         // make a request
-        NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:handshakeUrl]
+        NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:handshakeUrl]
                                                  cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData 
                                              timeoutInterval:connectionTimeout];
 
+        if (_cookies != nil) {
+            DEBUGLOG(@"Adding cookie(s): %@", [_cookies description]);
+            NSDictionary *headers = [NSHTTPCookie requestHeaderFieldsWithCookies:_cookies];
+            [request setAllHTTPHeaderFields:headers];
+        }
+        
+        [request setHTTPShouldHandleCookies:YES];
+        
         _handshake = [[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:NO];
         [_handshake scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
         [_handshake start];
@@ -675,6 +681,8 @@ - (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)er
 {
     NSLog(@"ERROR: handshake failed ... %@", [error localizedDescription]);
 
+    int errorCode = [error code] == 403 ? SocketIOUnauthorized : SocketIOHandshakeFailed;
+    
     _isConnected = NO;
     _isConnecting = NO;
 
@@ -683,7 +691,7 @@ - (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)er
                                                                       forKey:NSUnderlyingErrorKey] mutableCopy];
 
         NSError *err = [NSError errorWithDomain:SocketIOError
-                                           code:SocketIOHandshakeFailed
+                                           code:errorCode
                                        userInfo:errorInfo];
 
         [_delegate socketIO:self onError:err];

SocketIOJSONSerialization.h

@@ -1,24 +1,21 @@
 //
 //  SocketIOJSONSerialization.h
-//  v0.5 ARC
+//  v0.5.1
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
 //  by Fred Potter <[email protected]>
 //
 //  using
 //  https://github.com/square/SocketRocket
-//  https://github.com/stig/json-framework/
 //
 //  reusing some parts of
 //  /socket.io/socket.io.js
 //
 //  Created by Philipp Kyeck http://beta-interactive.de
 //
-//  Updated by
-//    samlown   https://github.com/samlown
-//    kayleg    https://github.com/kayleg
-//    taiyangc  https://github.com/taiyangc
+//  With help from
+//    https://github.com/pkyeck/socket.IO-objc/blob/master/CONTRIBUTORS.md
 //
 
 #import <Foundation/Foundation.h>

SocketIOJSONSerialization.m

@@ -1,24 +1,21 @@
 //
 //  SocketIOJSONSerialization.m
-//  v0.5 ARC
+//  v0.5.1
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
 //  by Fred Potter <[email protected]>
 //
 //  using
 //  https://github.com/square/SocketRocket
-//  https://github.com/stig/json-framework/
 //
 //  reusing some parts of
 //  /socket.io/socket.io.js
 //
 //  Created by Philipp Kyeck http://beta-interactive.de
 //
-//  Updated by
-//    samlown   https://github.com/samlown
-//    kayleg    https://github.com/kayleg
-//    taiyangc  https://github.com/taiyangc
+//  With help from
+//    https://github.com/pkyeck/socket.IO-objc/blob/master/CONTRIBUTORS.md
 //
 
 #import "SocketIOJSONSerialization.h"

SocketIOPacket.h

@@ -1,24 +1,21 @@
 //
 //  SocketIOPacket.h
-//  v0.5 ARC
+//  v0.5.1
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
 //  by Fred Potter <[email protected]>
 //
 //  using
 //  https://github.com/square/SocketRocket
-//  https://github.com/stig/json-framework/
 //
 //  reusing some parts of
 //  /socket.io/socket.io.js
 //
 //  Created by Philipp Kyeck http://beta-interactive.de
 //
-//  Updated by
-//    samlown   https://github.com/samlown
-//    kayleg    https://github.com/kayleg
-//    taiyangc  https://github.com/taiyangc
+//  With help from
+//    https://github.com/pkyeck/socket.IO-objc/blob/master/CONTRIBUTORS.md
 //
 
 #import <Foundation/Foundation.h>

SocketIOPacket.m

@@ -1,24 +1,21 @@
 //
 //  SocketIOPacket.h
-//  v0.5 ARC
+//  v0.5.1
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
 //  by Fred Potter <[email protected]>
 //
 //  using
 //  https://github.com/square/SocketRocket
-//  https://github.com/stig/json-framework/
 //
 //  reusing some parts of
 //  /socket.io/socket.io.js
 //
 //  Created by Philipp Kyeck http://beta-interactive.de
 //
-//  Updated by
-//    samlown   https://github.com/samlown
-//    kayleg    https://github.com/kayleg
-//    taiyangc  https://github.com/taiyangc
+//  With help from
+//    https://github.com/pkyeck/socket.IO-objc/blob/master/CONTRIBUTORS.md
 //
 
 #import "SocketIOPacket.h"

SocketIOTransport.h

@@ -1,24 +1,21 @@
 //
 //  SocketIOTransport.h
-//  v0.5 ARC
+//  v0.5.1
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
 //  by Fred Potter <[email protected]>
 //
 //  using
 //  https://github.com/square/SocketRocket
-//  https://github.com/stig/json-framework/
 //
 //  reusing some parts of
 //  /socket.io/socket.io.js
 //
 //  Created by Philipp Kyeck http://beta-interactive.de
 //
-//  Updated by
-//    samlown   https://github.com/samlown
-//    kayleg    https://github.com/kayleg
-//    taiyangc  https://github.com/taiyangc
+//  With help from
+//    https://github.com/pkyeck/socket.IO-objc/blob/master/CONTRIBUTORS.md
 //
 
 #import <Foundation/Foundation.h>

SocketIOTransportWebsocket.h

@@ -1,24 +1,21 @@
 //
 //  SocketIOTransportWebsocket.h
-//  v0.5 ARC
+//  v0.5.1
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
 //  by Fred Potter <[email protected]>
 //
 //  using
 //  https://github.com/square/SocketRocket
-//  https://github.com/stig/json-framework/
 //
 //  reusing some parts of
 //  /socket.io/socket.io.js
 //
 //  Created by Philipp Kyeck http://beta-interactive.de
 //
-//  Updated by
-//    samlown   https://github.com/samlown
-//    kayleg    https://github.com/kayleg
-//    taiyangc  https://github.com/taiyangc
+//  With help from
+//    https://github.com/pkyeck/socket.IO-objc/blob/master/CONTRIBUTORS.md
 //
 
 #import <Foundation/Foundation.h>

SocketIOTransportWebsocket.m

@@ -1,24 +1,21 @@
 //
 //  SocketIOTransportWebsocket.m
-//  v0.5 ARC
+//  v0.5.1
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
 //  by Fred Potter <[email protected]>
 //
 //  using
 //  https://github.com/square/SocketRocket
-//  https://github.com/stig/json-framework/
 //
 //  reusing some parts of
 //  /socket.io/socket.io.js
 //
 //  Created by Philipp Kyeck http://beta-interactive.de
 //
-//  Updated by
-//    samlown   https://github.com/samlown
-//    kayleg    https://github.com/kayleg
-//    taiyangc  https://github.com/taiyangc
+//  With help from
+//    https://github.com/pkyeck/socket.IO-objc/blob/master/CONTRIBUTORS.md
 //
 
 #import "SocketIOTransportWebsocket.h"