Implement attribute types to handle special cases

Some attributes need to be parsed/modified to work with the API (for
instance lists). This patch provides two attribute types that will
simplify parts of the code, and fix some CLI bugs.

Fixes #443

2 files changed, 14 insertions, 18 deletions

diff --git a/gitlab/v4/cli.py b/gitlab/v4/cli.py
index bceba33..0e50de1 100644
--- a/gitlab/v4/cli.py
+++ b/gitlab/v4/cli.py
@@ -45,6 +45,14 @@ class GitlabCLI(object):
         self.mgr_cls._path = self.mgr_cls._path % self.args
         self.mgr = self.mgr_cls(gl)
 
+        types = getattr(self.mgr_cls, '_types', {})
+        if types:
+            for attr_name, type_cls in types.items():
+                if attr_name in self.args.keys():
+                    obj = type_cls()
+                    obj.set_from_cli(self.args[attr_name])
+                    self.args[attr_name] = obj.get()
+
     def __call__(self):
         method = 'do_%s' % self.action
         if hasattr(self, method):
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
index e1763a5..348775e 100644
--- a/gitlab/v4/objects.py
+++ b/gitlab/v4/objects.py
@@ -23,6 +23,7 @@ from gitlab.base import *  # noqa
 from gitlab import cli
 from gitlab.exceptions import *  # noqa
 from gitlab.mixins import *  # noqa
+from gitlab import types
 from gitlab import utils
 
 VISIBILITY_PRIVATE = 'private'
@@ -315,12 +316,7 @@ class UserManager(CRUDMixin, RESTManager):
          'website_url', 'skip_confirmation', 'external', 'organization',
          'location')
     )
-
-    def _sanitize_data(self, data, action):
-        new_data = data.copy()
-        if 'confirm' in data:
-            new_data['confirm'] = str(new_data['confirm']).lower()
-        return new_data
+    _types = {'confirm': types.LowercaseStringAttribute}
 
 
 class CurrentUserEmail(ObjectDeleteMixin, RESTObject):
@@ -528,6 +524,7 @@ class GroupIssueManager(GetFromListMixin, RESTManager):
     _obj_cls = GroupIssue
     _from_parent_attrs = {'group_id': 'id'}
     _list_filters = ('state', 'labels', 'milestone', 'order_by', 'sort')
+    _types = {'labels': types.ListAttribute}
 
 
 class GroupMember(SaveMixin, ObjectDeleteMixin, RESTObject):
@@ -736,6 +733,7 @@ class IssueManager(GetFromListMixin, RESTManager):
     _path = '/issues'
     _obj_cls = Issue
     _list_filters = ('state', 'labels', 'order_by', 'sort')
+    _types = {'labels': types.ListAttribute}
 
 
 class License(RESTObject):
@@ -1346,12 +1344,7 @@ class ProjectIssueManager(CRUDMixin, RESTManager):
     _update_attrs = (tuple(), ('title', 'description', 'assignee_id',
                                'milestone_id', 'labels', 'created_at',
                                'updated_at', 'state_event', 'due_date'))
-
-    def _sanitize_data(self, data, action):
-        new_data = data.copy()
-        if 'labels' in data:
-            new_data['labels'] = ','.join(data['labels'])
-        return new_data
+    _types = {'labels': types.ListAttribute}
 
 
 class ProjectMember(SaveMixin, ObjectDeleteMixin, RESTObject):
@@ -1669,12 +1662,7 @@ class ProjectMergeRequestManager(CRUDMixin, RESTManager):
                                'description', 'state_event', 'labels',
                                'milestone_id'))
     _list_filters = ('iids', 'state', 'order_by', 'sort')
-
-    def _sanitize_data(self, data, action):
-        new_data = data.copy()
-        if 'labels' in data:
-            new_data['labels'] = ','.join(data['labels'])
-        return new_data
+    _types = {'labels': types.ListAttribute}
 
 
 class ProjectMilestone(SaveMixin, ObjectDeleteMixin, RESTObject):