Skip to content

URL path extension APIs should strip trailing slashes #965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2024
Merged

URL path extension APIs should strip trailing slashes #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions Sources/FoundationEssentials/String/String+Path.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,11 @@ extension String {
guard let lastDot = utf8.lastIndex(of: ._dot) else {
return self
}
return String(self[..<lastDot])
var result = String(self[..<lastDot])
if utf8.last == ._slash {
result += "/"
}
return result
}

private func validatePathExtension(_ pathExtension: String) -> Bool {
Expand All @@ -206,7 +210,16 @@ extension String {
guard validatePathExtension(pathExtension) else {
return self
}
return self + ".\(pathExtension)"
var result = self._droppingTrailingSlashes
guard result != "/" else {
// Path was all slashes
return self + ".\(pathExtension)"
}
result += ".\(pathExtension)"
if utf8.last == ._slash {
result += "/"
}
return result
}

internal var pathExtension: String {
Expand Down
22 changes: 22 additions & 0 deletions Tests/FoundationEssentialsTests/StringTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,19 @@ final class StringTests : XCTestCase {
}
}

func testAppendingPathExtension() {
XCTAssertEqual("".appendingPathExtension("foo"), ".foo")
XCTAssertEqual("/".appendingPathExtension("foo"), "/.foo")
XCTAssertEqual("//".appendingPathExtension("foo"), "//.foo")
XCTAssertEqual("/path".appendingPathExtension("foo"), "/path.foo")
XCTAssertEqual("/path.zip".appendingPathExtension("foo"), "/path.zip.foo")
XCTAssertEqual("/path/".appendingPathExtension("foo"), "/path.foo/")
XCTAssertEqual("/path//".appendingPathExtension("foo"), "/path.foo/")
XCTAssertEqual("path".appendingPathExtension("foo"), "path.foo")
XCTAssertEqual("path/".appendingPathExtension("foo"), "path.foo/")
XCTAssertEqual("path//".appendingPathExtension("foo"), "path.foo/")
}

func testDeletingPathExtenstion() {
XCTAssertEqual("".deletingPathExtension(), "")
XCTAssertEqual("/".deletingPathExtension(), "/")
Expand All @@ -835,6 +848,15 @@ final class StringTests : XCTestCase {
XCTAssertEqual("/foo.bar/bar.baz/baz.zip".deletingPathExtension(), "/foo.bar/bar.baz/baz")
XCTAssertEqual("/.././.././a.zip".deletingPathExtension(), "/.././.././a")
XCTAssertEqual("/.././.././.".deletingPathExtension(), "/.././.././.")

XCTAssertEqual("path.foo".deletingPathExtension(), "path")
XCTAssertEqual("path.foo.zip".deletingPathExtension(), "path.foo")
XCTAssertEqual("/path.foo".deletingPathExtension(), "/path")
XCTAssertEqual("/path.foo.zip".deletingPathExtension(), "/path.foo")
XCTAssertEqual("path.foo/".deletingPathExtension(), "path/")
XCTAssertEqual("path.foo//".deletingPathExtension(), "path/")
XCTAssertEqual("/path.foo/".deletingPathExtension(), "/path/")
XCTAssertEqual("/path.foo//".deletingPathExtension(), "/path/")
}

func testPathComponents() {
Expand Down
21 changes: 21 additions & 0 deletions Tests/FoundationEssentialsTests/URLTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,27 @@ final class URLTests : XCTestCase {
XCTAssertEqual(url.path().utf8.last, ._slash)
}

func testURLPathExtensions() throws {
var url = URL(filePath: "/path", directoryHint: .notDirectory)
url.appendPathExtension("foo")
XCTAssertEqual(url.path(), "/path.foo")
url.deletePathExtension()
XCTAssertEqual(url.path(), "/path")

url = URL(filePath: "/path", directoryHint: .isDirectory)
url.appendPathExtension("foo")
XCTAssertEqual(url.path(), "/path.foo/")
url.deletePathExtension()
XCTAssertEqual(url.path(), "/path/")

url = URL(filePath: "/path/", directoryHint: .inferFromPath)
url.appendPathExtension("foo")
XCTAssertEqual(url.path(), "/path.foo/")
url.append(path: "/////")
url.deletePathExtension()
XCTAssertEqual(url.path(), "/path/")
}

func testURLComponentsPercentEncodedUnencodedProperties() throws {
var comp = URLComponents()

Expand Down