whitespaces issues, kzaher comments and pipelines in new lines

This commit is contained in:
Carlos García 2015-05-14 11:22:07 +02:00
parent 8f343c226d
commit 3fbe7d42bb
8 changed files with 135 additions and 108 deletions

View File

@ -43,14 +43,17 @@ class GitHubAPI {
let URL = NSURL(string: "https://github.com/\(URLEscape(username))")!
let request = NSURLRequest(URL: URL)
return self.URLSession.rx_response(request) >- map { (maybeData, maybeResponse) in
return self.URLSession.rx_response(request)
>- map { (maybeData, maybeResponse) in
if let response = maybeResponse as? NSHTTPURLResponse {
return response.statusCode == 404
}
else {
return false
}
} >- observeSingleOn(self.dataScheduler) >- catch { result in
}
>- observeSingleOn(self.dataScheduler)
>- catch { result in
return returnElement(false)
}
}

View File

@ -40,14 +40,16 @@ class ValidationService {
let loadingValue = (valid: nil as Bool?, message: "Checking availabilty ..." as String?)
return API.usernameAvailable(username) >- map { available in
return API.usernameAvailable(username)
>- map { available in
if available {
return (true, "Username available")
}
else {
return (false, "Username already taken")
}
} >- startWith(loadingValue)
}
>- startWith(loadingValue)
}
func validatePassword(password: String) -> ValidationResult {
@ -176,13 +178,16 @@ class GitHubSignupViewController : ViewController {
validationErrorLabel: self.repeatedPasswordValidationOutlet
)
signupEnabled >- subscribeNext { [unowned self] valid in
signupEnabled
>- subscribeNext { [unowned self] valid in
self.signupOutlet.enabled = valid
self.signupOutlet.alpha = valid ? 1.0 : 0.5
} >- disposeBag.addDisposable
}
>- disposeBag.addDisposable
signingProcess >- subscribeNext { [unowned self] signingResult in
signingProcess
>- subscribeNext { [unowned self] signingResult in
switch signingResult {
case .SigningUp:
self.signingUpOulet.hidden = false
@ -190,6 +195,7 @@ class GitHubSignupViewController : ViewController {
self.signingUpOulet.hidden = true
let controller: UIAlertController
if signed {
controller = UIAlertController(title: "GitHub", message: "Mock signed up to GitHub", preferredStyle: .Alert)
}
@ -202,7 +208,8 @@ class GitHubSignupViewController : ViewController {
default:
self.signingUpOulet.hidden = true
}
} >- disposeBag.addDisposable
}
>- disposeBag.addDisposable
}
// This is one of the reasons why it's a good idea for disposal to be detached from allocations.

View File

@ -26,11 +26,16 @@ class SearchViewModel: Disposable {
let wireframe = Dependencies.sharedDependencies.wireframe
let API = DefaultWikipediaAPI.sharedAPI
self.rows = searchText >- throttle(300, $.mainScheduler) >- distinctUntilChanged >- map { query in
self.rows = searchText
>- throttle(300, $.mainScheduler)
>- distinctUntilChanged
>- map { query in
API.getSearchResults(query)
>- startWith([]) // clears results on new search term
>- catch([])
} >- switchLatest >- map { results in
}
>- switchLatest
>- map { results in
results.map {
SearchResultViewModel(
searchResult: $0
@ -38,9 +43,11 @@ class SearchViewModel: Disposable {
}
}
selectedResult >- subscribeNext { searchResult in
selectedResult
>- subscribeNext { searchResult in
wireframe.openURL(searchResult.searchResult.URL)
} >- disposeBag.addDisposable
}
>- disposeBag.addDisposable
}
func dispose() {

View File

@ -44,7 +44,8 @@ public class WikipediaSearchCell: UITableViewCell {
>- map { $0 as UIImage? }
>- catch(nil)
>- startWith(loadingPlaceholder)
} >- disposeBag.addDisposable
}
>- disposeBag.addDisposable
self.disposeBag = disposeBag
}

View File

@ -40,18 +40,22 @@ class WikipediaSearchViewController: ViewController {
// map table view rows
// {
viewModel.rows >- resultsTableView.rx_subscribeRowsToCellWithIdentifier("WikipediaSearchCell") { (_, _, viewModel, cell: WikipediaSearchCell) in
viewModel.rows
>- resultsTableView.rx_subscribeRowsToCellWithIdentifier("WikipediaSearchCell") { (_, _, viewModel, cell: WikipediaSearchCell) in
cell.viewModel = viewModel
} >- disposeBag.addDisposable
}
>- disposeBag.addDisposable
// }
// dismiss keyboard on scroll
// {
resultsTableView.rx_contentOffset() >- subscribeNext { _ in
resultsTableView.rx_contentOffset()
>- subscribeNext { _ in
if searchBar.isFirstResponder() {
_ = searchBar.resignFirstResponder()
}
} >- disposeBag.addDisposable
}
>- disposeBag.addDisposable
disposeBag.addDisposable(viewModel)

View File

@ -39,11 +39,14 @@ class DefaultWikipediaAPI: WikipediaAPI {
let urlContent = "http://en.wikipedia.org/w/api.php?action=opensearch&search=\(escapedQuery)"
let url = NSURL(string: urlContent)!
return $.URLSession.rx_JSON(url) >- observeSingleOn($.backgroundWorkScheduler) >- mapOrDie { json in
return $.URLSession.rx_JSON(url)
>- observeSingleOn($.backgroundWorkScheduler)
>- mapOrDie { json in
return castOrFail(json) >== { (json: [AnyObject]) in
return WikipediaSearchResult.parseJSON(json)
}
} >- observeSingleOn($.mainScheduler)
}
>- observeSingleOn($.mainScheduler)
}
// http://en.wikipedia.org/w/api.php?action=parse&page=rx&format=json
@ -55,10 +58,12 @@ class DefaultWikipediaAPI: WikipediaAPI {
return failWith(apiError("Can't create url"))
}
return $.URLSession.rx_JSON(url!) >- mapOrDie { jsonResult in
return $.URLSession.rx_JSON(url!)
>- mapOrDie { jsonResult in
return castOrFail(jsonResult) >== { (json: NSDictionary) in
return WikipediaPage.parseJSON(json)
}
} >- observeSingleOn($.mainScheduler)
}
>- observeSingleOn($.mainScheduler)
}
}