From e4729b6ca3ac3fc055850c4ff78c4710f2ce6441 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Sat, 19 Feb 2011 16:03:19 -0500
Subject: [PATCH] Back to Convore object system.

---
 convore/core.py | 63 ++++++++++++++++---------------------------------
 1 file changed, 20 insertions(+), 43 deletions(-)

diff --git a/convore/core.py b/convore/core.py
index 3e9b828..38e22b8 100644
--- a/convore/core.py
+++ b/convore/core.py
@@ -8,11 +8,7 @@
     :copyright: (c) 2011 by Kenneth Reitz.
     :license: ISC, see LICENSE for more details.
 """
-import json
 
-import requests
-
-import models
 import api
 
 
@@ -26,48 +22,29 @@ __copyright__ = 'Copyright 2011 Kenneth Reitz'
 
 API_URL = 'https://convore.com/api/'
 
+class Convore(object):
+    def __init__(self, username, password):
+        self.username = username
 
-def login(username, password):
-    api.login(username, password)
-
-    
-def account_verify():
-    r = requests.get(API_URL + 'account/verify.json')
-    try:
-        r.raise_for_status()
-        if r.status_code == 200:
-            return True
-        else:
-            return False
-    except requests.HTTPError:
-        raise LoginFailed
-
-
-def groups(group_id=None):
-    # seeking list of groups
-    try:
-
-        if not group_id:
-            r = requests.get(API_URL + 'groups.json')
-            groups = json.loads(r.content)['groups']
-
-            _groups = []
-            
-            for group in groups:
-                _group = models.Group()
-                _group.import_from_api(group)
-                _groups.append(_group)
-
-
-            return _groups
-        # seeking unique group
-        else:
-
-            pass
-    except requests.HTTPError:
-        raise LoginFailed
+        api.login(username, password)
 
+    @property
+    def groups(self):
+        return api.Groups()
+
+    def account_verify(self):
+
+        r = requests.get(API_URL + 'account/verify.json')
+        try:
+            r.raise_for_status()
+            if r.status_code == 200:
+                return True
+            else:
+                return False
+        except requests.HTTPError:
+            raise LoginFailed
 
 
+        
 class LoginFailed(RuntimeError):
     """Login falied!"""