working on URL

Author: colemancda

Sources/SwiftFoundation/HTTPClient.swift

@@ -78,6 +78,8 @@ public extension HTTP {
 
             response.headers = urlResponse!.allHeaderFields as! [String: String]
 
+            response.url = urlResponse!.url
+            
             return response
         }
     }
@@ -97,15 +99,13 @@ public extension Foundation.URLRequest {
 
     init?(request: HTTP.Request) {
 
-        guard let url = NSURL(string: request.URL) else { return nil }
-        
         guard request.version == HTTP.Version(1, 1) else { return nil }
 
-        self.init(url: url as Foundation.URL, timeoutInterval: request.timeoutInterval)
+        self.init(url: request.url, timeoutInterval: request.timeoutInterval)
 
-        if let data = request.body {
+        if request.body.isEmpty == false {
 
-            self.httpBody = data
+            self.httpBody = request.body
         }
 
         self.allHTTPHeaderFields = request.headers

Sources/SwiftFoundation/HTTPRequest.swift

@@ -11,21 +11,31 @@ public extension HTTP {
     /// HTTP request. 
     public struct Request: URLRequest {
 
-        public var URL: String
+        public var url: URL
 
-        public var timeoutInterval: TimeInterval = 30
+        public var timeoutInterval: TimeInterval
 
-        public var body: Data?
+        public var body: Data
 
-        public var headers = [String: String]()
+        public var headers: [String: String]
 
-        public var method: HTTP.Method = .GET
+        public var method: HTTP.Method
 
-        public var version: HTTP.Version = HTTP.Version()
+        public var version: HTTP.Version
 
-        public init(URL: String) {
+        public init(url: URL,
+                    timeoutInterval: TimeInterval = 30,
+                    body: Data = Data(),
+                    headers: [String: String] = [:],
+                    method: HTTP.Method = .GET,
+                    version: HTTP.Version = HTTP.Version()) {
 
-            self.URL = URL
+            self.url = url
+            self.timeoutInterval = timeoutInterval
+            self.body = body
+            self.headers = headers
+            self.method = method
+            self.version = version
         }
     }
 }

Sources/SwiftFoundation/HTTPResponse.swift

@@ -12,15 +12,29 @@ public extension HTTP {
     public struct Response: URLResponse {
 
         /// Returns a dictionary containing all the HTTP header fields.
-        public var headers = [String: String]()
+        public var headers: [String: String]
 
         /// Returns the HTTP status code for the response.
-        public var statusCode: Int = HTTP.StatusCode.OK.rawValue
+        public var statusCode: Int
 
         /// The HTTP response body.
-        public var body = Data()
+        public var body: Data
 
-        public init() { }
+        /// The URL for the response.
+        ///
+        /// Returned with 302 Found response.
+        public var url: URL?
+        
+        public init(headers: [String: String] = [String: String](),
+                    statusCode: Int = HTTP.StatusCode.OK.rawValue,
+                    body: Data = Data(),
+                    url: URL? = nil) {
+            
+            self.headers = headers
+            self.statusCode = statusCode
+            self.body = body
+            self.url = url
+        }
     }
 }
 

Sources/SwiftFoundation/URL.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2015 PureSwift. All rights reserved.
 //
 
+#if os(Linux) || XcodeLinux
+
 /// Encapsulates the components of an URL.
 public struct URL: CustomStringConvertible {
 
@@ -172,3 +174,4 @@ public struct URL: CustomStringConvertible {
     }
 }
 
+#endif

Sources/SwiftFoundation/URLRequest.swift

@@ -8,7 +8,7 @@
 
 public protocol URLRequest {
 
-    var URL: String { get }
+    var url: URL { get }
 
     var timeoutInterval: TimeInterval { get }
-}
+}

Sources/SwiftFoundation/URLResponse.swift

@@ -6,8 +6,9 @@
 //  Copyright © 2015 PureSwift. All rights reserved.
 //
 
-/// Encapsulates the metadata associated with the response to a a URL load request in a manner independent of protocol and URL scheme.
+/// Encapsulates the metadata associated with the response to a a URL load request
+/// in a manner independent of protocol and URL scheme.
 public protocol URLResponse {
 
 
-}
+}