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

Jump to bottom

Add google.api.core.path_template #3851

Merged

theacodes merged 6 commits into googleapis:master from theacodes:api-core-path-template

Aug 23, 2017

Contributor

theacodes commented Aug 22, 2017

Towards #3842


          Add google.api.core.path_template

e1403e3

theacodes added the api: core label

theacodes requested review from lukesneeringer and dhermes

August 22, 2017 02:38

googlebot added the cla: yes label

Contributor Author

theacodes commented Aug 22, 2017

@lukesneeringer @dhermes this gave me more trouble than I anticipated, but the tests give me confidence that this works as expected.

Contributor

lukesneeringer commented Aug 22, 2017

Still simpler than a lex-yacc implementation. ;-)

Sanity check: Correct?

Contributor Author

theacodes commented Aug 22, 2017 via email

Much simpler

On Mon, Aug 21, 2017, 7:48 PM Luke Sneeringer ***@***.***> wrote: Still simpler than a lex-yacc implementation. ;-) Sanity check: Correct? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#3851 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAPUc6HWLCb78HkRVkBspwrTMa-n4IIbks5sakF9gaJpZM4O-Cw2> .

Jon Wayne Parrott added 2 commits

August 22, 2017 10:15


          Clean up some bits

7a1a081


          Fix silly typo

f244feb

dhermes reviewed

View reviewed changes

core/google/api/core/path_template.py

+                          raise ValueError(
+                              'Named variable \'{}\' not specified and needed by template '
+                              '`{}` at position {}'.format(
+                                  name, match.string, match.start()))

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

core/google/api/core/path_template.py Outdated

+                  Raises:
+                      ValueError: If a positional or named variable is required by the
+                          template but not specified.

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

core/google/api/core/path_template.py Outdated

+                      if not template:
+                          return _SINGLE_SEGEMENT_PATTERN.format(name)
+                      elif template == '**':
+                          return _MULTI_SEGEMENT_PATTERN.format(name)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

core/google/api/core/path_template.py

+                  Returns:
+                      bool: True if the path matches.
+                  """
+                  pattern = _generate_pattern_for_template(tmpl) + '$'

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

core/tests/unit/api_core/test_path_template.py

+              @pytest.mark.parametrize('tmpl, args, kwargs, exc_match', [
+                  # Missing positional arg.
+                  ['v1/*', [], {}, 'Positional'],

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

core/tests/unit/api_core/test_path_template.py Outdated

+                  ['/v1/*/{name}', ['a'], {'name': 'parent'}, '/v1/a/parent'],
+                  ['/v1/{name}/*', ['a'], {'name': 'parent'}, '/v1/parent/a'],
+                  ['/v1/{parent}/*/{child}/*', ['a', 'b'],
+                   {'parent': 'parent', 'child': 'child'}, '/v1/parent/a/child/b'],

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view


          Address review comments

504c3f6

duggelz reviewed

View reviewed changes

core/google/api/core/path_template.py

+              import six
+              # Regular expression for extracting variable parts from a path template.
+              # The variables can be expressed as:

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

duggelz reviewed

View reviewed changes

core/tests/unit/api_core/test_path_template.py

+                  ['/v1/{name=parent/*}/*', ['a'], {'name': 'parent/child'},
+                   '/v1/parent/child/a'],
+                  ['/v1/*/{name=parent/**}', ['a'], {'name': 'parent/child/object'},
+                   '/v1/a/parent/child/object'],

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

duggelz reviewed

View reviewed changes

core/google/api/core/path_template.py Outdated

+                      match (re.Match): A regular expression match.
+                  Returns:
+                      str: The expaned variable to replace the match.

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view


          Fix typo, slight tweak to regexp

b4588ab

duggelz reviewed

View reviewed changes

core/google/api/core/path_template.py

+              import six
+              # Regular expression for extracting variable parts from a path template.
+              # The variables can be expressed as:

This comment was marked as spam.

Sign in to view

core/google/api/core/path_template.py

+                          is encountered.
+                  """
+                  replacer = functools.partial(_expand_variable_match, list(args), kwargs)
+                  return _VARIABLE_RE.sub(replacer, tmpl)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view


          Fix typo

011b308

lukesneeringer approved these changes

View reviewed changes

theacodes merged commit 357bfeb into googleapis:master

theacodes deleted the api-core-path-template branch

August 23, 2017 21:29

parthea pushed a commit that referenced this pull request


          chore(deps): update dependency google.cloud.talent to v0.6.1 [(#3851)](…

362f7b7

…GoogleCloudPlatform/python-docs-samples#3851)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

api: core cla: yes