Merge branch 'master' into feature/general_loading_and_pagination

# Conflicts:
#	Sources/Extensions/Alamofire/AlamofireManager+Extensions.swift
This commit is contained in:
Ivan Smolin 2017-12-01 17:21:19 +03:00
commit 85b1a119e2
3 changed files with 6 additions and 2 deletions

View File

@ -1,5 +1,9 @@
# Changelog
### 0.6.5
- **Add**: Ability to handle responses with non-default status codes.
### 0.6.4
- **Fix**: SpinnerView bug(no animation) in Swift 4.

View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "LeadKit"
s.version = "0.6.4"
s.version = "0.6.5"
s.summary = "iOS framework with a bunch of tools for rapid development"
s.homepage = "https://github.com/TouchInstinct/LeadKit"
s.license = "Apache License, Version 2.0"

View File

@ -88,7 +88,7 @@ public extension Reactive where Base: Alamofire.SessionManager {
acceptableStatusCodes: [Int] = Base.defaultAcceptableStatusCodes)
-> Observable<(response: HTTPURLResponse, model: T)> where T.ModelType == T {
return apiRequest(requestParameters: requestParameters)
return apiRequest(requestParameters: requestParameters, acceptableStatusCodes: acceptableStatusCodes)
.flatMap { $0.rx.observableApiResponse(mappingQueue: mappingQueue) }
}