Skip to content

Commit 0849d23

Browse files
committed
Update Class and methods to be Public.
1 parent d06723f commit 0849d23

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

Source/RxStarscream.swift

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class RxWebSocket: WebSocket {
2121
private var forwardDelegate: WebSocketDelegate?
2222
private var forwardPongDelegate: WebSocketPongDelegate?
2323

24-
override weak public var delegate: WebSocketDelegate? {
24+
public override weak var delegate: WebSocketDelegate? {
2525
didSet {
2626
if delegate === self {
2727
return
@@ -31,7 +31,7 @@ public class RxWebSocket: WebSocket {
3131
}
3232
}
3333

34-
override weak public var pongDelegate: WebSocketPongDelegate? {
34+
public override weak var pongDelegate: WebSocketPongDelegate? {
3535
didSet {
3636
if pongDelegate === self {
3737
return
@@ -41,22 +41,29 @@ public class RxWebSocket: WebSocket {
4141
}
4242
}
4343

44-
private(set) lazy var rx_response: Observable<WebSocketEvent> = {
44+
public private(set) lazy var rx_response: Observable<WebSocketEvent> = {
4545
return self.subject
4646
}()
4747

48-
private(set) lazy var rx_text: Observable<WebSocketEvent> = {
48+
public private(set) lazy var rx_text: Observable<String> = {
4949
return self.subject.filter { response in
5050
switch response {
5151
case .Message(_):
5252
return true
5353
default:
5454
return false
5555
}
56+
}.map { response in
57+
switch response {
58+
case .Message(let message):
59+
return message
60+
default:
61+
return String()
62+
}
5663
}
5764
}()
5865

59-
override public func connect() {
66+
public override func connect() {
6067
super.connect()
6168
delegate = self
6269
pongDelegate = self
@@ -91,4 +98,4 @@ extension RxWebSocket: WebSocketDelegate {
9198
subject.on(.Next(WebSocketEvent.Data(data)))
9299
forwardDelegate?.websocketDidReceiveData(socket, data: data)
93100
}
94-
}
101+
}

0 commit comments

Comments
 (0)