Commit 1810681

committed

update

1 parent 6569591 commit 1810681Copy full SHA for 1810681

File tree

-27

lines changed

-27

lines changed

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,7 @@ extension URL {`
`14`	`14`	`/// Strategy:`
`15`	`15`	`/// 1) Parse once to detect an existing scheme (mailto, ftp, etc.).`
`16`	`16`	`/// 2) If a scheme exists and it's not http/https -> reject.`
`17`		`- /// 3) If no scheme exists -> optionally prepend https:// and parse again.`
`18`		`- static func validURLFromString(from raw: String, assumeHTTPSIfMissing: Bool = true) -> URL? {`
	`17`	`+ static func validURLFromString(from raw: String) -> URL? {`
`19`	`18`	`let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)`
`20`	`19`
`21`	`20`	`// First parse to detect an existing scheme.`
`@@ -31,11 +30,6 @@ extension URL {`
`31`	`30`	`return comps.url`
`32`	`31`	`}`
`33`	`32`
`34`		`- // No scheme present -> optionally add https://`
`35`		`- guard assumeHTTPSIfMissing else { return nil }`
`36`		`- guard let comps = URLComponents(string: "https://" + trimmed) else { return nil }`
`37`		`- guard let host = comps.host, !host.isEmpty else { return nil }`
`38`		`- if let port = comps.port, !(1...65535).contains(port) { return nil }`
`39`		`- return comps.url`
	`33`	`+ return nil`
`40`	`34`	`}`
`41`	`35`	`}`

Lines changed: 0 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,20 +29,6 @@ final class testURL: XCTestCase {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- func testAddsHTTPSIfMissing() {`
`33`		`- // Given`
`34`		`- let raw = "example.com/path?x=1#y"`
`35`		`-`
`36`		`- // When`
`37`		`- let url = URL.validURLFromString(from: raw)`
`38`		`-`
`39`		`- // Then`
`40`		`- XCTAssertNotNil(url)`
`41`		`- XCTAssertEqual(url?.scheme, "https")`
`42`		`- XCTAssertEqual(url?.host, "example.com")`
`43`		`- XCTAssertEqual(url?.path, "/path")`
`44`		`- }`
`45`		`-`
`46`	`32`	`func testTrimsWhitespace() {`
`47`	`33`	`let raw = " https://example.com/video.m3u8 "`
`48`	`34`	`let url = URL.validURLFromString(from: raw)`
`@@ -86,9 +72,4 @@ final class testURL: XCTestCase {`
`86`	`72`	`XCTAssertNil(URL.validURLFromString(from: "https://"))`
`87`	`73`	`XCTAssertNil(URL.validURLFromString(from: "https:///path-only"))`
`88`	`74`	`}`
`89`		`-`
`90`		`- func testNoAutoSchemeOption() {`
`91`		`- // When auto-scheme is disabled, a bare host should fail.`
`92`		`- XCTAssertNil(URL.validURLFromString(from: "example.com", assumeHTTPSIfMissing: false))`
`93`		`- }`
`94`	`75`	`}`

Comments

(0)