Update RSWeb with changes from Evergreen.

Author: brentsimmons

LICENSE

@@ -0,0 +1,16 @@
+//
+//  Credentials.swift
+//  RSWeb
+//
+//  Created by Brent Simmons on 12/9/17.
+//  Copyright © 2017 Ranchero Software. All rights reserved.
+//
+
+import Foundation
+
+public protocol Credentials {
+
+	var username: String? { get set }
+	var password: String? { get set }
+}
+

README.md

@@ -0,0 +1,46 @@
+//
+//  Dictionary+RSWeb.swift
+//  RSWeb
+//
+//  Created by Brent Simmons on 1/13/18.
+//  Copyright © 2018 Ranchero Software. All rights reserved.
+//
+
+import Foundation
+
+public extension Dictionary  {
+
+	public func urlQueryString() -> String? {
+
+		// Turn a dictionary into string like foo=bar&param2=some%20thing
+		// Return nil if empty dictionary.
+
+		if isEmpty {
+			return nil
+		}
+
+		var s = ""
+		var numberAdded = 0
+		for (key, value) in self {
+
+			guard let key = key as? String, let value = value as? String else {
+				continue
+			}
+			guard let encodedKey = key.encodedForURLQuery(), let encodedValue = value.encodedForURLQuery() else {
+				continue
+			}
+
+			if numberAdded > 0 {
+				s += "&"
+			}
+			s += "\(encodedKey)=\(encodedValue)"
+			numberAdded += 1
+		}
+
+		if numberAdded < 1 {
+			return nil
+		}
+		
+		return s
+	}
+}

RSWeb.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 //  RSWeb
 //
 //  Created by Brent Simmons on 8/3/16.
-//  Copyright © 2016 Ranchero Software. All rights reserved.
+//  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
 import Foundation
@@ -14,9 +14,7 @@ public final class DownloadObject: Hashable {
 	public var data = Data()
 
 	public var hashValue: Int {
-		get {
-			return url.hashValue
-		}
+		return url.hashValue
 	}
 
 	public init(url: URL) {

RSWeb.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -10,43 +10,43 @@ import Foundation
 
 public extension Notification.Name {
 
-	public static let DownloadProgressDidChange = Notification.Name(rawValue: "DownloadProgressDidChangeNotification")
+	public static let DownloadProgressDidChange = Notification.Name(rawValue: "DownloadProgressDidChange")
 }
 
-public class DownloadProgress {
+public final class DownloadProgress {
 
 	public var numberOfTasks = 0 {
 		didSet {
 			if numberOfTasks == 0 {
 				numberRemaining = 0
 			}
-			postDidChangeNotification()
+			if numberOfTasks != oldValue {
+				postDidChangeNotification()
+			}
 		}
 	}
 
 	public var numberRemaining = 0 {
 		didSet {
-			postDidChangeNotification()
+			if numberRemaining != oldValue {
+				postDidChangeNotification()
+			}
 		}
 	}
 
 	public var numberCompleted: Int {
-		get {
-			var n = numberOfTasks - numberRemaining
-			if n < 0 {
-				n = 0
-			}
-			if n > numberOfTasks {
-				n = numberOfTasks
-			}
-			return n
+		var n = numberOfTasks - numberRemaining
+		if n < 0 {
+			n = 0
 		}
+		if n > numberOfTasks {
+			n = numberOfTasks
+		}
+		return n
 	}
 
 	public var isComplete: Bool {
-		get {
-			return numberRemaining < 1
-		}
+		return numberRemaining < 1
 	}
 
 	public init(numberOfTasks: Int) {
@@ -65,6 +65,8 @@ public class DownloadProgress {
 	}
 }
 
+// MARK: - Private
+
 private extension DownloadProgress {
 
 	func postDidChangeNotification() {

RSWeb/Credentials.swift

@@ -3,7 +3,7 @@
 //  RSWeb
 //
 //  Created by Brent Simmons on 3/12/16.
-//  Copyright © 2016 Ranchero Software. All rights reserved.
+//  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
 import Foundation
@@ -25,17 +25,17 @@ public protocol DownloadSessionDelegate {
 }
 
 
-@objc public final class DownloadSession: NSObject, URLSessionDataDelegate {
+@objc public final class DownloadSession: NSObject {
 
 	public var progress = DownloadProgress(numberOfTasks: 0)
 
-	fileprivate var urlSession: URLSession!
-	fileprivate var tasksInProgress = Set<URLSessionTask>()
-	fileprivate var tasksPending = Set<URLSessionTask>()
-	fileprivate var taskIdentifierToInfoDictionary = [Int: DownloadInfo]()
-	fileprivate let representedObjects = NSMutableSet()
-	fileprivate let delegate: DownloadSessionDelegate
-	fileprivate var redirectCache = [String: String]()
+	private var urlSession: URLSession!
+	private var tasksInProgress = Set<URLSessionTask>()
+	private var tasksPending = Set<URLSessionTask>()
+	private var taskIdentifierToInfoDictionary = [Int: DownloadInfo]()
+	private let representedObjects = NSMutableSet()
+	private let delegate: DownloadSessionDelegate
+	private var redirectCache = [String: String]()
 
 	public init(delegate: DownloadSessionDelegate) {
 
@@ -52,10 +52,8 @@ public protocol DownloadSessionDelegate {
 		sessionConfiguration.httpCookieStorage = nil
 		sessionConfiguration.urlCache = nil
 
-		if let userAgent = UserAgent.fromInfoPlist() {
-			var headers = [AnyHashable : Any]()
-			headers[HTTPRequestHeader.userAgent] = userAgent
-			sessionConfiguration.httpAdditionalHeaders = headers
+		if let userAgentHeaders = UserAgent.headers() {
+			sessionConfiguration.httpAdditionalHeaders = userAgentHeaders
 		}
 
 		urlSession = URLSession(configuration: sessionConfiguration, delegate: self, delegateQueue: OperationQueue.main)		
@@ -64,9 +62,36 @@ public protocol DownloadSessionDelegate {
 	deinit {
 		urlSession.invalidateAndCancel()
 	}
-	
-	// MARK: URLSessionTaskDelegate
-	
+
+	// MARK: - API
+
+	public func cancel() {
+
+		// TODO
+	}
+
+	public func downloadObjects(_ objects: NSSet) {
+
+		var numberOfTasksAdded = 0
+
+		for oneObject in objects {
+
+			if !representedObjects.contains(oneObject) {
+				representedObjects.add(oneObject)
+				addDataTask(oneObject as AnyObject)
+				numberOfTasksAdded += 1
+			}
+		}
+
+		progress.addToNumberOfTasks(numberOfTasksAdded)
+		updateProgress()
+	}
+}
+
+// MARK: - URLSessionTaskDelegate
+
+extension DownloadSession: URLSessionTaskDelegate {
+
 	public func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
 
 		tasksInProgress.remove(task)
@@ -92,9 +117,12 @@ public protocol DownloadSessionDelegate {
 
 		completionHandler(request)
 	}
-	
-	// MARK: URLSessionDataDelegate
-	
+}
+
+// MARK: - URLSessionDataDelegate
+
+extension DownloadSession: URLSessionDataDelegate {
+
 	public func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, didReceive response: URLResponse, completionHandler: @escaping (URLSession.ResponseDisposition) -> Void) {
 
 		tasksInProgress.insert(dataTask)
@@ -146,31 +174,10 @@ public protocol DownloadSessionDelegate {
 		}
 	}
 
-	// MARK: API
-	
-	public func cancel() {
-		
-		// TODO
-	}
-
-	public func downloadObjects(_ objects: NSSet) {
-
-		var numberOfTasksAdded = 0
-		
-		for oneObject in objects {
-
-			if !representedObjects.contains(oneObject) {
-				representedObjects.add(oneObject)
-				addDataTask(oneObject as AnyObject)
-				numberOfTasksAdded += 1
-			}
-		}
-		
-		progress.addToNumberOfTasks(numberOfTasksAdded)
-		updateProgress()
-	}
 }
 
+// MARK: - Private
+
 private extension DownloadSession {
 
 	func updateProgress() {
@@ -275,6 +282,8 @@ private extension DownloadSession {
 	}
 }
 
+// MARK: - DownloadInfo
+
 private final class DownloadInfo {
 
 	let representedObject: AnyObject
@@ -285,9 +294,7 @@ private final class DownloadInfo {
 	var canceled = false
 
 	var statusCode: Int {
-		get {
-			return urlResponse?.forcedStatusCode ?? 0
-		}
+		return urlResponse?.forcedStatusCode ?? 0
 	}
 
 	init(_ representedObject: AnyObject, urlRequest: URLRequest) {

RSWeb/Dictionary+RSWeb.swift

@@ -3,7 +3,7 @@
 //  RSWeb
 //
 //  Created by Brent Simmons on 4/11/16.
-//  Copyright © 2016 Ranchero Software. All rights reserved.
+//  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
 import Foundation
@@ -12,26 +12,40 @@ public struct HTTPConditionalGetInfo {
 
 	public let lastModified: String?
 	public let etag: String?
-	public var isEmpty: Bool {
-		get {
-			return lastModified == nil && etag == nil
+	
+	public var dictionary: [String: String] {
+		var d = [String: String]()
+		if let lastModified = lastModified {
+			d[HTTPResponseHeader.lastModified] = lastModified
 		}
+		if let etag = etag {
+			d[HTTPResponseHeader.etag] = etag
+		}
+		return d
 	}
 
-	public init(lastModified: String?, etag: String?) {
-		
+	public init?(lastModified: String?, etag: String?) {
+
+		if lastModified == nil && etag == nil {
+			return nil
+		}
 		self.lastModified = lastModified
 		self.etag = etag
 	}
 
-	public init(urlResponse: HTTPURLResponse) {
+	public init?(urlResponse: HTTPURLResponse) {
 
 		let lastModified = urlResponse.valueForHTTPHeaderField(HTTPResponseHeader.lastModified)
 		let etag = urlResponse.valueForHTTPHeaderField(HTTPResponseHeader.etag)
 
 		self.init(lastModified: lastModified, etag: etag)
 	}
 
+	public init?(dictionary: [String: String]) {
+
+		self.init(lastModified: dictionary[HTTPResponseHeader.lastModified], etag: dictionary[HTTPResponseHeader.etag])
+	}
+
 	public func addRequestHeadersToURLRequest(_ urlRequest: NSMutableURLRequest) {
 
 		if let lastModified = lastModified {

RSWeb/DownloadObject.swift

@@ -3,7 +3,7 @@
 //  RSWeb
 //
 //  Created by Brent Simmons on 12/26/16.
-//  Copyright © 2016 Ranchero Software. All rights reserved.
+//  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
 import Foundation

RSWeb/DownloadProgress.swift

@@ -3,7 +3,7 @@
 //  RSWeb
 //
 //  Created by Brent Simmons on 12/26/16.
-//  Copyright © 2016 Ranchero Software. All rights reserved.
+//  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
 import Foundation