Skip to content

Remove ImmutableMappable code duplication #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dangthaison91 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove ImmutableMappable code duplication #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32569c1
Remove ImmutableMappable code duplication
dangthaison91 Feb 21, 2018
05a5ad6
Revert previous implementation
dangthaison91 Feb 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions Source/RxSwift/ObservableType+ObjectMapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,3 @@ public extension ObservableType where E == Response {
}
}
}


// MARK: - ImmutableMappable
public extension ObservableType where E == Response {

/// Maps data received from the signal into an object
/// which implements the ImmutableMappable protocol and returns the result back
/// If the conversion fails, the signal errors.
public func mapObject<T: ImmutableMappable>(_ type: T.Type, context: MapContext? = nil) -> Observable<T> {
return flatMap { response -> Observable<T> in
return Observable.just(try response.mapObject(T.self, context: context))
}
}

/// Maps data received from the signal into an array of objects
/// which implement the ImmutableMappable protocol and returns the result back
/// If the conversion fails, the signal errors.
public func mapArray<T: ImmutableMappable>(_ type: T.Type, context: MapContext? = nil) -> Observable<[T]> {
return flatMap { response -> Observable<[T]> in
return Observable.just(try response.mapArray(T.self, context: context))
}
}
}
23 changes: 0 additions & 23 deletions Source/RxSwift/Single+ObjectMapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,3 @@ public extension PrimitiveSequence where TraitType == SingleTrait, ElementType =
}
}
}


// MARK: - ImmutableMappable
public extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Response {

/// Maps data received from the signal into an object
/// which implements the ImmutableMappable protocol and returns the result back
/// If the conversion fails, the signal errors.
public func mapObject<T: ImmutableMappable>(_ type: T.Type, context: MapContext? = nil) -> Single<T> {
return flatMap { response -> Single<T> in
return Single.just(try response.mapObject(type, context: context))
}
}

/// Maps data received from the signal into an array of objects
/// which implement the ImmutableMappable protocol and returns the result back
/// If the conversion fails, the signal errors.
public func mapArray<T: ImmutableMappable>(_ type: T.Type, context: MapContext? = nil) -> Single<[T]> {
return flatMap { response -> Single<[T]> in
return Single.just(try response.mapArray(type, context: context))
}
}
}