Skip to content

Commit

Permalink
Removed SBJson & JSONKit dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@mennopruijssers
mennopruijssers committed Oct 23, 2013
1 parent 26748e0 commit 1b29059
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 156 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -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
84 changes: 3 additions & 81 deletions SocketIOJSONSerialization.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
71 changes: 0 additions & 71 deletions SocketTesterARC.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,6 @@
4A4453811589EE9100B44ABB /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A44537A1589EE9100B44ABB /* base64.c */; };
4A4453821589EE9100B44ABB /* NSData+SRB64Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A44537D1589EE9100B44ABB /* NSData+SRB64Additions.m */; };
4A4453831589EE9100B44ABB /* SRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4453801589EE9100B44ABB /* SRWebSocket.m */; };
4A92E916179548B40077B69C /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E903179548B40077B69C /* SBJsonParser.m */; };
4A92E917179548B40077B69C /* SBJsonStreamParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E905179548B40077B69C /* SBJsonStreamParser.m */; };
4A92E918179548B40077B69C /* SBJsonStreamParserAccumulator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E907179548B40077B69C /* SBJsonStreamParserAccumulator.m */; };
4A92E919179548B40077B69C /* SBJsonStreamParserAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E909179548B40077B69C /* SBJsonStreamParserAdapter.m */; };
4A92E91A179548B40077B69C /* SBJsonStreamParserState.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E90B179548B40077B69C /* SBJsonStreamParserState.m */; };
4A92E91B179548B40077B69C /* SBJsonStreamTokeniser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E90D179548B40077B69C /* SBJsonStreamTokeniser.m */; };
4A92E91C179548B40077B69C /* SBJsonStreamWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E90F179548B40077B69C /* SBJsonStreamWriter.m */; };
4A92E91D179548B40077B69C /* SBJsonStreamWriterAccumulator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E911179548B40077B69C /* SBJsonStreamWriterAccumulator.m */; };
4A92E91E179548B40077B69C /* SBJsonStreamWriterState.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E913179548B40077B69C /* SBJsonStreamWriterState.m */; };
4A92E91F179548B40077B69C /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E915179548B40077B69C /* SBJsonWriter.m */; };
4AD96DF41680853E00D9E42D /* SocketIOPacket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AD96DF31680853E00D9E42D /* SocketIOPacket.m */; };
4AD96DF816808B7900D9E42D /* SocketIOTransportWebsocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AD96DF716808B7900D9E42D /* SocketIOTransportWebsocket.m */; };
4AD96DFC16822DE300D9E42D /* SocketIOTransportXHR.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AD96DFB16822DE300D9E42D /* SocketIOTransportXHR.m */; };
Expand Down Expand Up @@ -50,27 +40,6 @@
4A44537E1589EE9100B44ABB /* SocketRocket-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SocketRocket-Prefix.pch"; path = "submodules/socket-rocket/SocketRocket/SocketRocket-Prefix.pch"; sourceTree = SOURCE_ROOT; };
4A44537F1589EE9100B44ABB /* SRWebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SRWebSocket.h; path = "submodules/socket-rocket/SocketRocket/SRWebSocket.h"; sourceTree = SOURCE_ROOT; };
4A4453801589EE9100B44ABB /* SRWebSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SRWebSocket.m; path = "submodules/socket-rocket/SocketRocket/SRWebSocket.m"; sourceTree = SOURCE_ROOT; };
4A92E901179548B40077B69C /* SBJson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJson.h; path = "submodules/json-framework/src/main/objc/SBJson.h"; sourceTree = "<group>"; };
4A92E902179548B40077B69C /* SBJsonParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonParser.h; path = "submodules/json-framework/src/main/objc/SBJsonParser.h"; sourceTree = "<group>"; };
4A92E903179548B40077B69C /* SBJsonParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonParser.m; path = "submodules/json-framework/src/main/objc/SBJsonParser.m"; sourceTree = "<group>"; };
4A92E904179548B40077B69C /* SBJsonStreamParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamParser.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamParser.h"; sourceTree = "<group>"; };
4A92E905179548B40077B69C /* SBJsonStreamParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamParser.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamParser.m"; sourceTree = "<group>"; };
4A92E906179548B40077B69C /* SBJsonStreamParserAccumulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamParserAccumulator.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamParserAccumulator.h"; sourceTree = "<group>"; };
4A92E907179548B40077B69C /* SBJsonStreamParserAccumulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamParserAccumulator.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamParserAccumulator.m"; sourceTree = "<group>"; };
4A92E908179548B40077B69C /* SBJsonStreamParserAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamParserAdapter.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamParserAdapter.h"; sourceTree = "<group>"; };
4A92E909179548B40077B69C /* SBJsonStreamParserAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamParserAdapter.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamParserAdapter.m"; sourceTree = "<group>"; };
4A92E90A179548B40077B69C /* SBJsonStreamParserState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamParserState.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamParserState.h"; sourceTree = "<group>"; };
4A92E90B179548B40077B69C /* SBJsonStreamParserState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamParserState.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamParserState.m"; sourceTree = "<group>"; };
4A92E90C179548B40077B69C /* SBJsonStreamTokeniser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamTokeniser.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamTokeniser.h"; sourceTree = "<group>"; };
4A92E90D179548B40077B69C /* SBJsonStreamTokeniser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamTokeniser.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamTokeniser.m"; sourceTree = "<group>"; };
4A92E90E179548B40077B69C /* SBJsonStreamWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamWriter.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamWriter.h"; sourceTree = "<group>"; };
4A92E90F179548B40077B69C /* SBJsonStreamWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamWriter.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamWriter.m"; sourceTree = "<group>"; };
4A92E910179548B40077B69C /* SBJsonStreamWriterAccumulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamWriterAccumulator.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamWriterAccumulator.h"; sourceTree = "<group>"; };
4A92E911179548B40077B69C /* SBJsonStreamWriterAccumulator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamWriterAccumulator.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamWriterAccumulator.m"; sourceTree = "<group>"; };
4A92E912179548B40077B69C /* SBJsonStreamWriterState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonStreamWriterState.h; path = "submodules/json-framework/src/main/objc/SBJsonStreamWriterState.h"; sourceTree = "<group>"; };
4A92E913179548B40077B69C /* SBJsonStreamWriterState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonStreamWriterState.m; path = "submodules/json-framework/src/main/objc/SBJsonStreamWriterState.m"; sourceTree = "<group>"; };
4A92E914179548B40077B69C /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBJsonWriter.h; path = "submodules/json-framework/src/main/objc/SBJsonWriter.h"; sourceTree = "<group>"; };
4A92E915179548B40077B69C /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SBJsonWriter.m; path = "submodules/json-framework/src/main/objc/SBJsonWriter.m"; sourceTree = "<group>"; };
4AD96DF21680853E00D9E42D /* SocketIOPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketIOPacket.h; sourceTree = SOURCE_ROOT; };
4AD96DF31680853E00D9E42D /* SocketIOPacket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SocketIOPacket.m; sourceTree = SOURCE_ROOT; };
4AD96DF616808B7900D9E42D /* SocketIOTransportWebsocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SocketIOTransportWebsocket.h; path = ../SocketIOTransportWebsocket.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -119,35 +88,6 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
4A4453781589EE6300B44ABB /* SBJson */ = {
isa = PBXGroup;
children = (
4A92E901179548B40077B69C /* SBJson.h */,
4A92E902179548B40077B69C /* SBJsonParser.h */,
4A92E903179548B40077B69C /* SBJsonParser.m */,
4A92E904179548B40077B69C /* SBJsonStreamParser.h */,
4A92E905179548B40077B69C /* SBJsonStreamParser.m */,
4A92E906179548B40077B69C /* SBJsonStreamParserAccumulator.h */,
4A92E907179548B40077B69C /* SBJsonStreamParserAccumulator.m */,
4A92E908179548B40077B69C /* SBJsonStreamParserAdapter.h */,
4A92E909179548B40077B69C /* SBJsonStreamParserAdapter.m */,
4A92E90A179548B40077B69C /* SBJsonStreamParserState.h */,
4A92E90B179548B40077B69C /* SBJsonStreamParserState.m */,
4A92E90C179548B40077B69C /* SBJsonStreamTokeniser.h */,
4A92E90D179548B40077B69C /* SBJsonStreamTokeniser.m */,
4A92E90E179548B40077B69C /* SBJsonStreamWriter.h */,
4A92E90F179548B40077B69C /* SBJsonStreamWriter.m */,
4A92E910179548B40077B69C /* SBJsonStreamWriterAccumulator.h */,
4A92E911179548B40077B69C /* SBJsonStreamWriterAccumulator.m */,
4A92E912179548B40077B69C /* SBJsonStreamWriterState.h */,
4A92E913179548B40077B69C /* SBJsonStreamWriterState.m */,
4A92E914179548B40077B69C /* SBJsonWriter.h */,
4A92E915179548B40077B69C /* SBJsonWriter.m */,
);
name = SBJson;
path = ..;
sourceTree = "<group>";
};
4A4453791589EE7D00B44ABB /* SocketRocket */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -198,7 +138,6 @@
isa = PBXGroup;
children = (
4A4453791589EE7D00B44ABB /* SocketRocket */,
4A4453781589EE6300B44ABB /* SBJson */,
4ADCCBB015790D760022990C /* AppDelegate.h */,
4ADCCBB115790D760022990C /* AppDelegate.m */,
4ADCCBB315790D760022990C /* ViewController.h */,
Expand Down Expand Up @@ -305,16 +244,6 @@
4AD96DF41680853E00D9E42D /* SocketIOPacket.m in Sources */,
4AD96DF816808B7900D9E42D /* SocketIOTransportWebsocket.m in Sources */,
4AD96DFC16822DE300D9E42D /* SocketIOTransportXHR.m in Sources */,
4A92E916179548B40077B69C /* SBJsonParser.m in Sources */,
4A92E917179548B40077B69C /* SBJsonStreamParser.m in Sources */,
4A92E918179548B40077B69C /* SBJsonStreamParserAccumulator.m in Sources */,
4A92E919179548B40077B69C /* SBJsonStreamParserAdapter.m in Sources */,
4A92E91A179548B40077B69C /* SBJsonStreamParserState.m in Sources */,
4A92E91B179548B40077B69C /* SBJsonStreamTokeniser.m in Sources */,
4A92E91C179548B40077B69C /* SBJsonStreamWriter.m in Sources */,
4A92E91D179548B40077B69C /* SBJsonStreamWriterAccumulator.m in Sources */,
4A92E91E179548B40077B69C /* SBJsonStreamWriterState.m in Sources */,
4A92E91F179548B40077B69C /* SBJsonWriter.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
1 change: 0 additions & 1 deletion submodules/json-framework
Submodule json-framework deleted from f30481

0 comments on commit 1b29059

Please sign in to comment.