diff --git a/Documentation/API.md b/Documentation/API.md index e5e2e1f2..87cfc549 100644 --- a/Documentation/API.md +++ b/Documentation/API.md @@ -137,13 +137,13 @@ extension NSObject { ```swift extension NSURLSession { - public func rx_response(request: NSURLRequest) -> Observable<(NSData!, NSURLResponse!)> {} + public func rx_response(request: NSURLRequest) -> Observable<(NSData, NSURLResponse)> {} public func rx_data(request: NSURLRequest) -> Observable {} - public func rx_JSON(request: NSURLRequest) -> Observable {} + public func rx_JSON(request: NSURLRequest) -> Observable {} - public func rx_JSON(URL: NSURL) -> Observable {} + public func rx_JSON(URL: NSURL) -> Observable {} } ``` diff --git a/RxCocoa/Common/Observables/NSURLSession+Rx.swift b/RxCocoa/Common/Observables/NSURLSession+Rx.swift index 72bccab2..4b462e7b 100644 --- a/RxCocoa/Common/Observables/NSURLSession+Rx.swift +++ b/RxCocoa/Common/Observables/NSURLSession+Rx.swift @@ -74,7 +74,7 @@ func convertURLRequestToCurlCommand(request: NSURLRequest) -> String { returnValue += "-H \"\(escapedKey): \(escapedValue)\" " } - let URLString = request.URL?.absoluteString ?? "" + let URLString = request.URL?.absoluteString ?? "" returnValue += "\"\(escapeTerminalString(URLString))\"" @@ -204,8 +204,8 @@ extension NSURLSession { - returns: Observable sequence of response JSON. */ @warn_unused_result(message="http://git.io/rxs.uo") - public func rx_JSON(request: NSURLRequest) -> Observable { - return rx_data(request).map { (data) -> AnyObject! in + public func rx_JSON(request: NSURLRequest) -> Observable { + return rx_data(request).map { (data) -> AnyObject in do { return try NSJSONSerialization.JSONObjectWithData(data ?? NSData(), options: []) } catch let error { @@ -232,7 +232,7 @@ extension NSURLSession { - returns: Observable sequence of response JSON. */ @warn_unused_result(message="http://git.io/rxs.uo") - public func rx_JSON(URL: NSURL) -> Observable { + public func rx_JSON(URL: NSURL) -> Observable { return rx_JSON(NSURLRequest(URL: URL)) } } diff --git a/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaAPI.swift b/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaAPI.swift index 2d76f4c3..41eb72ac 100644 --- a/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaAPI.swift +++ b/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaAPI.swift @@ -37,7 +37,7 @@ class DefaultWikipediaAPI: WikipediaAPI { private init() {} - private func rx_JSON(URL: NSURL) -> Observable { + private func rx_JSON(URL: NSURL) -> Observable { return $.URLSession .rx_JSON(URL) .trackActivity(loadingWikipediaData)