Added parallel methods

fmo91 · Feb 8, 2017 · 0ac57a5 · 0ac57a5
1 parent dcf0e94
commit 0ac57a5
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 4 deletions.
diff --git a/Example/FOTask/ViewController.swift b/Example/FOTask/ViewController.swift
@@ -63,7 +63,7 @@ class ViewController: UIViewController {
                 GetUserName(),
                 GetUserName()
             ],
-            reduce: { (userNames: [String]) -> [String] in
+            reduceBy: { (userNames: [String]) -> [String] in
                 return userNames
             }
         )

diff --git a/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/FOTask.podspec b/FOTask.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FOTask'
-  s.version          = '0.1.0'
+  s.version          = '0.2.0'
   s.summary          = 'Object oriented Swift tasks microframework with concurrency and composition.'
 
 # This description is used to generate tags and improve search results.

diff --git a/FOTask/Classes/Task.swift b/FOTask/Classes/Task.swift
@@ -71,7 +71,7 @@ public func => <A, B, C> (left: Task<A, B>, right: Task<B, C>) -> Task<A, C> {
 }
 
 public extension Task {
-    public static func parallel<C>(_ tasks: [Task<A, B>], on queue: DispatchQueue = .main, reduce: @escaping ([B]) -> C) -> Task<A, C> {
+    public static func parallel<C>(_ tasks: [Task<A, B>], on queue: DispatchQueue = .main, reduceBy reduce: @escaping ([B]) -> C) -> Task<A, C> {
         return BasicTask<A, C> { (input: A) in
             return { (onSuccess: @escaping (C) -> Void, onError: @escaping (Error) -> Void) in
                 let group = DispatchGroup()
@@ -108,10 +108,58 @@ public extension Task {
             }
         }
     }
+
+    public func inParallel<U, V>(with task: Task<A, U>, on queue: DispatchQueue = .main, reduceBy reduce: @escaping (B, U) -> V) -> Task<A, V> {
+        return BasicTask<A, V> { (input: A) in
+            return { (onSuccess: @escaping (V) -> Void, onError: @escaping (Error) -> Void) in
+                let group = DispatchGroup()
+
+                group.enter()
+                group.enter()
+
+                var firstValue: B!
+                var secondValue: U!
+
+                self.perform(input,
+                    onSuccess: { (output: B) in
+                        firstValue = output
+                        group.leave()
+                    },
+                    onError: { (error: Error) in
+                        onError(error)
+                        return
+                    }
+                )
+
+                task.perform(input,
+                    onSuccess: { (output: U) in
+                        secondValue = output
+                        group.leave()
+                    },
+                    onError: { (error: Error) in
+                        onError(error)
+                        return
+                    }
+                )
+
+                DispatchQueue.global(qos: .background).async {
+                    let dispatchGroupResult = group.wait(timeout: .distantFuture)
+                    queue.async {
+                        switch dispatchGroupResult {
+                        case .success:
+                            onSuccess(reduce(firstValue, secondValue))
+                        case .timedOut:
+                            onError(TaskError.timeout)
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
 public extension Task {
-    public func map<C>(_ f: @escaping (B) -> C) -> Task<A, C> {
+     public func map<C>(_ f: @escaping (B) -> C) -> Task<A, C> {
         return BasicTask<A, C> { (input: A) in
             return { (onSuccess: @escaping (C) -> Void, onError: @escaping (Error) -> Void) in
                 self.perform(input,