Skip to content

add toDictionary, toJSONString #2

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
iamchiwon wants to merge 5 commits into
base: master
Choose a base branch
from
Open

add toDictionary, toJSONString #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a044722
adding [String:Any] type
iamchiwon-ncode Jan 2, 2018
7df8bfe
add toDictionay, toJSONString
iamchiwon-ncode Jan 2, 2018
770349a
toDictionay, toJSONString got JSONEncoder parameter
iamchiwon-ncode Jan 3, 2018
c07dd44
toJSONString parameter order changed: first JSONEncoder, last String.…
iamchiwon-ncode Jan 3, 2018
ef78616
rename toDictionary -> mapDictionary, toJSONString -> mapJSONString
iamchiwon-ncode Jan 4, 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
45 changes: 45 additions & 0 deletions Sources/RxCodable/Maybe+RxCodable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,48 @@ public extension PrimitiveSequenceType where TraitType == MaybeTrait, ElementTyp
}
}

public extension PrimitiveSequenceType where TraitType == MaybeTrait, ElementType == [String: Any] {
public func map<T>(_ type: T.Type, using decoder: JSONDecoder? = nil) -> PrimitiveSequence<TraitType, T> where T: Decodable {
return self
.map { dict in try JSONSerialization.data(withJSONObject: dict) }
.map(type, using: decoder)
}
}

public extension PrimitiveSequenceType where TraitType == MaybeTrait, ElementType == [[String: Any]] {
public func map<T>(_ type: Array<T>.Type, using decoder: JSONDecoder? = nil) -> PrimitiveSequence<TraitType, [T]> where T: Decodable {
return self
.flatMap {
Observable.from($0)
.map(T.self, using: decoder)
.toArray()
.asMaybe()
}
}
}

public extension PrimitiveSequenceType where TraitType == MaybeTrait, ElementType: Encodable {
public func mapDictionary(_ encoder: JSONEncoder? = nil) -> PrimitiveSequence<TraitType, [String: Any]> {
return self.map { encodable -> [String: Any] in
let data = try (encoder ?? JSONEncoder()).encode(encodable)
let dict = try JSONSerialization.jsonObject(with: data) as? [String: Any]
guard let dictionary = dict else {
throw RxCodableError.castingFailed(data: data, type: [String: Any].self)
}
return dictionary
}
}
}

public extension PrimitiveSequenceType where TraitType == MaybeTrait, ElementType: Encodable {
public func mapJSONString(_ encoder: JSONEncoder? = nil, encoding: String.Encoding = .utf8) -> PrimitiveSequence<TraitType, String> {
return self.map { encodable -> String in
let data = try (encoder ?? JSONEncoder()).encode(encodable)
let json = String(data: data, encoding: encoding)
guard let jsonString = json else {
throw RxCodableError.castingFailed(data: data, type: String.self)
}
return jsonString
}
}
}
44 changes: 44 additions & 0 deletions Sources/RxCodable/ObservableType+RxCodable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,47 @@ public extension ObservableType where E == String {
.map(type, using: decoder)
}
}

public extension ObservableType where E == [String: Any] {
public func map<T>(_ type: T.Type, using decoder: JSONDecoder? = nil) -> Observable<T> where T: Decodable {
return self
.map { dict in try JSONSerialization.data(withJSONObject: dict) }
.map(type, using: decoder)
}
}

public extension ObservableType where E == [[String: Any]] {
public func map<T>(_ type: Array<T>.Type, using decoder: JSONDecoder? = nil) -> Observable<[T]> where T: Decodable {
Copy link
Copy Markdown
Owner

@devxoul devxoul Jan 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this? The 'array mapping' I meant was about func mapArray() which maps Observable<[T]> to Observable<[[String: Any]]>.

Copy link
Copy Markdown
Author

@iamchiwon iamchiwon Jan 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh.. my misunderstood. now I see.

Copy link
Copy Markdown
Author

@iamchiwon iamchiwon Jan 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm.. It's not as easy as I thought.

return self
.flatMap { Observable.from($0) }
.map(T.self, using: decoder)
.toArray()
}
}

public extension ObservableType where E: Encodable {
public func mapDictionary(_ encoder: JSONEncoder? = nil) -> Observable<[String: Any]> {
return self.map { encodable -> [String: Any] in
let data = try (encoder ?? JSONEncoder()).encode(encodable)
let dict = try JSONSerialization.jsonObject(with: data) as? [String: Any]
guard let dictionary = dict else {
throw RxCodableError.castingFailed(data: data, type: [String: Any].self)
}
return dictionary
}
}
}

public extension ObservableType where E: Encodable {
public func mapJSONString(_ encoder: JSONEncoder? = nil, encoding: String.Encoding = .utf8) -> Observable<String> {
return self.map { encodable -> String in
let data = try (encoder ?? JSONEncoder()).encode(encodable)
let json = String(data: data, encoding: encoding)
guard let jsonString = json else {
throw RxCodableError.castingFailed(data: data, type: String.self)
}
return jsonString
}
}
}

5 changes: 5 additions & 0 deletions Sources/RxCodable/RxCodableError.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import Foundation

public enum RxCodableError: Error {
case castingFailed(data: Any, type: Any.Type)
}
46 changes: 46 additions & 0 deletions Sources/RxCodable/Single+RxCodable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,49 @@ public extension PrimitiveSequenceType where TraitType == SingleTrait, ElementTy
.map(type, using: decoder)
}
}

public extension PrimitiveSequenceType where TraitType == SingleTrait, ElementType == [String: Any] {
public func map<T>(_ type: T.Type, using decoder: JSONDecoder? = nil) -> PrimitiveSequence<TraitType, T> where T: Decodable {
return self
.map { dict in try JSONSerialization.data(withJSONObject: dict) }
.map(type, using: decoder)
}
}

public extension PrimitiveSequenceType where TraitType == SingleTrait, ElementType == [[String: Any]] {
public func map<T>(_ type: Array<T>.Type, using decoder: JSONDecoder? = nil) -> PrimitiveSequence<TraitType, [T]> where T: Decodable {
return self
.flatMap {
Observable.from($0)
.map(T.self, using: decoder)
.toArray()
.asSingle()
}
}
}

public extension PrimitiveSequenceType where TraitType == SingleTrait, ElementType: Encodable {
public func mapDictionary(_ encoder: JSONEncoder? = nil) -> PrimitiveSequence<TraitType, [String: Any]> {
return self.map { encodable -> [String: Any] in
let data = try (encoder ?? JSONEncoder()).encode(encodable)
let dict = try JSONSerialization.jsonObject(with: data) as? [String: Any]
guard let dictionary = dict else {
throw RxCodableError.castingFailed(data: data, type: [String: Any].self)
}
return dictionary
}
}
}

public extension PrimitiveSequenceType where TraitType == SingleTrait, ElementType: Encodable {
public func mapJSONString(_ encoder: JSONEncoder? = nil, encoding: String.Encoding = .utf8) -> PrimitiveSequence<TraitType, String> {
return self.map { encodable -> String in
let data = try (encoder ?? JSONEncoder()).encode(encodable)
let json = String(data: data, encoding: encoding)
guard let jsonString = json else {
throw RxCodableError.castingFailed(data: data, type: String.self)
}
return jsonString
}
}
}
102 changes: 102 additions & 0 deletions Tests/RxCodableTests/RxCodableTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,106 @@ class RxCodableTests: XCTestCase {
XCTAssertEqual(try Single.just(jsonString).map([User].self).toBlocking().first()!, users)
XCTAssertEqual(try Maybe.just(jsonString).map([User].self).toBlocking().first()!, users)
}

func testMapCodableFromDictionary() {
let dictionary: [String:Any] = [
"id": 123,
"name": "iamchiwon",
]
let user = User(id: 123, name: "iamchiwon")
XCTAssertEqual(try Observable.just(dictionary).map(User.self).toBlocking().first()!, user)
XCTAssertEqual(try Single.just(dictionary).map(User.self).toBlocking().first()!, user)
XCTAssertEqual(try Maybe.just(dictionary).map(User.self).toBlocking().first()!, user)
}

func testMapCodablemapDictionary() {
let dictionary: [String:Any] = [
"id": 123,
"name": "iamchiwon",
]
let user = User(id: 123, name: "iamchiwon")
XCTAssertEqual(try Observable.just(user).mapDictionary().toBlocking().first()! as NSObject, dictionary as NSObject)
XCTAssertEqual(try Single.just(user).mapDictionary().toBlocking().first()! as NSObject, dictionary as NSObject)
XCTAssertEqual(try Maybe.just(user).mapDictionary().toBlocking().first()! as NSObject, dictionary as NSObject)
}

func testMapCodablemapJSONString() {
let jsonString = """
{
"id": 123,
"name": "iamchiwon"
}
"""
let user = User(id: 123, name: "iamchiwon")
XCTAssertEqual(try Observable.just(user).mapJSONString().toBlocking().first()!,
try Observable.just(jsonString).map(User.self).mapJSONString().toBlocking().first()!)
XCTAssertEqual(try Single.just(user).mapJSONString().toBlocking().first()!,
try Single.just(jsonString).map(User.self).mapJSONString().toBlocking().first()!)
XCTAssertEqual(try Maybe.just(user).mapJSONString().toBlocking().first()!,
try Maybe.just(jsonString).map(User.self).mapJSONString().toBlocking().first()!)
}

func testMapCodableArraymapJSONString() {
let jsonString = """
[
{
"id": 123,
"name": "iamchiwon"
},
{
"id": 456,
"name": "devxoul"
}
]
"""
let users = [
User(id: 123, name: "iamchiwon"),
User(id: 456, name: "devxoul"),
]
XCTAssertEqual(try Observable.just(users).mapJSONString().toBlocking().first()!,
try Observable.just(jsonString).map([User].self).mapJSONString().toBlocking().first()!)
XCTAssertEqual(try Single.just(users).mapJSONString().toBlocking().first()!,
try Single.just(jsonString).map([User].self).mapJSONString().toBlocking().first()!)
XCTAssertEqual(try Maybe.just(users).mapJSONString().toBlocking().first()!,
try Maybe.just(jsonString).map([User].self).mapJSONString().toBlocking().first()!)
}

func testMapCodableFromJSONStringmapDictionary() {
let jsonString = """
{
"id": 123,
"name": "iamchiwon"
}
"""
let dictionary: [String:Any] = [
"id": 123,
"name": "iamchiwon",
]
XCTAssertEqual(try Observable.just(jsonString).map(User.self).mapDictionary().toBlocking().first()! as NSObject, dictionary as NSObject)
XCTAssertEqual(try Single.just(jsonString).map(User.self).mapDictionary().toBlocking().first()! as NSObject, dictionary as NSObject)
XCTAssertEqual(try Maybe.just(jsonString).map(User.self).mapDictionary().toBlocking().first()! as NSObject, dictionary as NSObject)
}

func testMapCodableArraymapDictionary() {
let dictionaries: [[String:Any]] = [
[
"id": 123,
"name": "iamchiwon",
],
[
"id": 456,
"name": "devxoul",
]
]
let users = [
User(id: 123, name: "iamchiwon"),
User(id: 456, name: "devxoul"),
]
XCTAssertEqual(try Observable.just(dictionaries).map([User].self).mapJSONString().toBlocking().first()!,
try Observable.just(users).mapJSONString().toBlocking().first()!)
XCTAssertEqual(try Single.just(dictionaries).map([User].self).mapJSONString().toBlocking().first()!,
try Single.just(users).mapJSONString().toBlocking().first()!)
XCTAssertEqual(try Maybe.just(dictionaries).map([User].self).mapJSONString().toBlocking().first()!,
try Maybe.just(users).mapJSONString().toBlocking().first()!)
}
}