Merge branch 'release/1.1.2'

Alecrim · Sep 3, 2015 · d64d341 · d64d341
2 parents c06a26e + 49a4141
commit d64d341
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 31 deletions.
diff --git a/AlecrimAsyncKit.podspec b/AlecrimAsyncKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "AlecrimAsyncKit"
-  s.version      = "1.1.1"
+  s.version      = "1.1.2"
   s.summary      = "Bringing async and await to Swift world with some flavouring."
   s.homepage     = "https://github.com/Alecrim/AlecrimAsyncKit"
 

diff --git a/README.md b/README.md
@@ -156,7 +156,7 @@ If any of the task conditions is not satisfied the task will not be started. Onl
 
 A task can have its beginning and its ending observed using the `TaskObserver` class instances. The observers can be passed to the `async` global function when a task is created.
 
-The **AlecrimAsyncKit** framework provides some predefined observers, but you can created others.
+The **AlecrimAsyncKit** framework provides some predefined observers, but you can create others.
 
 ```swift
 func asyncDoSomething() -> Task<Void> {
@@ -225,7 +225,7 @@ The difference between a failable task and a non-failable task when running them
 
 ### Considerations
 
-After its creation the task is immediately started in background. It's completion can be "awaited" using the `await` global function, that blocks the current thread until the task finishes. When finished the task return value is available and the next line after the `await` call is performed normally.
+After its creation the task is immediately started in background. Its completion can be "awaited" using the `await` global function, that blocks the current thread until the task finishes. When finished the task return value is available and the next line after the `await` call is performed normally.
 
 If a task is not "awaited" it will be performed anyway. In this case no code in any thread will be blocked and its returning value will be discarded.
 

diff --git a/Source/AlecrimAsyncKit.xcodeproj/project.pbxproj b/Source/AlecrimAsyncKit.xcodeproj/project.pbxproj
@@ -317,7 +317,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 83;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -339,7 +339,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 81;
+				CURRENT_PROJECT_VERSION = 83;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;

diff --git a/Source/AlecrimAsyncKit/Core/Task.swift b/Source/AlecrimAsyncKit/Core/Task.swift
@@ -126,41 +126,49 @@ public final class Task<V>: BaseTask<V>, FailableTaskType {
     internal init(queue: NSOperationQueue, observers: [TaskObserver]?, conditions: [TaskCondition]?, closure: (Task<V>) -> Void) {
         assert(queue.maxConcurrentOperationCount == NSOperationQueueDefaultMaxConcurrentOperationCount || queue.maxConcurrentOperationCount > 1, "Task `queue` cannot be the main queue nor a serial queue.")
         super.init()
-
-        do {
-            if let conditions = conditions where !conditions.isEmpty {
-                let mutuallyExclusiveConditions = conditions.flatMap { $0 as? MutuallyExclusiveTaskCondition }
-                if !mutuallyExclusiveConditions.isEmpty {
-                    mutuallyExclusiveConditions.forEach { mutuallyExclusiveCondition in
-                        MutuallyExclusiveTaskCondition.increment(mutuallyExclusiveCondition.categoryName)
+
+        queue.addOperationWithBlock {
+            do {
+                //
+                if let conditions = conditions where !conditions.isEmpty {
+                    //
+                    guard !self.cancelled else { return }
+
+                    //
+                    let mutuallyExclusiveConditions = conditions.flatMap { $0 as? MutuallyExclusiveTaskCondition }
+                    if !mutuallyExclusiveConditions.isEmpty {
+                        mutuallyExclusiveConditions.forEach { mutuallyExclusiveCondition in
+                            MutuallyExclusiveTaskCondition.increment(mutuallyExclusiveCondition.categoryName)
+                        }
 
                         self.addDeferredClosure {
-                            MutuallyExclusiveTaskCondition.decrement(mutuallyExclusiveCondition.categoryName)
+                            mutuallyExclusiveConditions.forEach { mutuallyExclusiveCondition in
+                                MutuallyExclusiveTaskCondition.decrement(mutuallyExclusiveCondition.categoryName)
+                            }
                         }
                     }
+
+                    //
+                    try await(TaskCondition.asyncEvaluateConditions(conditions))
                 }
 
                 //
-                try await(TaskCondition.asyncEvaluateConditions(conditions))
-            }
-
-            if !self.cancelled {
-                queue.addOperationWithBlock {
-                    if !self.cancelled {
-                        if let observers = observers where !observers.isEmpty {
-                            observers.forEach { $0.taskDidStart(self) }
-                            self.addDeferredClosure { [unowned self] in
-                                observers.forEach { $0.taskDidFinish(self) }
-                            }
-                        }
-
-                        closure(self)
+                guard !self.cancelled else { return }
+
+                //
+                if let observers = observers where !observers.isEmpty {
+                    observers.forEach { $0.taskDidStart(self) }
+                    self.addDeferredClosure { [unowned self] in
+                        observers.forEach { $0.taskDidFinish(self) }
                     }
                 }
+
+                //
+                closure(self)
+            }
+            catch let error {
+                self.finishWithError(error)
             }
-        }
-        catch let error {
-            self.finishWithError(error)
         }
     }
 

diff --git a/Source/AlecrimAsyncKit/Info.plist b/Source/AlecrimAsyncKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>