Skip to content

Commit 4ee196c

Browse files
committed
add default value to namespace in socketparsable
1 parent baca9fc commit 4ee196c

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

Source/SocketIOClient.swift

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -223,17 +223,13 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
223223
_emit([event] + items)
224224
}
225225

226-
/**
227-
Sends a message to the server, requesting an ack. Use the onAck method of SocketAckHandler to add
228-
an ack.
229-
*/
226+
/// Sends a message to the server, requesting an ack. Use the onAck method of SocketAckHandler to add
227+
/// an ack.
230228
public func emitWithAck(event: String, _ items: AnyObject...) -> OnAckCallback {
231229
return emitWithAck(event, withItems: items)
232230
}
233231

234-
/**
235-
Same as emitWithAck, but for Objective-C
236-
*/
232+
/// Same as emitWithAck, but for Objective-C
237233
public func emitWithAck(event: String, withItems items: [AnyObject]) -> OnAckCallback {
238234
return createOnAck([event] + items)
239235
}

Source/SocketParsable.swift

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ extension SocketParsable {
7676
return .Right(SocketPacket(type: type, nsp: "/"))
7777
}
7878

79-
var namespace: String?
79+
var namespace = "/"
8080
var placeholders = -1
8181

8282
if type == .BinaryEvent || type == .BinaryAck {
@@ -119,23 +119,24 @@ extension SocketParsable {
119119
// If first you don't succeed, try again
120120
if case let .Right(data) = parseData("\([noPlaceholders as AnyObject])") {
121121
return .Right(SocketPacket(type: type, data: data, id: Int(idString) ?? -1,
122-
nsp: namespace ?? "/", placeholders: placeholders))
122+
nsp: namespace, placeholders: placeholders))
123123
} else {
124124
return .Left(err)
125125
}
126126
case let .Right(data):
127127
return .Right(SocketPacket(type: type, data: data, id: Int(idString) ?? -1,
128-
nsp: namespace ?? "/", placeholders: placeholders))
128+
nsp: namespace, placeholders: placeholders))
129129
}
130130
}
131131

132132
// Parses data for events
133133
private func parseData(data: String) -> Either<String, [AnyObject]> {
134134
let stringData = data.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
135+
135136
do {
136137
if let arr = try NSJSONSerialization.JSONObjectWithData(stringData!,
137-
options: NSJSONReadingOptions.MutableContainers) as? [AnyObject] {
138-
return .Right(arr)
138+
options: NSJSONReadingOptions.MutableContainers) as? [AnyObject] {
139+
return .Right(arr)
139140
} else {
140141
return .Left("Expected data array")
141142
}

0 commit comments

Comments
 (0)