cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more xcode 8 stuff

Browse Source
This commit is contained in:
Erik 2016-06-15 09:32:47 -04:00
parent 9a4ec5a82a
commit 2adcf2d35d
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SocketIO-MacTests/SocketSideEffectTest.swift
View File

@ -98,7 +98,7 @@ class SocketSideEffectTest: XCTestCase {
XCTAssertEqual(socket.testHandlers.count, 1) XCTAssertEqual(socket.testHandlers.count, 1)
socket.on("test") {data, ack in } socket.on("test") {data, ack in }
XCTAssertEqual(socket.testHandlers.count, 2) XCTAssertEqual(socket.testHandlers.count, 2)
socket.off(event: "test") socket.off("test")
XCTAssertEqual(socket.testHandlers.count, 0) XCTAssertEqual(socket.testHandlers.count, 0)
} }

2
Source/SocketEngine.swift
View File

@ -156,7 +156,7 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe
// binary in base64 string // binary in base64 string
let noPrefix = message[message.characters.index(message.startIndex, offsetBy: 2)..<message.endIndex] let noPrefix = message[message.characters.index(message.startIndex, offsetBy: 2)..<message.endIndex]
if let data = Data(base64Encoded: noPrefix, options: NSData.Base64EncodingOptions(rawValue: 0)) { if let data = Data(base64Encoded: noPrefix, options: Data.Base64EncodingOptions(rawValue: 0)) {
client?.parseEngineBinaryData(data) client?.parseEngineBinaryData(data)
} }

2
Source/SocketEngineSpec.swift
View File

@ -84,7 +84,7 @@ extension SocketEngineSpec {
return .left(mutData as Data) return .left(mutData as Data)
} else { } else {
let str = "b4" + data.base64EncodedString(NSData.Base64EncodingOptions(rawValue: 0)) let str = "b4" + data.base64EncodedString(Data.Base64EncodingOptions(rawValue: 0))
return .right(str) return .right(str)
} }

2
Source/SocketIOClient.swift
View File

@ -331,7 +331,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
} }
/// Removes handler(s) based on name /// Removes handler(s) based on name
public func off(event: String) { public func off(_ event: String) {
DefaultSocketLogger.Logger.log("Removing handler for event: %@", type: logType, args: event) DefaultSocketLogger.Logger.log("Removing handler for event: %@", type: logType, args: event)
handlers = handlers.filter({ $0.event != event }) handlers = handlers.filter({ $0.event != event })

1
Source/SocketTypes.swift
View File

@ -33,6 +33,7 @@ extension Double : SocketData {}
extension Int : SocketData {} extension Int : SocketData {}
extension NSArray : SocketData {} extension NSArray : SocketData {}
extension Data : SocketData {} extension Data : SocketData {}
extension NSData : SocketData {}
extension NSDictionary : SocketData {} extension NSDictionary : SocketData {}
extension NSString : SocketData {} extension NSString : SocketData {}
extension NSNull : SocketData {} extension NSNull : SocketData {}

6
Source/WebSocket/WebSocket.swift
View File

@ -270,7 +270,7 @@ public class WebSocket : NSObject, StreamDelegate {
key += "\(Character(uni))" key += "\(Character(uni))"
} }
let data = key.data(using: String.Encoding.utf8) let data = key.data(using: String.Encoding.utf8)
let baseKey = data?.base64EncodedString(NSData.Base64EncodingOptions(rawValue: 0)) let baseKey = data?.base64EncodedString(Data.Base64EncodingOptions(rawValue: 0))
return baseKey! return baseKey!
} }
@ -420,9 +420,9 @@ public class WebSocket : NSObject, StreamDelegate {
let data = inputQueue[0] let data = inputQueue[0]
var work = data var work = data
if let fragBuffer = fragBuffer { if let fragBuffer = fragBuffer {
var combine = NSData(data: fragBuffer) as Data let combine = NSMutableData(data: fragBuffer)
combine.append(data) combine.append(data)
work = combine work = combine as Data
self.fragBuffer = nil self.fragBuffer = nil
} }
let buffer = UnsafePointer<UInt8>((work as NSData).bytes) let buffer = UnsafePointer<UInt8>((work as NSData).bytes)