Skip to content
This repository was archived by the owner on May 14, 2024. It is now read-only.

Commit e111532

Browse files
pkyeckpkyeck
committed
Merge commit '1b2905930b14e2cb830dd50cb661f06a4af89e75' into develop. close #133.
2 parents b753a4a + 1b29059 commit e111532

File tree

4 files changed

+3
-156
lines changed

4 files changed

+3
-156
lines changed

‎.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "submodules/json-framework"]
2-
path = submodules/json-framework
3-
url = https://github.com/stig/json-framework.git
41
[submodule "submodules/socket-rocket"]
52
path = submodules/socket-rocket
63
url = https://github.com/square/SocketRocket.git

‎SocketIOJSONSerialization.m

Lines changed: 3 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -23,93 +23,15 @@
2323

2424
#import "SocketIOJSONSerialization.h"
2525

26-
extern NSString * const SocketIOException;
27-
28-
// covers the methods in SBJson and JSONKit
29-
@interface NSObject (SocketIOJSONSerialization)
30-
31-
// used by both JSONKit and SBJson
32-
- (id) objectWithData:(NSData *)data;
33-
34-
// Use by JSONKit serialization
35-
- (NSString *) JSONString;
36-
- (id) decoder;
37-
38-
// Used by SBJsonWriter
39-
- (NSString *) stringWithObject:(id)object;
40-
41-
@end
42-
4326
@implementation SocketIOJSONSerialization
4427

4528
+ (id) objectFromJSONData:(NSData *)data error:(NSError **)error {
46-
Class serializer;
47-
48-
// try SBJson first
49-
serializer = NSClassFromString(@"SBJsonParser");
50-
if (serializer) {
51-
id parser;
52-
id object;
53-
54-
parser = [[serializer alloc] init];
55-
object = [parser objectWithData:data];
56-
57-
return object;
58-
}
59-
60-
// try Foundation's JSON coder, available in OS X 10.7/iOS 5.0
61-
serializer = NSClassFromString(@"NSJSONSerialization");
62-
if (serializer) {
63-
return [serializer JSONObjectWithData:data options:0 error:error];
64-
}
65-
66-
// lastly, try JSONKit
67-
serializer = NSClassFromString(@"JSONDecoder");
68-
if (serializer) {
69-
return [[serializer decoder] objectWithData:data];
70-
}
71-
72-
// unable to find a suitable JSON deseralizer
73-
[NSException raise:SocketIOException format:@"socket.IO-objc requires SBJson, JSONKit or an OS that has NSJSONSerialization."];
74-
75-
return nil;
29+
return [NSJSONSerialization JSONObjectWithData:data options:0 error:error];
7630
}
7731

7832
+ (NSString *) JSONStringFromObject:(id)object error:(NSError **)error {
79-
Class serializer;
80-
NSString *jsonString;
81-
82-
jsonString = nil;
83-
serializer = NSClassFromString(@"SBJsonWriter");
84-
if (serializer) {
85-
id writer;
86-
87-
writer = [[serializer alloc] init];
88-
jsonString = [writer stringWithObject:object];
89-
90-
return jsonString;
91-
}
92-
93-
serializer = NSClassFromString(@"NSJSONSerialization");
94-
if (serializer) {
95-
NSData *data;
96-
97-
data = [serializer dataWithJSONObject:object options:0 error:error];
98-
99-
jsonString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
100-
101-
return jsonString;
102-
}
103-
104-
// lastly, try JSONKit
105-
if ([object respondsToSelector:@selector(JSONString)]) {
106-
return [object JSONString];
107-
}
108-
109-
// unable to find a suitable JSON seralizer
110-
[NSException raise:SocketIOException format:@"socket.IO-objc requires SBJson, JSONKit or an OS that has NSJSONSerialization."];
111-
112-
return nil;
33+
NSData *data = [NSJSONSerialization dataWithJSONObject:object options:0 error:error];
34+
return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
11335
}
11436

11537
@end

‎SocketTesterARC.xcodeproj/project.pbxproj

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,6 @@
1212
4A4453811589EE9100B44ABB /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A44537A1589EE9100B44ABB /* base64.c */; };
1313
4A4453821589EE9100B44ABB /* NSData+SRB64Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A44537D1589EE9100B44ABB /* NSData+SRB64Additions.m */; };
1414
4A4453831589EE9100B44ABB /* SRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A4453801589EE9100B44ABB /* SRWebSocket.m */; };
15-
4A92E916179548B40077B69C /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E903179548B40077B69C /* SBJsonParser.m */; };
16-
4A92E917179548B40077B69C /* SBJsonStreamParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E905179548B40077B69C /* SBJsonStreamParser.m */; };
17-
4A92E918179548B40077B69C /* SBJsonStreamParserAccumulator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E907179548B40077B69C /* SBJsonStreamParserAccumulator.m */; };
18-
4A92E919179548B40077B69C /* SBJsonStreamParserAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E909179548B40077B69C /* SBJsonStreamParserAdapter.m */; };
19-
4A92E91A179548B40077B69C /* SBJsonStreamParserState.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E90B179548B40077B69C /* SBJsonStreamParserState.m */; };
20-
4A92E91B179548B40077B69C /* SBJsonStreamTokeniser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E90D179548B40077B69C /* SBJsonStreamTokeniser.m */; };
21-
4A92E91C179548B40077B69C /* SBJsonStreamWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E90F179548B40077B69C /* SBJsonStreamWriter.m */; };
22-
4A92E91D179548B40077B69C /* SBJsonStreamWriterAccumulator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E911179548B40077B69C /* SBJsonStreamWriterAccumulator.m */; };
23-
4A92E91E179548B40077B69C /* SBJsonStreamWriterState.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E913179548B40077B69C /* SBJsonStreamWriterState.m */; };
24-
4A92E91F179548B40077B69C /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A92E915179548B40077B69C /* SBJsonWriter.m */; };
2515
4AD96DF41680853E00D9E42D /* SocketIOPacket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AD96DF31680853E00D9E42D /* SocketIOPacket.m */; };
2616
4AD96DF816808B7900D9E42D /* SocketIOTransportWebsocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AD96DF716808B7900D9E42D /* SocketIOTransportWebsocket.m */; };
2717
4AD96DFC16822DE300D9E42D /* SocketIOTransportXHR.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AD96DFB16822DE300D9E42D /* SocketIOTransportXHR.m */; };
@@ -50,27 +40,6 @@
5040
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; };
5141
4A44537F1589EE9100B44ABB /* SRWebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SRWebSocket.h; path = "submodules/socket-rocket/SocketRocket/SRWebSocket.h"; sourceTree = SOURCE_ROOT; };
5242
4A4453801589EE9100B44ABB /* SRWebSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SRWebSocket.m; path = "submodules/socket-rocket/SocketRocket/SRWebSocket.m"; sourceTree = SOURCE_ROOT; };
53-
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>"; };
54-
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>"; };
55-
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>"; };
56-
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>"; };
57-
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>"; };
58-
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>"; };
59-
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>"; };
60-
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>"; };
61-
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>"; };
62-
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>"; };
63-
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>"; };
64-
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>"; };
65-
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>"; };
66-
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>"; };
67-
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>"; };
68-
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>"; };
69-
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>"; };
70-
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>"; };
71-
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>"; };
72-
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>"; };
73-
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>"; };
7443
4AD96DF21680853E00D9E42D /* SocketIOPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketIOPacket.h; sourceTree = SOURCE_ROOT; };
7544
4AD96DF31680853E00D9E42D /* SocketIOPacket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SocketIOPacket.m; sourceTree = SOURCE_ROOT; };
7645
4AD96DF616808B7900D9E42D /* SocketIOTransportWebsocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SocketIOTransportWebsocket.h; path = ../SocketIOTransportWebsocket.h; sourceTree = "<group>"; };
@@ -119,35 +88,6 @@
11988
/* End PBXFrameworksBuildPhase section */
12089

12190
/* Begin PBXGroup section */
122-
4A4453781589EE6300B44ABB /* SBJson */ = {
123-
isa = PBXGroup;
124-
children = (
125-
4A92E901179548B40077B69C /* SBJson.h */,
126-
4A92E902179548B40077B69C /* SBJsonParser.h */,
127-
4A92E903179548B40077B69C /* SBJsonParser.m */,
128-
4A92E904179548B40077B69C /* SBJsonStreamParser.h */,
129-
4A92E905179548B40077B69C /* SBJsonStreamParser.m */,
130-
4A92E906179548B40077B69C /* SBJsonStreamParserAccumulator.h */,
131-
4A92E907179548B40077B69C /* SBJsonStreamParserAccumulator.m */,
132-
4A92E908179548B40077B69C /* SBJsonStreamParserAdapter.h */,
133-
4A92E909179548B40077B69C /* SBJsonStreamParserAdapter.m */,
134-
4A92E90A179548B40077B69C /* SBJsonStreamParserState.h */,
135-
4A92E90B179548B40077B69C /* SBJsonStreamParserState.m */,
136-
4A92E90C179548B40077B69C /* SBJsonStreamTokeniser.h */,
137-
4A92E90D179548B40077B69C /* SBJsonStreamTokeniser.m */,
138-
4A92E90E179548B40077B69C /* SBJsonStreamWriter.h */,
139-
4A92E90F179548B40077B69C /* SBJsonStreamWriter.m */,
140-
4A92E910179548B40077B69C /* SBJsonStreamWriterAccumulator.h */,
141-
4A92E911179548B40077B69C /* SBJsonStreamWriterAccumulator.m */,
142-
4A92E912179548B40077B69C /* SBJsonStreamWriterState.h */,
143-
4A92E913179548B40077B69C /* SBJsonStreamWriterState.m */,
144-
4A92E914179548B40077B69C /* SBJsonWriter.h */,
145-
4A92E915179548B40077B69C /* SBJsonWriter.m */,
146-
);
147-
name = SBJson;
148-
path = ..;
149-
sourceTree = "<group>";
150-
};
15191
4A4453791589EE7D00B44ABB /* SocketRocket */ = {
15292
isa = PBXGroup;
15393
children = (
@@ -198,7 +138,6 @@
198138
isa = PBXGroup;
199139
children = (
200140
4A4453791589EE7D00B44ABB /* SocketRocket */,
201-
4A4453781589EE6300B44ABB /* SBJson */,
202141
4ADCCBB015790D760022990C /* AppDelegate.h */,
203142
4ADCCBB115790D760022990C /* AppDelegate.m */,
204143
4ADCCBB315790D760022990C /* ViewController.h */,
@@ -305,16 +244,6 @@
305244
4AD96DF41680853E00D9E42D /* SocketIOPacket.m in Sources */,
306245
4AD96DF816808B7900D9E42D /* SocketIOTransportWebsocket.m in Sources */,
307246
4AD96DFC16822DE300D9E42D /* SocketIOTransportXHR.m in Sources */,
308-
4A92E916179548B40077B69C /* SBJsonParser.m in Sources */,
309-
4A92E917179548B40077B69C /* SBJsonStreamParser.m in Sources */,
310-
4A92E918179548B40077B69C /* SBJsonStreamParserAccumulator.m in Sources */,
311-
4A92E919179548B40077B69C /* SBJsonStreamParserAdapter.m in Sources */,
312-
4A92E91A179548B40077B69C /* SBJsonStreamParserState.m in Sources */,
313-
4A92E91B179548B40077B69C /* SBJsonStreamTokeniser.m in Sources */,
314-
4A92E91C179548B40077B69C /* SBJsonStreamWriter.m in Sources */,
315-
4A92E91D179548B40077B69C /* SBJsonStreamWriterAccumulator.m in Sources */,
316-
4A92E91E179548B40077B69C /* SBJsonStreamWriterState.m in Sources */,
317-
4A92E91F179548B40077B69C /* SBJsonWriter.m in Sources */,
318247
);
319248
runOnlyForDeploymentPostprocessing = 0;
320249
};

‎submodules/json-framework

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)