Review and overhall of codebase for a 1.x release.

Deprecated first version of api and made api2 api.
Moved auth into api.mixins
Support features from odin 1.x
Dropped support for South (seriously use Django Migrations!)

Author: timsavage

baldr/api.py baldr/api/__init__.pybaldr/api.py renamed to baldr/api/__init__.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 # Well known methods
 GET = 'GET'
 HEAD = 'HEAD'

baldr/api2/constants.py baldr/api/constants.pybaldr/api2/constants.py renamed to baldr/api/constants.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-from baldr.api import ResourceApiCommon
+from baldr.api import ResourceApi
 from baldr.exceptions import ImmediateErrorHttpResponse
 
 
-class LoginRequiredMixin(ResourceApiCommon):
+class LoginRequiredMixin(ResourceApi):
     """
     Ensure that a user has logged in.
     """

baldr/auth.py baldr/api/mixins.pybaldr/auth.py renamed to baldr/api/mixins.py

@@ -1,7 +1,10 @@
+# -*- coding: utf-8 -*-
 from __future__ import absolute_import
+
 from django.shortcuts import get_object_or_404
 from odin import registration
 from odin.exceptions import CodecDecodeError
+
 from . import ResourceApi, listing, collection, create, detail, update, patch, delete
 from ..exceptions import ImmediateErrorHttpResponse
 

baldr/api2/models.py baldr/api/models.pybaldr/api2/models.py renamed to baldr/api/models.py

@@ -1,13 +1,16 @@
+# -*- coding: utf-8 -*-
 from __future__ import absolute_import
+
 import six
+
 from baldr.resources import Listing
+
 from . import constants
 
 __all__ = (
     # Basic routes
-    'collection', 'collection_action', 'resource', 'resource_action', 'route',
-    # Pending deprecation routes
-    'detail_route', 'action', 'detail_action',
+    'route', 'action', 'collection', 'collection_action',
+    'detail_route', 'detail_action',
     # Handlers
     'list_response',
     # Shortcuts
@@ -53,10 +56,10 @@ def list_items(self, request):
     route_number = _route_count
     _route_count += 1
 
-    def inner(func):
-        func.route = (route_number, path_type, method, name)
-        func.resource = resource
-        return func
+    def inner(f):
+        f.route = (route_number, path_type, method, name)
+        f.resource = resource
+        return f
 
     return inner(func) if func else inner
 
@@ -66,7 +69,7 @@ def inner(func):
 def resource_route(func=None, name=None, method=constants.GET, resource=None):
     return route(func, name, constants.PATH_TYPE_RESOURCE, method, resource)
 
-detail_route = detail_action = resource = resource_action = resource_route
+detail_route = detail_action = resource_route
 
 
 # Handlers
@@ -75,12 +78,12 @@ def list_response(func=None, default_offset=0, default_limit=50):
     """
     Handle processing a list. It is assumed decorator will operate on a class.
     """
-    def inner(func):
+    def inner(f):
         def wrapper(self, request, *args, **kwargs):
             # Get paging args from query string
             offset = kwargs['offset'] = int(request.GET.get('offset', default_offset))
             limit = kwargs['limit'] = int(request.GET.get('limit', default_limit))
-            result = func(self, request, *args, **kwargs)
+            result = f(self, request, *args, **kwargs)
             if result is not None:
                 if isinstance(result, tuple) and len(result) == 2:
                     result, total_count = result

baldr/api2/route_decorators.py baldr/api/route_decorators.pybaldr/api2/route_decorators.py renamed to baldr/api/route_decorators.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
+import odin
+import six
+
 from django.core import exceptions as django_exceptions
 from django.forms import widgets
 from django.forms.fields import CharField
 from django.utils.translation import ugettext_lazy as _
-import odin
 from odin import exceptions as odin_exceptions
 from odin.codecs import json_codec
-import six
+from odin.utils import getmeta
 
 
 class ResourceField(CharField):
@@ -57,7 +59,7 @@ def to_python(self, value):
                 raise django_exceptions.ValidationError(str(ve))
 
         raise django_exceptions.ValidationError(
-            self.error_messages['invalid'] % self.resource_type._meta.resource_name, code='invalid'
+            self.error_messages['invalid'] % getmeta(self.resource_type).resource_name, code='invalid'
         )
 
     def validate(self, value):
@@ -76,7 +78,7 @@ def validate(self, value):
                     raise django_exceptions.ValidationError(ve.messages)
         else:
             raise django_exceptions.ValidationError(
-                self.error_messages['invalid'] % self.resource_type._meta.resource_name, code='invalid')
+                self.error_messages['invalid'] % getmeta(self.resource_type).resource_name, code='invalid')
 
 
 class ResourceListField(ResourceField):
@@ -99,7 +101,7 @@ def to_python(self, value):
                 raise django_exceptions.ValidationError(str(ve))
 
         raise django_exceptions.ValidationError(
-            self.error_messages['invalid'] % self.resource_type._meta.resource_name, code='invalid')
+            self.error_messages['invalid'] % getmeta(self.resource_type).resource_name, code='invalid')
 
     def validate(self, value):
         if value is None:
@@ -118,5 +120,5 @@ def validate(self, value):
         # Unknown type
         else:
             raise django_exceptions.ValidationError(
-                self.error_messages['invalid'] % self.resource_type._meta.resource_name, code='invalid'
+                self.error_messages['invalid'] % getmeta(self.resource_type).resource_name, code='invalid'
             )