ORM draft

dancio · dancio · commit 54fa13283287 · 2015-01-21T16:03:36.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ dist
 *.pyo
 .coverage
 coverage
+run_it.py
diff --git a/syncano/__init__.py b/syncano/__init__.py
@@ -8,7 +8,7 @@
 __copyright__ = 'Copyright 2015 Syncano'
 
 VERSION = __version__
-API_ROOT = 'http://127.0.0.1:8000/api/'
+API_ROOT = os.getenv('SYNCANO_API_ROOT', 'https://api.syncano.com/')
 
 env_loglevel = os.getenv('SYNCANO_LOGLEVEL', 'INFO')
 loglevel = getattr(logging, env_loglevel.upper(), None)
diff --git a/syncano/connection.py b/syncano/connection.py
@@ -6,12 +6,15 @@
 import syncano
 from syncano.exceptions import (
     SyncanoValueError, SyncanoRequestError,
+    SyncanoValidationError
 )
 from syncano.resultset import ResultSet
+from syncano.models import Registry
 
 
 class Connection(object):
-    AUTH_SUFFIX = 'account/auth/'
+    AUTH_SUFFIX = 'v1/account/auth'
+    SCHEMA_SUFFIX = 'v1/schema'
     CONTENT_TYPE = 'application/json'
     RESULT_SET_CLASS = ResultSet
 
@@ -23,6 +26,7 @@ def __init__(self, host=None, email=None, password=None, api_key=None, **kwargs)
         self.logger = kwargs.get('logger') or syncano.logger
         self.timeout = kwargs.get('timeout') or 30
         self.session = requests.Session()
+        self.models = Registry(self).register_schema(self.schema)
 
     def build_params(self, kwargs):
         params = deepcopy(kwargs)
@@ -79,7 +83,7 @@ def request(self, method_name, path, **kwargs):
         return ResultClass(**content) if ResultClass else content
 
     def make_request(self, method_name, path, **kwargs):
-        self.logger.debug('Request: %s', path)
+        self.logger.debug('Request: %s %s', method_name, path)
 
         params = self.build_params(kwargs)
         method = getattr(self.session, method_name.lower(), None)
@@ -92,6 +96,11 @@ def make_request(self, method_name, path, **kwargs):
         has_json = response.headers.get('content-type') == 'application/json'
         content = response.json() if has_json else response.text
 
+        if response.status_code == 400:
+            for name, errors in content.iteritems():
+                errors = ', '.join(errors)
+                raise SyncanoValidationError('"{0}": {1}.'.format(name, errors))
+
         if response.status_code not in [200, 201]:
             content = content['detail'] if has_json else content
             self.logger.debug('Request Error: %s', url)
@@ -101,6 +110,13 @@ def make_request(self, method_name, path, **kwargs):
 
         return content
 
+    @property
+    def schema(self):
+        if not hasattr(self, '_schema'):
+            response = self.make_request('GET', self.SCHEMA_SUFFIX)
+            self._schema = response
+        return self._schema
+
     def is_authenticated(self):
         return self.api_key is not None
 
diff --git a/syncano/exceptions.py b/syncano/exceptions.py
@@ -29,3 +29,7 @@ def __repr__(self):
 
     def __str__(self):
         return '{0} {1}'.format(self.status_code, self.reason)
+
+
+class SyncanoValidationError(SyncanoValueError):
+    pass
