v0.5

  update SocketRocket submodule
  update readme to reflect the recent changes
  finally remove deprecated delegate methods
  Make transports dynamic loadable (based on available classes)
  Removed SBJson & JSONKit dependencies
  Debugging should only happen if it is build for debugging (DEBUG is defined if compiled by XCODE for debugging/not release)

Author: pkyeck

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "submodules/json-framework"]
-	path = submodules/json-framework
-	url = https://github.com/stig/json-framework.git
 [submodule "submodules/socket-rocket"]
 	path = submodules/socket-rocket
 	url = https://github.com/square/SocketRocket.git

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.5 (2014-02-21)
+
+  - finally remove deprecated delegate methods
+  - remove external JSON frameworks
+
 ## 0.4.1 (2013-11-18)
 
   - fix unix timecode bug in handshake url. close #118.

README.md

@@ -7,13 +7,12 @@
    * [SocketRocket](https://github.com/square/SocketRocket)
   Look [here](https://github.com/square/SocketRocket#installing-ios) for further instructions how to use/install SocketRocket.
 
-  JSON serialization can be provided by SBJson (json-framework), JSONKit or by Foundation in OS X 10.7/iOS 5.0.  These are selected at runtime and introduce no source-level dependencies.
-   * [json-framework](https://github.com/stig/json-framework/) (optional)
-   * [JSONKit](https://github.com/johnezang/JSONKit/) (optional)
 
 ## Requirements
 
 As of version 0.4, this library requires at least OS X 10.7 or iOS 5.0.
+Because of this, we were able to remove the external JSON frameworks in v0.5 and only rely on iOS' own `NSJSONSerialization`.
+
 
 ## Usage
 
@@ -80,7 +79,6 @@ All delegate methods are optional - you could implement the following
 
 ``` objective-c
 - (void) socketIODidConnect:(SocketIO *)socket;
-- (void) socketIODidDisconnect:(SocketIO *)socket; // deprecated
 - (void) socketIODidDisconnect:(SocketIO *)socket disconnectedWithError:(NSError *)error;
 - (void) socketIO:(SocketIO *)socket didReceiveMessage:(SocketIOPacket *)packet;
 - (void) socketIO:(SocketIO *)socket didReceiveJSON:(SocketIOPacket *)packet;
@@ -89,14 +87,6 @@ All delegate methods are optional - you could implement the following
 - (void) socketIO:(SocketIO *)socket onError:(NSError *)error;
 ```
 
-These two callbacks are deprecated - please don't use them anymore - they will
-be removed in upcoming releases:
-
-``` objective-c
-- (void) socketIOHandshakeFailed:(SocketIO *)socket;
-- (void) socketIO:(SocketIO *)socket failedToConnectWithError:(NSError *)error;
-```
-
 To process an incoming `message` or `event` just
 
 ``` objective-c

SocketIO.h

@@ -1,6 +1,6 @@
 //
 //  SocketIO.h
-//  v0.4.1 ARC
+//  v0.5 ARC
 //
 //  based on 
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
@@ -52,10 +52,6 @@ typedef enum {
 - (void) socketIO:(SocketIO *)socket didReceiveEvent:(SocketIOPacket *)packet;
 - (void) socketIO:(SocketIO *)socket didSendMessage:(SocketIOPacket *)packet;
 - (void) socketIO:(SocketIO *)socket onError:(NSError *)error;
-
-// TODO: deprecated -> to be removed
-- (void) socketIO:(SocketIO *)socket failedToConnectWithError:(NSError *)error __attribute__((deprecated));
-- (void) socketIOHandshakeFailed:(SocketIO *)socket __attribute__((deprecated));
 @end
 
 

SocketIO.m

@@ -1,6 +1,6 @@
 //
 //  SocketIO.m
-//  v0.4.1 ARC
+//  v0.5 ARC
 //
 //  based on 
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
@@ -25,11 +25,13 @@
 #import "SocketIOPacket.h"
 #import "SocketIOJSONSerialization.h"
 
-#import "SocketIOTransportWebsocket.h"
-#import "SocketIOTransportXHR.h"
-
+#ifdef DEBUG
 #define DEBUG_LOGS 1
 #define DEBUG_CERTIFICATE 1
+#else
+#define DEBUG_LOGS 0
+#define DEBUG_CERTIFICATE 0
+#endif
 
 #if DEBUG_LOGS
 #define DEBUGLOG(...) NSLog(__VA_ARGS__)
@@ -686,13 +688,6 @@ - (void) connection:(NSURLConnection *)connection didFailWithError:(NSError *)er
 
         [_delegate socketIO:self onError:err];
     }
-    // TODO: deprecated - to be removed
-    else if ([_delegate respondsToSelector:@selector(socketIOHandshakeFailed:)]) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        [_delegate socketIOHandshakeFailed:self];
-#pragma clang diagnostic pop
-    }
 }
 
 - (void) connectionDidFinishLoading:(NSURLConnection *)connection 
@@ -741,13 +736,23 @@ - (void) connectionDidFinishLoading:(NSURLConnection *)connection
         NSArray *transports = [t componentsSeparatedByString:@","];
         DEBUGLOG(@"transports: %@", transports);
 
-        if ([transports indexOfObject:@"websocket"] != NSNotFound) {
+        static Class webSocketTransportClass;
+        static Class xhrTransportClass;
+        
+        if (webSocketTransportClass == nil) {
+            webSocketTransportClass = NSClassFromString(@"SocketIOTransportWebsocket");
+        }
+        if (xhrTransportClass == nil) {
+            xhrTransportClass = NSClassFromString(@"SocketIOTransportXHR");
+        }
+        
+        if (webSocketTransportClass != nil && [transports indexOfObject:@"websocket"] != NSNotFound) {
             DEBUGLOG(@"websocket supported -> using it now");
-            _transport = [[SocketIOTransportWebsocket alloc] initWithDelegate:self];
+            _transport = [[webSocketTransportClass alloc] initWithDelegate:self];
         }
-        else if ([transports indexOfObject:@"xhr-polling"] != NSNotFound) {
+        else if (xhrTransportClass != nil && [transports indexOfObject:@"xhr-polling"] != NSNotFound) {
             DEBUGLOG(@"xhr polling supported -> using it now");
-            _transport = [[SocketIOTransportXHR alloc] initWithDelegate:self];
+            _transport = [[xhrTransportClass alloc] initWithDelegate:self];
         }
         else {
             DEBUGLOG(@"no transport found that is supported :( -> fail");
@@ -770,13 +775,6 @@ - (void) connectionDidFinishLoading:(NSURLConnection *)connection
         if ([_delegate respondsToSelector:@selector(socketIO:onError:)]) {
             [_delegate socketIO:self onError:error];
         }
-        // TODO: deprecated - to be removed
-        else if ([_delegate respondsToSelector:@selector(socketIO:failedToConnectWithError:)]) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-            [_delegate socketIO:self failedToConnectWithError:error];
-#pragma clang diagnostic pop
-        }
 
         // make sure to do call all cleanup code
         [self onDisconnect:error];

SocketIOJSONSerialization.h

@@ -1,6 +1,6 @@
 //
 //  SocketIOJSONSerialization.h
-//  v0.4.1 ARC
+//  v0.5 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

SocketIOJSONSerialization.m

@@ -1,6 +1,6 @@
 //
 //  SocketIOJSONSerialization.m
-//  v0.4.1 ARC
+//  v0.5 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa
@@ -23,93 +23,15 @@
 
 #import "SocketIOJSONSerialization.h"
 
-extern NSString * const SocketIOException;
-
-// covers the methods in SBJson and JSONKit
-@interface NSObject (SocketIOJSONSerialization)
-
-// used by both JSONKit and SBJson
-- (id) objectWithData:(NSData *)data;
-
-// Use by JSONKit serialization
-- (NSString *) JSONString;
-- (id) decoder;
-
-// Used by SBJsonWriter
-- (NSString *) stringWithObject:(id)object;
-
-@end
-
 @implementation SocketIOJSONSerialization
 
 + (id) objectFromJSONData:(NSData *)data error:(NSError **)error {
-    Class serializer;
-    
-    // try SBJson first
-    serializer = NSClassFromString(@"SBJsonParser");
-    if (serializer) {
-        id parser;
-        id object;
-        
-        parser = [[serializer alloc] init];
-        object = [parser objectWithData:data];
-        
-        return object;
-    }
-    
-    // try Foundation's JSON coder, available in OS X 10.7/iOS 5.0
-    serializer = NSClassFromString(@"NSJSONSerialization");
-    if (serializer) {
-        return [serializer JSONObjectWithData:data options:0 error:error];
-    }
-    
-    // lastly, try JSONKit
-    serializer = NSClassFromString(@"JSONDecoder");
-    if (serializer) {
-        return [[serializer decoder] objectWithData:data];
-    }
-    
-    // unable to find a suitable JSON deseralizer
-    [NSException raise:SocketIOException format:@"socket.IO-objc requires SBJson, JSONKit or an OS that has NSJSONSerialization."];
-    
-    return nil;
+    return [NSJSONSerialization JSONObjectWithData:data options:0 error:error];    
 }
 
 + (NSString *) JSONStringFromObject:(id)object error:(NSError **)error {
-    Class     serializer;
-    NSString *jsonString;
-    
-    jsonString = nil;
-    serializer = NSClassFromString(@"SBJsonWriter");
-    if (serializer) {
-        id writer;
-        
-        writer = [[serializer alloc] init];
-        jsonString = [writer stringWithObject:object];
-        
-        return jsonString;
-    }
-    
-    serializer = NSClassFromString(@"NSJSONSerialization");
-    if (serializer) {
-        NSData *data;
-        
-        data = [serializer dataWithJSONObject:object options:0 error:error];
-        
-        jsonString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-        
-        return jsonString;
-    }
-    
-    // lastly, try JSONKit
-    if ([object respondsToSelector:@selector(JSONString)]) {
-        return [object JSONString];
-    }
-    
-    // unable to find a suitable JSON seralizer
-    [NSException raise:SocketIOException format:@"socket.IO-objc requires SBJson, JSONKit or an OS that has NSJSONSerialization."];
-    
-    return nil;
+    NSData *data = [NSJSONSerialization dataWithJSONObject:object options:0 error:error];
+    return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];    
 }
 
 @end

SocketIOPacket.h

@@ -1,6 +1,6 @@
 //
 //  SocketIOPacket.h
-//  v0.4.1 ARC
+//  v0.5 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

SocketIOPacket.m

@@ -1,6 +1,6 @@
 //
 //  SocketIOPacket.h
-//  v0.4.1 ARC
+//  v0.5 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa

SocketIOTransport.h

@@ -1,6 +1,6 @@
 //
 //  SocketIOTransport.h
-//  v0.4.1 ARC
+//  v0.5 ARC
 //
 //  based on
 //  socketio-cocoa https://github.com/fpotter/socketio-cocoa