Remove redundant url_params info in specification

Just parse the params out of the url rather than explicitly listing them.

Author: alexvh

gitlab3/__init__.py

@@ -215,7 +215,7 @@ def _get_http_request_fn(api, method):
 def _add_extra_fn(api, action_def, parent=None):
     required_params = action_def.required_params
     # url_params are required params, but get passed as part of url
-    url_params = action_def.url_params
+    url_params = re.findall(':(\w+)', action_def.url)
     http_method = action_def.method
     url = api._q_url  # XXX: do any extra fns need unqualified url?
     url += action_def.url

gitlab3/_api_definition.py

@@ -49,7 +49,6 @@ def plural_name(cls):
 class ExtraActionDefinition(object):
     """Definition of a "non-standard" function"""
     url = ''
-    url_params = []
     required_params = []
     optional_params = []
 
@@ -150,30 +149,21 @@ class ForkFromAction(ExtraActionDefinition):
         """gl.Project.fork_from(forked_from_id)"""
         url = '/fork/:forked_from_id'
         method = _HTTP_POST
-        url_params = [
-            'forked_from_id',
-        ]
     class DeleteForkAction(ExtraActionDefinition):
         """gl.Project.delete_fork()"""
         url = '/fork'
         method = _HTTP_DELETE
     class GetBlobAction(ExtraActionDefinition):
         """gl.Project.get_blob()"""
-        url = '/repository/commits/:sha/blob'
+        url = '/repository/commits/:sha_or_ref_name/blob'
         method = _HTTP_GET
-        url_params = [
-            'sha_or_ref_name',
-        ]
         required_params = [
             'filepath',
         ]
     class ProtectBranchAction(ExtraActionDefinition):
         """gl.Project.protect_branch()"""
         url = '/repository/branches/:branch/protect'
         method = _HTTP_PUT
-        url_params = [
-            'branch',  # GitLab API is branch name
-        ]
         @staticmethod
         def wrapper(extra_action_fn, parent):
             """Accept a Branch object instead of a branch name"""
@@ -189,9 +179,6 @@ class UnprotectBranchAction(ExtraActionDefinition):
         """gl.Project.unprotect_branch()"""
         url = '/repository/branches/:branch/unprotect'
         method = _HTTP_PUT
-        url_params = [
-            'branch',  # GitLab API is branch name
-        ]
         @staticmethod
         def wrapper(extra_action_fn, parent):
             """Accept a Branch object instead of a branch name"""
@@ -447,9 +434,6 @@ class AddProjectForUserAction(ExtraActionDefinition):
         """gl.add_project_for_user(user_id, name)"""
         url = '/projects/user/:user_id'
         method = _HTTP_POST
-        url_params = [
-            'user_id',
-        ]
         required_params = [
             'name',
         ]