development: xcode beta 8 revisions

Author: Daniel Dahan

Sources/Action.swift

@@ -80,9 +80,9 @@ public class Action: NSObject, NodeType {
     /**
      Access properties using the subscript operator.
      - Parameter name: A property name value.
-     - Returns: The optional AnyObject value.
+     - Returns: The optional Any value.
      */
-    public subscript(name: String) -> AnyObject? {
+    public subscript(name: String) -> Any? {
         get {
             return managedNode[name]
         }
@@ -92,7 +92,7 @@ public class Action: NSObject, NodeType {
     }
 
     /// A reference to the properties Dictionary.
-    public var properties: [String: AnyObject] {
+    public var properties: [String: Any] {
         return managedNode.properties
     }
 
@@ -182,7 +182,7 @@ public class Action: NSObject, NodeType {
      - Returns: A boolean of the result, true if equal, false
      otherwise.
      */
-    public override func isEqual(_ object: AnyObject?) -> Bool {
+    public override func isEqual(_ object: Any?) -> Bool {
         return id == (object as? Action)?.id
     }
 

Sources/Context.swift

@@ -121,7 +121,7 @@ extension Graph {
             guard let s = self else {
                 return
             }
-            s.completion?(supported: supported, error: supported ? nil : GraphError(message: "[Graph Error: iCloud is not supported.]"))
+            s.completion?(supported, supported ? nil : GraphError(message: "[Graph Error: iCloud is not supported.]"))
             (s.delegate as? GraphCloudDelegate)?.graphDidPrepareCloudStorage?(graph: s)
         }
     }

Sources/Coordinator.swift

@@ -51,7 +51,7 @@ internal struct Coordinator {
      - Parameter options: Additional options.
      - Returns: An instance of NSPersistentStoreCoordinator.
      */
-    static func create(type: String, location: URL, options: [NSObject: AnyObject]? = nil) -> NSPersistentStoreCoordinator {
+    static func create(type: String, location: URL, options: [NSObject: Any]? = nil) -> NSPersistentStoreCoordinator {
         var coordinator: NSPersistentStoreCoordinator?
         File.createDirectoryAtPath(location, withIntermediateDirectories: true, attributes: nil) { (success: Bool, error: Error?) in
             if let e = error {
@@ -75,10 +75,10 @@ extension Graph {
             return
         }
 
-        var options: [NSObject: AnyObject]?
+        var options: [AnyHashable: Any]?
 
         if supported {
-            options = [NSObject: AnyObject]()
+            options = [AnyHashable: Any]()
             options?[NSPersistentStoreUbiquitousContentNameKey] = name
         }
 
@@ -88,7 +88,7 @@ extension Graph {
             try moc.persistentStoreCoordinator?.addPersistentStore(ofType: type, configurationName: nil, at: location, options: options)
             location = moc.persistentStoreCoordinator!.persistentStores.first!.url!
             if !supported {
-                completion?(supported: false, error: GraphError(message: "[Graph Error: iCloud is not supported.]"))
+                completion?(false, GraphError(message: "[Graph Error: iCloud is not supported.]"))
             }
         } catch let e as NSError {
             fatalError("[Graph Error: \(e.localizedDescription)]")
@@ -141,7 +141,7 @@ extension Graph {
 
     internal func persistentStoreDidChange(_ notification: Notification) {
         GraphContextRegistry.added[self.route] = true
-        self.completion?(supported: true, error: nil)
+        self.completion?(true, nil)
         (self.delegate as? GraphCloudDelegate)?.graphDidPrepareCloudStorage?(graph: self)
     }
 

Sources/Entity.swift

@@ -81,9 +81,9 @@ public class Entity: NSObject, NodeType {
     /**
      Access properties using the subscript operator.
      - Parameter name: A property name value.
-     - Returns: The optional AnyObject value.
+     - Returns: The optional Any value.
      */
-    public subscript(name: String) -> AnyObject? {
+    public subscript(name: String) -> Any? {
         get {
             return managedNode[name]
         }
@@ -93,7 +93,7 @@ public class Entity: NSObject, NodeType {
     }
 
     /// A reference to the properties Dictionary.
-    public var properties: [String: AnyObject] {
+    public var properties: [String: Any] {
         return managedNode.properties
     }
 
@@ -222,7 +222,7 @@ public class Entity: NSObject, NodeType {
      - Returns: A boolean of the result, true if equal, false
      otherwise.
      */
-    public override func isEqual(_ object: AnyObject?) -> Bool {
+    public override func isEqual(_ object: Any?) -> Bool {
         return id == (object as? Entity)?.id
     }
 

Sources/File.swift

@@ -201,12 +201,12 @@ public struct File {
      - Parameter completion: An optional completion block when the operation
      is done.
      */
-    public static func removeItemAtPath(_ path: URL, completion: ((removed: Bool?, error: Error?) -> Void)? = nil) {
+    public static func removeItemAtPath(_ path: URL, completion: ((Bool?, Error?) -> Void)? = nil) {
         do {
             try FileManager.default.removeItem(atPath: path.path)
-            completion?(removed: true, error: nil)
+            completion?(true, nil)
         } catch let e as NSError {
-            completion?(removed: nil, error: e)
+            completion?(nil, e)
         }
     }
 
@@ -218,12 +218,12 @@ public struct File {
      - Parameter completion: An optional completion block when the operation
      is done.
      */
-    public static func createDirectoryAtPath(_ path: URL, withIntermediateDirectories createIntermediates: Bool, attributes: [String: AnyObject]?, completion: ((success: Bool, error: Error?) -> Void)? = nil) {
+    public static func createDirectoryAtPath(_ path: URL, withIntermediateDirectories createIntermediates: Bool, attributes: [String: Any]?, completion: ((Bool, Error?) -> Void)? = nil) {
         do {
             try FileManager.default.createDirectory(atPath: path.path, withIntermediateDirectories: createIntermediates, attributes: attributes)
-            completion?(success: true, error: nil)
+            completion?(true, nil)
         } catch let e as NSError {
-            completion?(success: false, error: e)
+            completion?(false, e)
         }
     }
 
@@ -233,12 +233,12 @@ public struct File {
      - Parameter completion: An optional completion block when the operation
      is done.
      */
-    public static func removeDirectoryAtPath(_ path: URL, completion: ((success: Bool, error: Error?) -> Void)?  = nil)  {
+    public static func removeDirectoryAtPath(_ path: URL, completion: ((Bool, Error?) -> Void)?  = nil)  {
         do {
             try FileManager.default.removeItem(at: path)
-            completion?(success: true, error: nil)
+            completion?(true, nil)
         } catch let e as NSError {
-            completion?(success: false, error: e)
+            completion?(false, e)
         }
     }
 
@@ -249,12 +249,12 @@ public struct File {
      - Parameter completion: An optional completion block when the operation
      is done.
      */
-    public static func contentsOfDirectoryAtPath(_ path: URL, shouldSkipHiddenFiles skip: Bool = false, completion: ((contents: [URL]?, error: Error?) -> Void)) {
+    public static func contentsOfDirectoryAtPath(_ path: URL, shouldSkipHiddenFiles skip: Bool = false, completion: (([URL]?, Error?) -> Void)) {
         do {
             let contents = try FileManager.default.contentsOfDirectory(at: path, includingPropertiesForKeys: nil, options: skip == true ? FileManager.DirectoryEnumerationOptions.skipsHiddenFiles : FileManager.DirectoryEnumerationOptions(rawValue: 0))
-            completion(contents: contents, error: nil)
+            completion(contents, nil)
         } catch let e as NSError {
-            return completion(contents: nil, error: e)
+            return completion(nil, e)
         }
     }
 
@@ -266,12 +266,12 @@ public struct File {
      - Parameter completion: An optional completion block when the operation
      is done.
      */
-    public static func writeToPath(_ path: URL, name: String, value: String, completion: ((success: Bool, error: Error?) -> Void)? = nil) {
+    public static func writeToPath(_ path: URL, name: String, value: String, completion: ((Bool, Error?) -> Void)? = nil) {
         do{
             try value.write(to: path.appendingPathComponent("/\(name)"), atomically: true, encoding: String.Encoding.utf8)
-            completion?(success: true, error: nil)
+            completion?(true, nil)
         } catch let e as NSError {
-            completion?(success: false, error: e)
+            completion?(false, e)
         }
     }
 
@@ -281,11 +281,11 @@ public struct File {
      - Parameter completion: An optional completion block when the operation
      is done.
      */
-    public static func readFromPath(_ path: URL, completion: ((string: String?, error: Error?) -> Void)) {
+    public static func readFromPath(_ path: URL, completion: ((String?, Error?) -> Void)) {
         if let data = try? Data(contentsOf: path) {
-            completion(string: String(data: data, encoding: String.Encoding.utf8), error: nil)
+            completion(String(data: data, encoding: String.Encoding.utf8), nil)
         } else {
-            completion(string: nil, error: NSError(domain: "io.graph.File", code: 0, userInfo: nil))
+            completion(nil, NSError(domain: "io.cosmicmind.Graph.File", code: 0, userInfo: nil))
         }
     }
 

Sources/Graph.swift

@@ -80,7 +80,7 @@ public class Graph: NSObject {
      - Parameter success: A boolean indicating if the cloud connection
      is possible or not.
      */
-    internal var completion: ((supported: Bool, error: Error?) -> Void)?
+    internal var completion: ((Bool, Error?) -> Void)?
 
     /// Deinitializer that removes the Graph from NSNotificationCenter.
     deinit {
@@ -112,7 +112,7 @@ public class Graph: NSObject {
      - Parameter completion: An Optional completion block that is
      executed to determine if iCloud support is available or not.
      */
-    public init(cloud: String, completion: ((supported: Bool, error: Error?) -> Void)? = nil) {
+    public init(cloud: String, completion: ((Bool, Error?) -> Void)? = nil) {
         route = "Cloud/\(cloud)"
         name = cloud
         type = NSSQLiteStoreType

Sources/ManagedAction.swift

@@ -50,9 +50,9 @@ internal class ManagedAction: ManagedNode {
     /**
      Access properties using the subscript operator.
      - Parameter name: A property name value.
-     - Returns: The optional AnyObject value.
+     - Returns: The optional Any value.
      */
-    internal override subscript(name: String) -> AnyObject? {
+    internal override subscript(name: String) -> Any? {
         get {
             return super[name]
         }
@@ -63,20 +63,24 @@ internal class ManagedAction: ManagedNode {
             moc.performAndWait { [unowned self, unowned moc] in
                 guard let object = value else {
                     for property in self.propertySet {
-                        if name == property.name {
-                            (property as? ManagedActionProperty)?.delete()
-                            break
+                        if let p = property as? ManagedActionProperty {
+                            if name == p.name {
+                                p.delete()
+                                break
+                            }
                         }
                     }
                     return
                 }
 
                 var exists: Bool = false
                 for property in self.propertySet {
-                    if name == property.name {
-                        (property as? ManagedActionProperty)?.object = object
-                        exists = true
-                        break
+                    if let p = property as? ManagedActionProperty {
+                        if name == p.name {
+                            p.object = object
+                            exists = true
+                            break
+                        }
                     }
                 }
 
@@ -91,13 +95,13 @@ internal class ManagedAction: ManagedNode {
      Adds a tag to the ManagedAction.
      - Parameter tag: A tag name.
      */
-    internal func add(tag: String) {
+    internal func add(tag name: String) {
         guard let moc = managedObjectContext else {
             return
         }
         moc.performAndWait { [unowned self, unowned moc] in
-            if !self.has(tag: tag) {
-                _ = ManagedActionTag(name: tag, node: self, managedObjectContext: moc)
+            if !self.has(tag: name) {
+                _ = ManagedActionTag(name: name, node: self, managedObjectContext: moc)
             }
         }
     }
@@ -106,15 +110,17 @@ internal class ManagedAction: ManagedNode {
      Removes a tag from a ManagedAction.
      - Parameter tag: A tag name.
      */
-    internal func remove(tag: String) {
+    internal func remove(tag name: String) {
         guard let moc = managedObjectContext else {
             return
         }
         moc.performAndWait { [unowned self] in
-            for t in self.tagSet {
-                if tag == t.name {
-                    (t as? ManagedActionTag)?.delete()
-                    break
+            for tag in self.tagSet {
+                if let t = tag as? ManagedActionTag {
+                    if name == t.name {
+                        t.delete()
+                        break
+                    }
                 }
             }
         }
@@ -144,10 +150,12 @@ internal class ManagedAction: ManagedNode {
             return
         }
         moc.performAndWait { [unowned self] in
-            for g in self.groupSet {
-                if group == g.name {
-                    (g as? ManagedActionGroup)?.delete()
-                    break
+            for grp in self.groupSet {
+                if let g = grp as? ManagedActionGroup {
+                    if group == g.name {
+                        g.delete()
+                        break
+                    }
                 }
             }
         }
@@ -200,35 +208,35 @@ internal class ManagedAction: ManagedNode {
         }
 
         moc.performAndWait { [unowned self] in
-            self.propertySet.forEach { (object: AnyObject) in
+            self.propertySet.forEach { (object: Any) in
                 guard let property = object as? ManagedActionProperty else {
                     return
                 }
                 property.delete()
             }
 
-            self.tagSet.forEach { (object: AnyObject) in
+            self.tagSet.forEach { (object: Any) in
                 guard let tag = object as? ManagedActionTag else {
                     return
                 }
                 tag.delete()
             }
 
-            self.groupSet.forEach { (object: AnyObject) in
+            self.groupSet.forEach { (object: Any) in
                 guard let group = object as? ManagedActionGroup else {
                     return
                 }
                 group.delete()
             }
 
-//            self.subjectSet.forEach { [unowned self] (object: AnyObject) in
+//            self.subjectSet.forEach { [unowned self] (object: Any) in
 //                guard let managedEntity: ManagedEntity = object as? ManagedEntity else {
 //                    return
 //                }
 //                self.mutableSetValueForKey("subjectSet").removeObject(managedEntity)
 //            }
 //            
-//            self.objectSet.forEach { [unowned self] (object: AnyObject) in
+//            self.objectSet.forEach { [unowned self] (object: Any) in
 //                guard let managedEntity: ManagedEntity = object as? ManagedEntity else {
 //                    return
 //                }

Sources/ManagedActionProperty.swift

@@ -42,7 +42,7 @@ internal class ManagedActionProperty: ManagedProperty {
      - Parameter node: A ManagedAction.
      - Parameter managedObjectContext: A reference to a NSManagedObjectContext.
      */
-    internal convenience init(name: String, object: AnyObject, node: ManagedAction, managedObjectContext: NSManagedObjectContext) {
+    internal convenience init(name: String, object: Any, node: ManagedAction, managedObjectContext: NSManagedObjectContext) {
         self.init(identifier: ModelIdentifier.actionPropertyName, name: name, object: object, managedObjectContext: managedObjectContext)
         self.node = node
     }