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

Fixes examples.

This commit is contained in:
Krunoslav Zaher 2015-05-23 16:19:19 +02:00
parent 1e889a836f
commit d71bb8777e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ struct WikipediaPage {
let text = json.valueForKey("parse")?.valueForKey("text")?.valueForKey("*") as? String
if title == nil || text == nil {
return .Error(apiError("Error parsing page content"))
return failure(apiError("Error parsing page content"))
}
return success(WikipediaPage(title: title!, text: text!))

10
RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaSearchResult.swift
View File

@ -27,13 +27,13 @@ struct WikipediaSearchResult: Printable {
.map { $0! }
if rootArrayTyped.count != 3 {
return .Error(WikipediaParseError)
return failure(WikipediaParseError)
}
let titleAndDescription = Array(Zip2(rootArrayTyped[0], rootArrayTyped[1]))
let titleDescriptionAndUrl: [((AnyObject, AnyObject), AnyObject)] = Array(Zip2(titleAndDescription, rootArrayTyped[2]))
let searchResults: [Result<WikipediaSearchResult>] = titleDescriptionAndUrl.map ( { result -> RxResult<WikipediaSearchResult> in
let searchResults: [RxResult<WikipediaSearchResult>] = titleDescriptionAndUrl.map ( { result -> RxResult<WikipediaSearchResult> in
let ((title: AnyObject, description: AnyObject), url: AnyObject) = result
let titleString = title as? String,
@ -41,18 +41,18 @@ struct WikipediaSearchResult: Printable {
urlString = url as? String
if titleString == nil || descriptionString == nil || urlString == nil {
return .Error(WikipediaParseError)
return failure(WikipediaParseError)
}
let URL = NSURL(string: urlString!)
if URL == nil {
return .Error(WikipediaParseError)
return failure(WikipediaParseError)
}
return success(WikipediaSearchResult(title: titleString!, description: descriptionString!, URL: URL!))
})
let values = (searchResults.filter { $0.value != nil }).map { *$0 }
let values = (searchResults.filter { $0.isSuccess }).map { $0.get() }
return success(values)
}

2
RxExample/RxExample/Services/ImageService.swift
View File

@ -45,7 +45,7 @@ class DefaultImageService: ImageService {
if maybeImage == nil {
// some error
return .Error(apiError("Decoding image error"))
return failure(apiError("Decoding image error"))
}
let image = maybeImage!