refactoring
This commit is contained in:
parent
17d3e659c1
commit
5840d2b61b
@ -44,7 +44,6 @@ extension NSCharacterSet {
|
|||||||
extension String {
|
extension String {
|
||||||
func toArray() throws -> [AnyObject] {
|
func toArray() throws -> [AnyObject] {
|
||||||
guard let stringData = dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) else { return [] }
|
guard let stringData = dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) else { return [] }
|
||||||
|
|
||||||
guard let array = try NSJSONSerialization.JSONObjectWithData(stringData, options: .MutableContainers) as? [AnyObject] else {
|
guard let array = try NSJSONSerialization.JSONObjectWithData(stringData, options: .MutableContainers) as? [AnyObject] else {
|
||||||
throw JSONError.notArray
|
throw JSONError.notArray
|
||||||
}
|
}
|
||||||
@ -53,8 +52,7 @@ extension String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func toNSDictionary() throws -> NSDictionary {
|
func toNSDictionary() throws -> NSDictionary {
|
||||||
let binData = dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
|
guard let binData = dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) else { return [:] }
|
||||||
|
|
||||||
guard let json = try NSJSONSerialization.JSONObjectWithData(binData, options: .AllowFragments) as? NSDictionary else {
|
guard let json = try NSJSONSerialization.JSONObjectWithData(binData, options: .AllowFragments) as? NSDictionary else {
|
||||||
throw JSONError.notNSDictionary
|
throw JSONError.notNSDictionary
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user