Fix url encoder by specifying allowed characters #51
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
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 |
|---|---|---|
|
|
@@ -31,19 +31,4 @@ extension String { | |
|
|
||
| return parameters | ||
| } | ||
| } | ||
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,25 @@ | ||
| import Foundation | ||
|
|
||
| struct Utilities { | ||
|
There was a problem hiding this comment. I would suggest using a different name than There was a problem hiding this comment. Ironically 😛 I just moved those from string extensions to a new class. I had some problem before when some frameworks have the same method on String There was a problem hiding this comment. Yeah, that's a valid point. In that case, how about a There was a problem hiding this comment. Yeah, I can add that |
||
|
|
||
| /// Perform url encoding | ||
| /// | ||
| /// - Parameter string: The source string | ||
|
There was a problem hiding this comment. Also I'd name that parameter There was a problem hiding this comment. Also why not just pass a There was a problem hiding this comment. You're right, I will add that |
||
| /// - Returns: The encoded string | ||
| static func encode(string: String, allowed: String) -> String { | ||
| var set = CharacterSet.urlPathAllowed | ||
| allowed.unicodeScalars.forEach { | ||
| set.insert($0) | ||
| } | ||
|
|
||
| return string.addingPercentEncoding(withAllowedCharacters: set) ?? string | ||
| } | ||
|
|
||
| /// Perform url decoding | ||
| /// | ||
| /// - Parameter string: The encoded string | ||
| /// - Returns: The percented decoded string | ||
| static func decode(string: String) -> String { | ||
| return string.removingPercentEncoding ?? string | ||
| } | ||
| } | ||
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,19 @@ | ||
| import Foundation | ||
| import XCTest | ||
| @testable import Compass | ||
|
|
||
| class UtilitiesTests: XCTestCase { | ||
| func testEncode() { | ||
| let urn = "organization:hyper oslo:simply awesome" | ||
| let encodedUrn = Utilities.encode(string: urn, allowed: ":") | ||
|
|
||
| XCTAssertEqual(encodedUrn, "organization:hyper%20oslo:simply%20awesome") | ||
| } | ||
|
|
||
| func testDecode() { | ||
| let urn = "organization:hyper oslo:simply awesome" | ||
| let encodedUrn = Utilities.encode(string: urn, allowed: ":") | ||
|
|
||
| XCTAssertEqual(Utilities.decode(string: encodedUrn), urn) | ||
| } | ||
| } |
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.
How come this is needed, since you have only removed code from this file?
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.
Good catch. I added it by mistake. Will remove it