From 6263720e3d0342e1b86cf75ca510544ce90a0792 Mon Sep 17 00:00:00 2001 From: "Christiano, Kevin" Date: Thu, 2 May 2019 14:06:51 -0400 Subject: [PATCH] updated take on dictionary extension. Removed unnecessary calls to optionalChain func. Simplified method internals. --- .../Categories/Dictionary+MFConvenience.swift | 143 ++++++++---------- 1 file changed, 61 insertions(+), 82 deletions(-) diff --git a/MVMCore/MVMCore/Categories/Dictionary+MFConvenience.swift b/MVMCore/MVMCore/Categories/Dictionary+MFConvenience.swift index 9f3af95..5f1c096 100644 --- a/MVMCore/MVMCore/Categories/Dictionary+MFConvenience.swift +++ b/MVMCore/MVMCore/Categories/Dictionary+MFConvenience.swift @@ -11,179 +11,158 @@ import Foundation public extension Dictionary { /// Returns a Dictionary using the specified chain. An empty dictionary is returned if a dictionary for the chain does not exist - func dictionaryWithChainOfKeysOrIndexes(_ keysOrIndexes: [Any]) -> [String : Any] { + func dictionaryWithChainOfKeysOrIndexes(_ keysOrIndexes: [Any]) -> [String: Any] { - guard let dictionary = optionalDictionaryWithChainOfKeysOrIndexes(keysOrIndexes) else { - return [:] - } - return dictionary + return optionalDictionaryWithChainOfKeysOrIndexes(keysOrIndexes) ?? [:] } /// Returns an optional Dictionary using the specified chain. Returns nil if a dictionary for the chain does not exist - func optionalDictionaryWithChainOfKeysOrIndexes (_ keysOrIndexes: [Any]) -> [String : Any]? { + func optionalDictionaryWithChainOfKeysOrIndexes(_ keysOrIndexes: [Any]) -> [String: Any]? { return objectChainOfKeysOrIndexes(keysOrIndexes) as? [String: Any] } - func optionalDictionaryForKey(_ key: String) -> [String : Any]? { + func optionalDictionaryForKey(_ key: String) -> [String: Any]? { - return objectChainOfKeysOrIndexes([key]) as? [String: Any] + guard let key = key as? Key else { return nil } + + return self[key] as? [String: Any] } /// Returns a String using the specified chain. An empty string is returned if a string for the chain does not exist - func stringWithChainOfKeysOrIndexes(_ keysOrIndexes:[Any]) -> String { + func stringWithChainOfKeysOrIndexes(_ keysOrIndexes: [Any]) -> String { - guard let string = objectChainOfKeysOrIndexes(keysOrIndexes) as? String else { - return "" - } - return string + return objectChainOfKeysOrIndexes(keysOrIndexes) as? String ?? "" } - func stringOptionalWithChainOfKeysOrIndexes(_ keysOrIndexes:[Any]) -> String? { + func stringOptionalWithChainOfKeysOrIndexes(_ keysOrIndexes: [Any]) -> String? { + return objectChainOfKeysOrIndexes(keysOrIndexes) as? String } /// Returns an Array using the specified chain. Returns an empty array if an array for the chain does not exist func arrayForChainOfKeysOrIndexes(_ keysOrIndexes: [Any]) -> [Any] { - guard let array = objectChainOfKeysOrIndexes(keysOrIndexes) as? [Any] else { - return [] - } - return array + return objectChainOfKeysOrIndexes(keysOrIndexes) as? [Any] ?? [] } func optionalArrayForChainOfKeysOrIndexes(_ keysOrIndexes: [Any]) -> [Any]? { + return objectChainOfKeysOrIndexes(keysOrIndexes) as? [Any] } /// Returns a Dictionary after looking up the specified key. An empty dictionary is returned if a dictionary for the key does not exist - func dictionaryForKey(_ key : String) -> [String : Any] { + func dictionaryForKey(_ key: String) -> [String: Any] { - return dictionaryWithChainOfKeysOrIndexes([key]) + guard let key = key as? Key else { return [:] } + + return self[key] as? [String: Any] ?? [:] } /// Returns a String after looking up the specified key. An empty string will be returned if a string for the key does not exist func stringForkey(_ key: String) -> String { - return stringWithChainOfKeysOrIndexes([key]) + guard let key = key as? Key else { return "" } + + return self[key] as? String ?? "" } /// Returns a String after looking up the specified key. Nil will be returned if a string for the key does not exist func optionalStringForKey(_ key: String) -> String? { + return objectChainOfKeysOrIndexes([key]) as? String } - /// Returns an Array after looking up the specified key. An empty array will be returned if an array for the key does not exist - func arrayForKey(_ key : String) -> [Any] { + func arrayForKey(_ key: String) -> [Any] { - return arrayForChainOfKeysOrIndexes([key]) + guard let key = key as? Key else { return [] } + + return self[key] as? [Any] ?? [] } - func optionalArrayForKey(_ key : String) -> [Any]? { - guard let key = key as? Key else { - return nil - } + func optionalArrayForKey(_ key: String) -> [Any]? { + + guard let key = key as? Key else { return nil } + return self[key] as? [Any] } /// Return a Bool after looking up the specified key. This will return false if the key does not exist - func boolForKey(_ key : String) -> Bool { + func boolForKey(_ key: String) -> Bool { - guard let bool = objectChainOfKeysOrIndexes([key]) as? Bool else { - return false - } - return bool + guard let key = key as? Key else { return false } + + return self[key] as? Bool ?? false } /// Return a Bool after looking up the specified key. This will return false if the key does not exist - func optionalBoolForKey(_ key : String) -> Bool? { + func optionalBoolForKey(_ key: String) -> Bool? { - guard let bool = objectChainOfKeysOrIndexes([key]) as? Bool else { - return nil - } - return bool + guard let key = key as? Key else { return nil } + + return self[key] as? Bool ?? nil } func lenientBoolForKey(_ key: String) -> Bool { - guard let key = key as? Key, let object = self[key] else { - return false - } + + guard let key = key as? Key, let object = self[key] else { return false } + if let object = object as? NSNumber { return object.boolValue + } else if let object = object as? NSString { return object.boolValue } + return false } - func boolForChainOfKeysOrIndexes(_ keysOrIndexes:[Any])-> Bool { - guard let bool = objectChainOfKeysOrIndexes(keysOrIndexes) as? Bool else { - return false - } - return bool + func boolForChainOfKeysOrIndexes(_ keysOrIndexes: [Any]) -> Bool { + + return objectChainOfKeysOrIndexes(keysOrIndexes) as? Bool ?? false } /// Return a float from a string created by looking up the specified key. This will return 0.0 if the key does not exist func floatForKey(_ key: String) -> Float { - guard let floatValue = objectChainOfKeysOrIndexes([key]) as? Float else { - return 0.0 - } - - return floatValue + return objectChainOfKeysOrIndexes([key]) as? Float ?? 0.0 } func optionalCGFloatForKey(_ key: String) -> CGFloat? { - guard let key = key as? Key else { - return nil - } + + guard let key = key as? Key else { return nil } + return self[key] as? CGFloat } - func floatFromStringForKey(_ key:String) -> Float { + func floatFromStringForKey(_ key: String) -> Float { - let stringValue = stringForkey(key) - - guard let floatValue = Float(stringValue) else { - return 0.0 - } - - return floatValue + return Float(stringForkey(key)) ?? 0.0 } - - func int32ForKey(_ key:String) -> Int32 { + func int32ForKey(_ key: String) -> Int32 { - guard let intValue = objectChainOfKeysOrIndexes([key]) as? Int32 else { - return 0 - } + guard let key = key as? Key else { return 0 } - return intValue + return self[key] as? Int32 ?? 0 } - private func objectChainOfKeysOrIndexes(_ keysOrIndexes:[Any]) -> Any? { + private func objectChainOfKeysOrIndexes(_ keysOrIndexes: [Any]) -> Any? { - var previousObject : Any? = self + var previousObject: Any? = self for keyOrIndex in keysOrIndexes { - - if let nextDictionary = previousObject as? [String:Any], + if let nextDictionary = previousObject as? [String: Any], let keyOrIndex = keyOrIndex as? String { - previousObject = nextDictionary[keyOrIndex] - continue - } - else if let nextArray = previousObject as? [Any], + } else if let nextArray = previousObject as? [Any], let keyOrIndex = keyOrIndex as? Int { - previousObject = nextArray[keyOrIndex] - continue - } - else { - previousObject = nil - break + + } else { + return nil } }