Add 4 missing attributes to NSURLRequest

cachePolicy, timeoutInterval, networkServiceType, and allowsCellularAccess
Rework how attributes are stored.
Refactor header field code into existingHeaderField().

Author: danieleggert

Foundation/NSURLRequest.swift

@@ -164,10 +164,6 @@ public enum NSURLRequestNetworkServiceType : UInt {
 */
 public class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying {
 
-    private var _URL : NSURL?
-    private var _mainDocumentURL: NSURL?
-    private var _httpHeaderFields: [String: String]?
-    
     public override func copy() -> AnyObject {
         return copyWithZone(nil)
     }
@@ -235,16 +231,21 @@ public class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopyin
     */
     public convenience init(URL: NSURL) {
         self.init()
-        _URL = URL
+        self.URL = URL
     }
 
     /*!
         @method URL
         @abstract Returns the URL of the receiver. 
         @result The URL of the receiver. 
     */
-    /*@NSCopying */public var URL: NSURL? { return _URL }
+    /*@NSCopying */public private(set) var URL: NSURL?
 
+    public private(set) var cachePolicy: NSURLRequestCachePolicy = .UseProtocolCachePolicy
+    public private(set) var timeoutInterval: NSTimeInterval = 60
+    public private(set) var networkServiceType: NSURLRequestNetworkServiceType = .NetworkServiceTypeDefault
+    public private(set) var allowsCellularAccess: Bool = true
+
     /*!
         @method mainDocumentURL
         @abstract The main document URL associated with this load.
@@ -253,14 +254,14 @@ public class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopyin
         See setMainDocumentURL:
         @result The main document URL.
     */
-    /*@NSCopying*/ public var mainDocumentURL: NSURL? { return _mainDocumentURL }
+    /*@NSCopying*/ public private(set) var mainDocumentURL: NSURL?
 
     /*!
     @method HTTPMethod
     @abstract Returns the HTTP request method of the receiver.
     @result the HTTP request method of the receiver.
     */
-    public var HTTPMethod: String? { return "GET" }
+    public private(set) var HTTPMethod: String? = "GET"
 
     /*!
     @method allHTTPHeaderFields
@@ -269,7 +270,7 @@ public class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopyin
     @result a dictionary containing all the HTTP header fields of the
     receiver.
     */
-    public var allHTTPHeaderFields: [String : String]? { return _httpHeaderFields  }
+    public private(set) var allHTTPHeaderFields: [String: String]?
 
     /*!
     @method valueForHTTPHeaderField:
@@ -281,8 +282,10 @@ public class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopyin
     @result the value associated with the given header field, or nil if
     there is no value associated with the given header field.
     */
-    public func valueForHTTPHeaderField(field: String) -> String? { return _httpHeaderFields?[field.lowercased()] }
-    
+    public func valueForHTTPHeaderField(field: String) -> String? {
+        guard let f = allHTTPHeaderFields else { return nil }
+        return existingHeaderField(field, inHeaderFields: f)?.1
+    }
 }
 
 /*!
@@ -330,14 +333,10 @@ public class NSMutableURLRequest : NSURLRequest {
         @param URL The new URL for the receiver. 
     */
     /*@NSCopying */ public override var URL: NSURL? {
-        get {
-            return _URL
-        }
-        set(newURL) {
-            _URL = newURL
-        }
+        get { return super.URL }
+        set { super.URL = newValue }
     }
-
+    
     /*!
         @method setMainDocumentURL:
         @abstract Sets the main document URL
@@ -350,11 +349,8 @@ public class NSMutableURLRequest : NSURLRequest {
         other things in the future.
     */
     /*@NSCopying*/ public override var mainDocumentURL: NSURL? {
-        get {
-            return _mainDocumentURL
-        } set(newMainDocumentURL) {
-            _mainDocumentURL = newMainDocumentURL
-        }
+        get { return super.mainDocumentURL }
+        set { super.mainDocumentURL = newValue }
     }
 
 
@@ -364,11 +360,25 @@ public class NSMutableURLRequest : NSURLRequest {
         @result the HTTP request method of the receiver.
     */
     public override var HTTPMethod: String? {
-        get {
-            return _HTTPMethod
-        } set(newHTTPMethod) {
-            _HTTPMethod = newHTTPMethod
-        }
+        get { return super.HTTPMethod }
+        set { super.HTTPMethod = newValue }
+    }
+    
+    public override var cachePolicy: NSURLRequestCachePolicy {
+        get { return super.cachePolicy }
+        set { super.cachePolicy = newValue }
+    }
+    public override var timeoutInterval: NSTimeInterval {
+        get { return super.timeoutInterval }
+        set { super.timeoutInterval = newValue }
+    }
+    public override var networkServiceType: NSURLRequestNetworkServiceType {
+        get { return super.networkServiceType }
+        set { super.networkServiceType = newValue }
+    }
+    public override var allowsCellularAccess: Bool {
+        get { return super.allowsCellularAccess }
+        set { super.allowsCellularAccess = newValue }
     }
 
     /*!
@@ -382,16 +392,12 @@ public class NSMutableURLRequest : NSURLRequest {
         @param field the header field name (case-insensitive). 
     */
     public func setValue(value: String?, forHTTPHeaderField field: String) {
-        if _httpHeaderFields == nil {
-            _httpHeaderFields = [:]
-        }
-        if let existingHeader = _httpHeaderFields?.filter({ (existingField, _) -> Bool in
-            return existingField.lowercased() == field.lowercased()
-        }).first {
-            let (existingField, _) = existingHeader
-            _httpHeaderFields?.removeValue(forKey: existingField)
+        var f: [String: String] = allHTTPHeaderFields ?? [:]
+        if let old = existingHeaderField(field, inHeaderFields: f) {
+            f.removeValue(forKey: old.0)
         }
-        _httpHeaderFields?[field] = value
+        f[field] = value
+        allHTTPHeaderFields = f
     }
 
     /*! 
@@ -409,18 +415,22 @@ public class NSMutableURLRequest : NSURLRequest {
         @param field the header field name (case-insensitive). 
     */
     public func addValue(value: String, forHTTPHeaderField field: String) {
-        if _httpHeaderFields == nil {
-            _httpHeaderFields = [:]
-        }
-        if let existingHeader = _httpHeaderFields?.filter({ (existingField, _) -> Bool in
-            return existingField.lowercased() == field.lowercased()
-        }).first {
-            let (existingField, existingValue) = existingHeader
-            _httpHeaderFields?[existingField] = "\(existingValue),\(value)"
+        var f: [String: String] = allHTTPHeaderFields ?? [:]
+        if let old = existingHeaderField(field, inHeaderFields: f) {
+            f[old.0] = old.1 + "," + value
         } else {
-            _httpHeaderFields?[field] = value
+            f[field] = value
         }
+        allHTTPHeaderFields = f
     }
 }
 
-
+/// Returns an existing key-value pair inside the header fields if it exists.
+private func existingHeaderField(key: String, inHeaderFields fields: [String: String]) -> (String, String)? {
+    for (k, v) in fields {
+        if k.lowercased() == key.lowercased() {
+            return (k, v)
+        }
+    }
+    return nil
+}

TestFoundation/TestNSURLRequest.swift

@@ -34,6 +34,10 @@ class TestNSURLRequest : XCTestCase {
         XCTAssertNotNil(request)
         XCTAssertEqual(request.URL, URL)
         XCTAssertEqual(request.HTTPMethod, "GET")
+        XCTAssertEqual(request.cachePolicy, NSURLRequestCachePolicy.UseProtocolCachePolicy)
+        XCTAssertEqual(request.timeoutInterval, 60)
+        XCTAssertEqual(request.networkServiceType, NSURLRequestNetworkServiceType.NetworkServiceTypeDefault)
+        XCTAssertEqual(request.allowsCellularAccess, true)
         XCTAssertNil(request.allHTTPHeaderFields)
         XCTAssertNil(request.mainDocumentURL)
     }
@@ -46,6 +50,10 @@ class TestNSURLRequest : XCTestCase {
         XCTAssertNotNil(request)
         XCTAssertEqual(request.URL, URL)
         XCTAssertEqual(request.HTTPMethod, "GET")
+        XCTAssertEqual(request.cachePolicy, NSURLRequestCachePolicy.UseProtocolCachePolicy)
+        XCTAssertEqual(request.timeoutInterval, 60)
+        XCTAssertEqual(request.networkServiceType, NSURLRequestNetworkServiceType.NetworkServiceTypeDefault)
+        XCTAssertEqual(request.allowsCellularAccess, true)
         XCTAssertNil(request.allHTTPHeaderFields)
         XCTAssertNil(request.mainDocumentURL)
 
@@ -55,6 +63,21 @@ class TestNSURLRequest : XCTestCase {
         request.HTTPMethod = "POST"
         XCTAssertEqual(request.HTTPMethod, "POST")
 
+        let newPolicy = NSURLRequestCachePolicy.ReloadIgnoringCacheData
+        request.cachePolicy = newPolicy
+        XCTAssertEqual(request.cachePolicy, newPolicy)
+        
+        let newTimeout: NSTimeInterval = 42
+        request.timeoutInterval = newTimeout
+        XCTAssertEqual(request.timeoutInterval, newTimeout)
+        
+        let newServiceType = NSURLRequestNetworkServiceType.NetworkServiceTypeVoice
+        request.networkServiceType = newServiceType
+        XCTAssertEqual(request.networkServiceType, newServiceType)
+        
+        request.allowsCellularAccess = false
+        XCTAssertEqual(request.allowsCellularAccess, false)
+        
         let newURL = NSURL(string: "http://github.com")!
         request.URL = newURL
         XCTAssertEqual(request.URL, newURL)