Modelizer class. json<->model parser

Also reorganize code

1 files changed, 12 insertions, 15 deletions

diff --git a/github3/models/orgs.py b/github3/models/orgs.py
index 1ce638e..840b51a 100644
--- a/github3/models/orgs.py
+++ b/github3/models/orgs.py
@@ -9,20 +9,17 @@ from .user import Plan
 class Org(BaseResource):
     """Github Organization object model."""
 
-    _strs = [
-        'login', 'url', 'avatar_url', 'name', 'company', 'blog', 'location', 'email'
-        'html_url', 'type', 'billing_email']
-    _ints = [
-        'id', 'public_repos', 'public_gists', 'followers', 'following',
-        'total_private_repos', 'owned_private_repos', 'private_gists', 'disk_usage',
-        'collaborators']
-    _dates = ['created_at']
-    _map = {'plan': Plan}
-    _writable = ['billing_email', 'blog', 'company', 'email', 'location', 'name']
-
-    @property
-    def ri(self):
-        return ('orgs', self.login)
+    @classmethod
+    def idl(self):
+        return {
+            'strs': ['login', 'url', 'avatar_url', 'name', 'company', 'blog',
+                     'location', 'email', 'html_url', 'type', 'billing_email'],
+            'ints': ['id', 'public_repos', 'public_gists', 'followers',
+                     'following', 'total_private_repos', 'owned_private_repos',
+                     'private_gists', 'disk_usage', 'collaborators'],
+            'dates': ['created_at'],
+            'maps': {'plan': plan}
+        }
 
     def __repr__(self):
-        return '<org {0}>'.format(self.login)
+        return '<Org %s>' % self.login