5 files changed, 36 insertions, 142 deletions
diff --git a/pygithub3/requests/users/__init__.py b/pygithub3/requests/users/__init__.py
index 93ab7b6..11e6a39 100644
--- a/pygithub3/requests/users/__init__.py
+++ b/pygithub3/requests/users/__init__.py
@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 
-from pygithub3.requests import Request, json, RequestValidationError
+from pygithub3.requests import Request, ValidationError
 from user import *
diff --git a/pygithub3/requests/users/emails.py b/pygithub3/requests/users/emails.py
index f7fb284..7622fcc 100644
--- a/pygithub3/requests/users/emails.py
+++ b/pygithub3/requests/users/emails.py
@@ -1,44 +1,28 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from . import Request, json
-from pygithub3.resources.base import Raw
+import re
 
+from . import Request
 
-class List(Request):
-
-    resource = Raw
 
-    def validate(self):
-        pass
+class List(Request):
 
-    def set_uri(self):
-        return 'user/emails'
+    uri = 'users/emails'
 
 
 class Add(Request):
 
-    resource = Raw
+    uri = 'user/emails'
 
-    def validate(self):
-        pass
+    def clean_body(self):
 
-    def get_data(self):
-        return json.dumps(self.emails)
+        def is_email(email):
+            return re.match(r'.*', email)  # TODO: email regex ;)
 
-    def set_uri(self):
-        return 'user/emails'
+        return filter(is_email, self.body)
 
 
 class Delete(Request):
 
-    resource = Raw
-
-    def validate(self):
-        pass
-
-    def get_data(self):
-        return json.dumps(self.emails)
-
-    def set_uri(self):
-        return 'user/emails'
+    uri = 'user/emails'
diff --git a/pygithub3/requests/users/followers.py b/pygithub3/requests/users/followers.py
index f2bfc1a..5f59032 100644
--- a/pygithub3/requests/users/followers.py
+++ b/pygithub3/requests/users/followers.py
@@ -1,76 +1,40 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from . import Request, RequestValidationError
+from . import Request
 from pygithub3.resources.users import User
-from pygithub3.resources.base import Raw
 
 
 class List(Request):
 
     resource = User
+    uri = 'users/{user}/followers'
 
-    def validate(self):
-        pass
-
-    def set_uri(self):
-        if self.user:
-            return 'users/%s/followers' % self.user
-        else:
+    def clean_uri(self):
+        if not self.user:
             return 'user/followers'
 
 
 class Listfollowing(Request):
 
     resource = User
+    uri = 'users/{user}/following'
 
-    def validate(self):
-        pass
-
-    def set_uri(self):
-        if self.user:
-            return 'users/%s/following' % self.user
-        else:
+    def clean_uri(self):
+        if not self.user:
             return 'user/following'
 
 
 class Isfollowing(Request):
 
-    resource = Raw
-
-    def validate(self):
-        if not self.user:
-            raise RequestValidationError(
-                "'%s' request needs a user" % self.__class__.__name__)
-
-    def set_uri(self):
-        return 'user/following/%s' % self.user
+    uri = 'user/following/{user}'
 
 
 class Follow(Request):
 
-    resource = Raw
-
-    def validate(self):
-        if not self.user:
-            raise RequestValidationError(
-                "'%s' request needs a user" % self.__class__.__name__)
-
-    def set_uri(self):
-        return 'user/following/%s' % self.user
+    uri = 'user/following/{user}'
 
 
 class Unfollow(Request):
 
-    resource = User
-
-    def validate(self):
-        if not self.user:
-            raise RequestValidationError(
-                "'%s' request needs a user" % self.__class__.__name__)
-
-    def set_uri(self):
-        return 'user/following/%s' % self.user
-
-    def get_data(self):
-        pass
+    uri = 'user/following/{user}'
diff --git a/pygithub3/requests/users/keys.py b/pygithub3/requests/users/keys.py
index f5bb386..9afa3cd 100644
--- a/pygithub3/requests/users/keys.py
+++ b/pygithub3/requests/users/keys.py
@@ -1,79 +1,36 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from . import Request, json, RequestValidationError
+from . import Request
 from pygithub3.resources.users import Key
-from pygithub3.resources.base import Raw
 
 
 class List(Request):
 
     resource = Key
-
-    def validate(self):
-        pass
-
-    def set_uri(self):
-        return 'user/keys'
+    uri = 'user/key'
 
 
 class Get(Request):
 
     resource = Key
-
-    def validate(self):
-        if not self.key_id:
-            raise RequestValidationError("'%s' needs key_id"
-                                         % self.__class__.__name__)
-
-    def set_uri(self):
-        return 'user/keys/%s' % self.key_id
+    uri = 'user/keys/{key_id}'
 
 
 class Add(Request):
 
     resource = Key
-    valid = ('title', 'key')
-
-    def validate(self):
-        self.add_data = self._parse_simple_dict(self.add_data)
-
-    def set_uri(self):
-        return 'user/keys'
-
-    def get_data(self):
-        return json.dumps(self.add_data)
+    uri = 'user/keys'
+    body_schema = ('title', 'key')
 
 
 class Update(Request):
 
     resource = Key
-    valid = ('title', 'key')
-
-    def validate(self):
-        if not self.key_id:
-            raise RequestValidationError("'%s' needs key_id"
-                                         % self.__class__.__name__)
-        self.update_params = self._parse_simple_dict(self.update_with)
-
-    def set_uri(self):
-        return 'user/keys/%s' % self.key_id
-
-    def get_data(self):
-        return json.dumps(self.update_params)
+    body_schema = ('title', 'key')
+    uri = 'user/keys/{key_id}'
 
 
 class Delete(Request):
 
-    resource = Raw
-
-    def validate(self):
-        if not self.key_id:
-            raise RequestValidationError("'%s' needs key_id"
-                                         % self.__class__.__name__)
-
-    def set_uri(self):
-        return 'user/keys/%s' % self.key_id
-
-    def get_data(self):
-        return None
+    uri = 'user/keys/{key_id}'
diff --git a/pygithub3/requests/users/user.py b/pygithub3/requests/users/user.py
index d4b3667..78ab6cd 100644
--- a/pygithub3/requests/users/user.py
+++ b/pygithub3/requests/users/user.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from . import Request, json
+from . import Request, ValidationError
 from pygithub3.resources.users import User
 
 __all__ = ('Get', 'Update')
@@ -10,27 +10,16 @@ __all__ = ('Get', 'Update')
 class Get(Request):
 
     resource = User
+    uri = 'users/{user}'
 
-    def validate(self):
-        pass
-
-    def set_uri(self):
-        if self.user:
-            return 'users/%s' % self.user
-        else:
+    def clean_uri(self):
+        if not self.user:
             return 'user'
 
 
 class Update(Request):
 
     resource = User
-    valid = ('name', 'email', 'blog', 'company', 'location', 'hireable', 'bio')
-
-    def validate(self):
-        self.update_params = self._parse_simple_dict(self.update_with)
-
-    def get_data(self):
-        return json.dumps(self.update_params)
-
-    def set_uri(self):
-        return 'user'
+    uri = 'user'
+    body_schema = (
+        'name', 'email', 'blog', 'company', 'location','hireable', 'bio')