try refactoring path validators with regex #218
Merged
Conversation
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
|
Vault.validate_path can be simplified further, or even reverted to the previous version since the new regex-based one is a bit more complicated. |
davecap
commented
Jan 10, 2018
solvebio/resource/object.py
Outdated
| # account_domain = parts[0] | ||
| # vault_name, object_path = parts[1].split('/', 1) | ||
| # Clean the input: remove double slashes and leading ':' | ||
| full_path = re.sub('//+', '/', full_path.lstrip(':')) |
davecap
commented
Jan 10, 2018
solvebio/resource/object.py
Outdated
| if kwargs.get('path'): | ||
| # If an override path is passed, ensure it looks like | ||
| # a path (i.e. starts with a forward slash). | ||
| raw_path = kwargs.get('path') |
davecap
commented
Jan 10, 2018
solvebio/resource/object.py
Outdated
| @@ -42,67 +42,106 @@ class Object(CreateableAPIResource, | |||
| ('description', 'Description'), | |||
| ) | |||
|
|
|||
| # Regex describing a path within a vault. | |||
| # Matching group 'path' will not contain a leading forward-slash | |||
| PATH_RE = re.compile(r'^(?:[^/]*)\/(?P<path>([^/:]+/?)*)$') | |||
There was a problem hiding this comment.
adjust so path requires a starting slash
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.