-
Notifications
You must be signed in to change notification settings - Fork 1k
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.
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
feat(ios): Add overrideable routing for CAPBridgeViewController subclasses #5546
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
1b59859
feat(ios): Add overrideable routing for CAPBridgeViewController
Steven0351 4fe74cb
chore(ios): Clean up comments and added whitespace
Steven0351 e0594a5
chore(ios): Disable type name violation (for now) on internal _Router
Steven0351 eafa0e6
chore(ios): Add explicit visibility modifier to internal struct _Router
Steven0351 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // | ||
| // Router.swift | ||
| // Capacitor | ||
| // | ||
| // Created by Steven Sherry on 3/29/22. | ||
| // Copyright © 2022 Drifty Co. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| public protocol Router { | ||
| func route(for path: String) -> String | ||
| } | ||
|
|
||
| // swiftlint:disable:next type_name | ||
| internal struct _Router: Router { | ||
| func route(for path: String) -> String { | ||
| let pathUrl = URL(string: path) | ||
|
|
||
| // if the pathUrl is null, then it is an invalid url (meaning it is empty or just plain invalid) then we want to route to /index.html | ||
| if pathUrl?.pathExtension.isEmpty ?? true { | ||
| return "/index.html" | ||
| } | ||
|
|
||
| return path | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // | ||
| // RouterTests.swift | ||
| // CapacitorTests | ||
| // | ||
| // Created by Steven Sherry on 3/29/22. | ||
| // Copyright © 2022 Drifty Co. All rights reserved. | ||
| // | ||
|
|
||
| import XCTest | ||
| @testable import Capacitor | ||
|
|
||
| class RouterTests: XCTestCase { | ||
| let router = _Router() | ||
|
|
||
| func testRouterReturnsIndexWhenProvidedInvalidPath() { | ||
| XCTAssertEqual(router.route(for: "/skull.💀"), "/index.html") | ||
| } | ||
|
|
||
| func testRouterReturnsIndexWhenProvidedEmptyPath() { | ||
| XCTAssertEqual(router.route(for: ""), "/index.html") | ||
| } | ||
|
|
||
| func testRouterReturnsIndexWhenProviedPathWithoutExtension() { | ||
| XCTAssertEqual(router.route(for: "/a/valid/path/no/ext"), "/index.html") | ||
| } | ||
|
|
||
| func testRouterReturnsPathWhenProvidedValidPath() { | ||
| XCTAssertEqual(router.route(for: "/a/valid/path.ext"), "/a/valid/path.ext") | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I disabled the swiftlint violation here because this is common practice in the Swift standard library to use an _ prefix for non-public types
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm fine with naming it something different if that's what we want to do as well.