implementation for NSURL.standardizedURL and NSURL.filePathURL properties

change _standardizedURLPath to private function

Author: mbvreddy

Foundation/NSURL.swift

@@ -28,6 +28,40 @@ private func _standardizedPath(_ path: String) -> String {
     return path
 }
 
+/* private function to remove .. and . from path */
+private func _standardizedURLPath(_ path: String) -> String {
+    var pComps = path.pathComponents
+
+    if pComps.last == "/" {
+        pComps.removeLast()
+    }
+
+    guard !pComps.isEmpty else {
+        return path
+    }
+
+    let isAbsolutePath = pComps.first == "/"
+    var result : String = pComps.removeFirst()
+    for pComp in pComps {
+        switch pComp {
+            case ".":
+                break
+
+            case ".." where isAbsolutePath:
+                result = result.bridge().stringByDeletingLastPathComponent
+
+            default:
+                result = result.bridge().stringByAppendingPathComponent(pComp)
+        }
+    }
+
+    if(path.hasSuffix("/")) {
+        result += "/"
+    }
+
+    return result
+}
+
 internal func _pathComponents(_ path: String?) -> [String]? {
     if let p = path {
         var result = [String]()
@@ -160,7 +194,7 @@ extension URLFileResourceType {
     public static let unknown = URLFileResourceType(rawValue: "NSURLFileResourceTypeUnknown")
 }
 
-public class NSURL: NSObject, NSSecureCoding, NSCopying {
+public class NSURL : NSObject, NSSecureCoding, NSCopying {
     typealias CFType = CFURL
     internal var _base = _CFInfo(typeID: CFURLGetTypeID())
     internal var _flags : UInt32 = 0
@@ -520,8 +554,15 @@ public class NSURL: NSObject, NSSecureCoding, NSCopying {
     }
 
     /* A string constant for the "file" URL scheme. If you are using this to compare to a URL's scheme to see if it is a file URL, you should instead use the NSURL fileURL property -- the fileURL property is much faster. */
-    public var standardized: URL? {
-        NSUnimplemented()
+    public var standardizedURL: NSURL? {
+        let urlComponent = NSURLComponents(string: relativeString)
+
+        guard urlComponent != nil && urlComponent!.path != nil else {
+            return nil
+        }
+
+        urlComponent!.path = _standardizedURLPath(urlComponent!.path!)
+        return urlComponent?.URLRelativeToURL(baseURL)
     }
 
     /* Returns whether the URL's resource exists and is reachable. This method synchronously checks if the resource's backing store is reachable. Checking reachability is appropriate when making decisions that do not require other immediate operations on the resource, e.g. periodic maintenance of UI state that depends on the existence of a specific document. When performing operations such as opening a file or copying resource properties, it is more efficient to simply try the operation and handle failures. If this method returns NO, the optional error is populated. This method is currently applicable only to URLs for file system resources. For other URL types, NO is returned. Symbol is present in iOS 4, but performs no operation.
@@ -534,8 +575,11 @@ public class NSURL: NSObject, NSSecureCoding, NSCopying {
 
     /* Returns a file path URL that refers to the same resource as a specified URL. File path URLs use a file system style path. An error will occur if the url parameter is not a file URL. A file reference URL's resource must exist and be reachable to be converted to a file path URL. Symbol is present in iOS 4, but performs no operation.
     */
-    public var filePathURL: URL? {
-        NSUnimplemented()
+    public var filePathURL: NSURL? {
+        guard fileURL else {
+            return nil
+        }
+        return NSURL(string: absoluteString)
     }
 
     override public var _cfTypeID: CFTypeID {

TestFoundation/TestNSURL.swift

@@ -148,10 +148,8 @@ class TestNSURL : XCTestCase {
             result["fragment"] = url.fragment ?? kNullString
             result["parameterString"] = url.parameterString ?? kNullString
             result["relativePath"] = url.relativePath ?? kNullString
-            result["isFileURL"] = url.isFileURL ? "YES" : "NO"
-            // Not yet implemented
-            // result["standardizedURL"] = url.standardizedURL?.relativeString ?? kNullString
-            
+            result["isFileURL"] = url.fileURL ? "YES" : "NO"
+            result["standardizedURL"] = url.standardizedURL?.relativeString ?? kNullString
             // Temporarily disabled because we're only checking string results
             // result["pathComponents"] = url.pathComponents ?? kNullString
             result["lastPathComponent"] = url.lastPathComponent ?? kNullString
@@ -222,14 +220,11 @@ class TestNSURL : XCTestCase {
             }
             if let url = url {
 
-                // TODO: NSURL.standardizedURL isn't implemented yet.
-                var modifiedExpectedNSResult = expectedNSResult as! [String: Any]
-                modifiedExpectedNSResult["standardizedURL"] = nil
                 if title == "NSURLWithString-parse-ambiguous-url-001" {
                     // TODO: Fix this test
                 } else {
                     let results = generateResults(url, pathComponent: inPathComponent, pathExtension: inPathExtension)
-                    let (isEqual, differences) = compareResults(url, expected: modifiedExpectedNSResult, got: results)
+                    let (isEqual, differences) = compareResults(url, expected: expectedNSResult as! [String: Any], got: results)
                     XCTAssertTrue(isEqual, "\(title): \(differences)")
                 }
             } else {