refactoring

Example/Example/ViewController.swift

@@ -18,7 +18,7 @@ class ViewController: UIViewController {
  @IBAction func didPressedStartButton(sender: AnyObject) {
  let downloadUrl1 = "https://developer.apple.com/library/ios/documentation/iphone/conceptual/iphoneosprogrammingguide/iphoneappprogrammingguide.pdf"
  let downloadUrl2 = "https://developer.apple.com/library/ios/documentation/iphone/conceptual/iphoneosprogrammingguide/iphoneappprogrammingguide.pdf"
- let downloadUrl3 = "https://s3.amazonaws.com/hayageek/downloads/SimpleBackgroundFetch.zip"
+ let downloadUrl3 = "https://developer.apple.com/library/prerelease/ios/releasenotes/DeveloperTools/RN-Xcode/Xcode_Release_Notes.pdf"
  let uploadUrl = "http:https://httpbin.org/post"
  let documentsPath: AnyObject = NSSearchPathForDirectoriesInDomains(.DocumentDirectory,.UserDomainMask,true)[0]
  let des = NSURL(string: documentsPath.stringByAppendingString("/file.pdf"))!

README.md

@@ -18,12 +18,11 @@ Features
 -----
 
 - multiple files (parallel, serial)
-- progress
+- background uploads and downloads
+- progress tracking
 - retry
 - timeout
 - header settings
-- background
-- LlamaKit (https://github.com/LlamaKit/LlamaKit)
 
 
 **Quick example**
@@ -42,22 +41,25 @@ let task = UploadTask(url: "http:https://server.com", file: fileUrl)
  }
 
 
- Transporter.add(task1 --> task2 --> task3)
+ Transporter.add(task1 <--> task2 <--> task3) // concurrent tasks
  .progress { bytes, total in
- let ratio = Double(bytes) / Double(total)
- println("serial tasks: \(ratio)")
+ let per = Double(bytes) / Double(total)
+ println("serial tasks: \(per)")
  }
  .completed {
  println("task1, task2, task3: completed")
  }
- .add(task4 <--> task5)
+ .add(task4 --> task5 --> task6) // serial tasks 
  .progress { bytes, total in
  println("concurrent tasks")
  }
  .resume()
 
 ```
 
+Usage
+-----
+
 ``` swift
 // downloading task
 
@@ -88,8 +90,8 @@ let task = UploadTask(url: "http:https://server.com", data: uploadData)
 
 task.headers = ["key": "value"]
 task.params = ["key": "value"]
-task.suspend
-task.cancel
+task.pause()
+task.cancel()
 task.retry
 
 // background handling

Transporter/TPTaskGroup.swift

@@ -112,10 +112,16 @@ public class TPTaskGroup : TPTask {
  }
 }
 
+
 extension TPTaskGroup : NSURLSessionDelegate {
  // All tasks enqueued have been delivered
  public func URLSessionDidFinishEventsForBackgroundURLSession(session: NSURLSession) {
- Transporter.sessionDidFinishEventsForBackgroundURLSession(session)
+ // check if all tasks have been completed
+ session.getTasksWithCompletionHandler { dataTasks, uploadTasks, downloadTasks in
+ if dataTasks.isEmpty && uploadTasks.isEmpty && downloadTasks.isEmpty {
+ Transporter.sessionDidFinishEventsForBackgroundURLSession(session)
+ }
+ }
  }
 }
 
@@ -175,6 +181,7 @@ extension TPTaskGroup : NSURLSessionTaskDelegate {
  }
 }
 
+
 extension TPTaskGroup : NSURLSessionDownloadDelegate {
  // The download task has resumed downloading
  public func URLSession(session: NSURLSession, downloadTask: NSURLSessionDownloadTask, didResumeAtOffset fileOffset: Int64, expectedTotalBytes: Int64) {

Transporter/Transporter.swift

@@ -16,7 +16,7 @@ import Foundation
 
 public struct Transporter {
  public static var headers: [String: String]?
- public static var timeoutIntervalForRequest = 30.0
+ public static var timeoutIntervalForRequest = 60.0
  public static var timeoutIntervalForResource = 60.0
  public static var HTTPMaximumconnectionsPerHost: Int = 5