TouchInstinct
/
RxSwift
303
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #346 from nanoxd/update-api-docs 

[NSURLSession] Remove force unwrapped return from rx_JSON
This commit is contained in:
Krunoslav Zaher 2015-12-16 20:43:48 +01:00
parent c32a46b526 4ae3e1281e
commit 53cb12e253
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/API.md
View File

@ -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<NSData> {}
public func rx_JSON(request: NSURLRequest) -> Observable<AnyObject!> {}
public func rx_JSON(request: NSURLRequest) -> Observable<AnyObject> {}
public func rx_JSON(URL: NSURL) -> Observable<AnyObject!> {}
public func rx_JSON(URL: NSURL) -> Observable<AnyObject> {}
}
```

8
RxCocoa/Common/Observables/NSURLSession+Rx.swift
View File

@ -74,7 +74,7 @@ func convertURLRequestToCurlCommand(request: NSURLRequest) -> String {
returnValue += "-H \"\(escapedKey): \(escapedValue)\" "
}
let URLString = request.URL?.absoluteString ?? "<unkown url>"
let URLString = request.URL?.absoluteString ?? "<unknown url>"
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<AnyObject!> {
return rx_data(request).map { (data) -> AnyObject! in
public func rx_JSON(request: NSURLRequest) -> Observable<AnyObject> {
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<AnyObject!> {
public func rx_JSON(URL: NSURL) -> Observable<AnyObject> {
return rx_JSON(NSURLRequest(URL: URL))
}
}

2
RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaAPI.swift
View File

@ -37,7 +37,7 @@ class DefaultWikipediaAPI: WikipediaAPI {
private init() {}
private func rx_JSON(URL: NSURL) -> Observable<AnyObject!> {
private func rx_JSON(URL: NSURL) -> Observable<AnyObject> {
return $.URLSession
.rx_JSON(URL)
.trackActivity(loadingWikipediaData)