Skip to content
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.

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

add support convert from snake case #374

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Source/Configuration.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public struct DeserializeOptions: OptionSet {
public let rawValue: Int

public static let caseInsensitive = DeserializeOptions(rawValue: 1 << 0)

public static let convertFromSnakeCase = DeserializeOptions(rawValue: 1 << 1)

public static let defaultOptions: DeserializeOptions = []

Expand Down
10 changes: 10 additions & 0 deletions Source/ExtendCustomModelType.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ fileprivate func convertKeyIfNeeded(dict: [String: Any]) -> [String: Any] {
newDict[key.lowercased()] = value
})
return newDict
} else if HandyJSONConfiguration.deserializeOptions.contains(.convertFromSnakeCase) {
var newDict = [String: Any]()
dict.forEach({ (kvPair) in
let (key, value) = kvPair
let result = key.split(separator: "_").reduce("") {(acc, name) in
"\(acc)\(acc.count > 0 ? String(name.capitalized) : String(name))"
}
newDict[result] = value
})
return newDict
}
return dict
}
Expand Down
16 changes: 16 additions & 0 deletions Tests/HandyJSONTests/BasicTypesInStructTestsFromJSON.swift
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,22 @@ class BasicTypesInStructTestsFromJSON: XCTestCase {
XCTAssertEqual(mappedObject?.anyObjectOptional as? Int, value2)
XCTAssertEqual(mappedObject?.anyObjectImplicitlyUnwrapped as? Double, value3)
}

func testMappingAnyObjectFromJSONByConvertFromSnakeCase() {
HandyJSONConfiguration.deserializeOptions = .convertFromSnakeCase
defer {
HandyJSONConfiguration.deserializeOptions = .defaultOptions
}
let value1 = "STRING"
let value2: Int = 1234
let value3: Double = 11.11
let JSONString = "{\"any_object\" : \"\(value1)\", \"any_object_optional\" : \(value2), \"any_object_implicitly_unwrapped\" : \(value3)}"
let mappedObject = BasicTypesInStruct.deserialize(from: JSONString)
XCTAssertNotNil(mappedObject)
XCTAssertEqual(mappedObject?.anyObject as? String, value1)
XCTAssertEqual(mappedObject?.anyObjectOptional as? Int, value2)
XCTAssertEqual(mappedObject?.anyObjectImplicitlyUnwrapped as? Double, value3)
}

func testMappingStringFromNSStringJSON(){
let value: String = "STRINGNGNGG"
Expand Down