migration utilities (beta), swift 2 conversion

CoreStore/Saving and Processing/SynchronousDataTransaction.swift

@@ -42,8 +42,14 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     */
     public func commit() {
         
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.")
-        CoreStore.assert(!self.isCommitted, "Attempted to commit a \(typeName(self)) more than once.")
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to commit a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to commit a \(typeName(self)) more than once."
+        )
         
         self.isCommitted = true
         self.result = self.context.saveSynchronously()
@@ -52,13 +58,19 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     /**
     Begins a child transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made. This method should not be used after the `commit()` method was already called once.
     
-    :param: closure the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
-    :returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
+    - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
+    - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
     */
     public func beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? {
         
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to begin a child transaction from a \(typeName(self)) outside its designated queue.")
-        CoreStore.assert(!self.isCommitted, "Attempted to begin a child transaction from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to begin a child transaction from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to begin a child transaction from an already committed \(typeName(self))."
+        )
         
         return SynchronousDataTransaction(
             mainContext: self.context,
@@ -72,12 +84,15 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     /**
     Creates a new `NSManagedObject` with the specified entity type.
     
-    :param: into the `Into` clause indicating the destination `NSManagedObject` entity type and the destination configuration
-    :returns: a new `NSManagedObject` instance of the specified entity type.
+    - parameter into: the `Into` clause indicating the destination `NSManagedObject` entity type and the destination configuration
+    - returns: a new `NSManagedObject` instance of the specified entity type.
     */
     public override func create<T: NSManagedObject>(into: Into<T>) -> T {
         
-        CoreStore.assert(!self.isCommitted, "Attempted to create an entity of type <\(T.self)> from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to create an entity of type \(typeName(T)) from an already committed \(typeName(self))."
+        )
         
         return super.create(into)
     }
@@ -85,12 +100,15 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     /**
     Returns an editable proxy of a specified `NSManagedObject`. This method should not be used after the `commit()` method was already called once.
     
-    :param: object the `NSManagedObject` type to be edited
-    :returns: an editable proxy for the specified `NSManagedObject`.
+    - parameter object: the `NSManagedObject` type to be edited
+    - returns: an editable proxy for the specified `NSManagedObject`.
     */
     public override func edit<T: NSManagedObject>(object: T?) -> T? {
         
-        CoreStore.assert(!self.isCommitted, "Attempted to update an entity of type \(typeName(object)) from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to update an entity of type \(typeName(object)) from an already committed \(typeName(self))."
+        )
         
         return super.edit(object)
     }
@@ -98,13 +116,16 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     /**
     Returns an editable proxy of the object with the specified `NSManagedObjectID`. This method should not be used after the `commit()` method was already called once.
     
-    :param: into an `Into` clause specifying the entity type
-    :param: objectID the `NSManagedObjectID` for the object to be edited
-    :returns: an editable proxy for the specified `NSManagedObject`.
+    - parameter into: an `Into` clause specifying the entity type
+    - parameter objectID: the `NSManagedObjectID` for the object to be edited
+    - returns: an editable proxy for the specified `NSManagedObject`.
     */
     public override func edit<T: NSManagedObject>(into: Into<T>, _ objectID: NSManagedObjectID) -> T? {
         
-        CoreStore.assert(!self.isCommitted, "Attempted to update an entity of type <\(T.self)> from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to update an entity of type \(typeName(T)) from an already committed \(typeName(self))."
+        )
         
         return super.edit(into, objectID)
     }
@@ -112,11 +133,14 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     /**
     Deletes a specified `NSManagedObject`. This method should not be used after the `commit()` method was already called once.
     
-    :param: object the `NSManagedObject` type to be deleted
+    - parameter object: the `NSManagedObject` type to be deleted
     */
     public override func delete(object: NSManagedObject?) {
         
-        CoreStore.assert(!self.isCommitted, "Attempted to delete an entity of type \(typeName(object)) from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to delete an entity of type \(typeName(object)) from an already committed \(typeName(self))."
+        )
         
         super.delete(object)
     }
@@ -124,13 +148,16 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     /**
     Deletes the specified `NSManagedObject`s.
     
-    :param: object1 the `NSManagedObject` to be deleted
-    :param: object2 another `NSManagedObject` to be deleted
-    :param: objects other `NSManagedObject`s to be deleted
+    - parameter object1: the `NSManagedObject` to be deleted
+    - parameter object2: another `NSManagedObject` to be deleted
+    - parameter objects: other `NSManagedObject`s to be deleted
     */
     public override func delete(object1: NSManagedObject?, _ object2: NSManagedObject?, _ objects: NSManagedObject?...) {
         
-        CoreStore.assert(!self.isCommitted, "Attempted to delete an entities from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to delete an entities from an already committed \(typeName(self))."
+        )
         
         super.delete([object1, object2] + objects)
     }
@@ -138,11 +165,14 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     /**
     Deletes the specified `NSManagedObject`s.
     
-    :param: objects the `NSManagedObject`s to be deleted
+    - parameter objects: the `NSManagedObject`s to be deleted
     */
     public override func delete(objects: [NSManagedObject?]) {
         
-        CoreStore.assert(!self.isCommitted, "Attempted to delete an entities from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to delete an entities from an already committed \(typeName(self))."
+        )
         
         super.delete(objects)
     }
@@ -152,7 +182,10 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     */
     public override func rollback() {
         
-        CoreStore.assert(!self.isCommitted, "Attempted to rollback an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to rollback an already committed \(typeName(self))."
+        )
         
         super.rollback()
     }
@@ -165,9 +198,13 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
         self.transactionQueue.sync {
             
             self.closure(transaction: self)
+            
             if !self.isCommitted && self.hasChanges {
                 
-                CoreStore.log(.Warning, message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded.")
+                CoreStore.log(
+                    .Warning,
+                    message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded."
+                )
             }
         }
         return self.result