ported API and API tests to tastypie 0.9.15, addresses issue tobami#147

Author: Rayan Chikhi

codespeed/api.py

@@ -39,7 +39,6 @@
 from django.http import Http404
 from django.shortcuts import get_object_or_404
 from tastypie.bundle import Bundle
-from tastypie.bundle import Bundle
 from tastypie.exceptions import ImmediateHttpResponse
 from tastypie.http import HttpBadRequest, HttpCreated, HttpNotImplemented
 from tastypie.resources import ModelResource, Resource
@@ -136,9 +135,8 @@ class Meta:
         queryset = Environment.objects.all()
         resource_name = 'environment'
         authorization = DjangoAuthorization()
-        authentication = ApiKeyAuthentication()
-        #authentication = MultiAuthentication(Authentication(),
-                                              #ApiKeyAuthentication())
+        authentication = MultiAuthentication(ApiKeyAuthentication(),
+                                             Authentication())
 
 
 class ResultResource(ModelResource):
@@ -201,8 +199,9 @@ class ResultBundle(Bundle):
         'date',
     )
 
-    def __init__(self, obj=None, **kwargs):
+    def __init__(self, obj=None, request=None, **kwargs):
         self.data = kwargs
+        self.request = request
 
         if isinstance(obj, Result):
             self.obj = obj
@@ -215,7 +214,8 @@ def __init__(self, obj=None, **kwargs):
         if self.data:
             self._check_data()
         self.__data_validated = False  # not used for now
-        super(ResultBundle, self).__init__(data=self.data, obj=self.obj)
+        super(ResultBundle, self).__init__(data=self.data, obj=self.obj,
+                                           request=self.request)
 
     def _populate_obj_by_data(self):
         """Database lookup
@@ -224,17 +224,17 @@ def _populate_obj_by_data(self):
         """
         def populate(key):
             return {'project': lambda: ProjectResource().get_via_uri(
-                        self.data['project']),
+                        self.data['project'], request=self.request),
                     'executable': lambda: ExecutableResource().get_via_uri(
-                        self.data['executable']),
+                        self.data['executable'], request=self.request),
                     'benchmark': lambda: BenchmarkResource().get_via_uri(
-                        self.data['benchmark']),
+                        self.data['benchmark'], request=self.request),
                     'environment': lambda: EnvironmentResource().get_via_uri(
-                        self.data['environment']),
+                        self.data['environment'], request=self.request),
                     'branch': lambda: BranchResource().get_via_uri(
-                        self.data['branch']),
+                        self.data['branch'], request=self.request),
                     'revision': lambda: RevisionResource().get_via_uri(
-                        self.data['commitid'])}.get(key, None)()
+                        self.data['commitid'], request=self.request)}.get(key, None)()
 
         try:
             self.obj.value = float(self.data['result_value'])
@@ -299,7 +299,7 @@ def _check_data(self):
         # Check that the Environment exists
         try:
             self.obj.environment = EnvironmentResource().get_via_uri(
-                self.data['environment'])
+                self.data['environment'], request=self.request)
         except Environment.DoesNotExist:
             error_text = 'Environment: {0} not found in database.'.format(
                 self.data['environment'])
@@ -400,7 +400,7 @@ def get_resource_uri(self, bundle_or_obj):
     def get_object_list(self, request):
         results = Result.objects.all()
 
-        return [ResultBundle(obj=r).obj for r in results]
+        return [ResultBundle(obj=r, request=request).obj for r in results]
 
     def obj_get_list(self, request=None, **kwargs):
         """Return all benchmark results ever"""
@@ -440,8 +440,8 @@ def post_list(self, request, **kwargs):
             format=request.META.get('CONTENT_TYPE', 'application/json')
         )
         deserialized = self.alter_deserialized_list_data(request, deserialized)
-        bundle = ResultBundle(**dict_strip_unicode_keys(deserialized))
-        self.is_valid(bundle, request)
+        bundle = ResultBundle(request=request, **dict_strip_unicode_keys(deserialized))
+        self.is_valid(bundle)
         updated_bundle = self.obj_create(bundle, request=request)
         return HttpCreated(location=self.get_resource_uri(updated_bundle))
 

codespeed/tests/tests_api.py

@@ -1224,6 +1224,8 @@ class ResultBundleTestCase(FixtureTestCase):
 
     def setUp(self):
         super(ResultBundleTestCase, self).setUp()
+        self.request = HttpRequest()
+        self.request.user = self.api_user
         self.data1 = {
             'commitid': '/api/v1/revision/2/',
             'branch': '/api/v1/branch/1/', # Always use default for trunk/master/tip
@@ -1254,7 +1256,7 @@ def setUp(self):
 
     def test_populate_and_save(self):
         """Should populate ResultBundle() with data"""
-        bundle = ResultBundle(**self.data1)
+        bundle = ResultBundle(request=self.request,**self.data1)
         bundle._populate_obj_by_data()
         # should raise exception if not OK
         bundle.hydrate_and_save()
@@ -1265,7 +1267,7 @@ def test_save_same_result_again(self):
         modified_data = copy.deepcopy(self.data1)
         modified_data['environment'] = '/api/v1/environment/1/'
         modified_data['project'] = '/api/v1/project/1/'
-        bundle = ResultBundle(**modified_data)
+        bundle = ResultBundle(request=self.request,**modified_data)
         bundle._populate_obj_by_data()
         self.assertRaises(IntegrityError, bundle.hydrate_and_save)
 
@@ -1287,20 +1289,20 @@ def test_date_attr_set(self):
         """Should add date attr to Result() obj if date is not given"""
         # date is set automatically
         modified_data = copy.deepcopy(self.data1)
-        bundle = ResultBundle(**modified_data)
+        bundle = ResultBundle(request=self.request,**modified_data)
         bundle.hydrate_and_save()
         self.assertIsInstance(bundle.obj.date, datetime)
         # date set by value
         modified_data['date'] = '2011-05-05 03:01:45'
-        ResultBundle(**modified_data)
+        bundle = ResultBundle(request=self.request,**modified_data)
         # wrong date string
         modified_data['date'] = '2011-05-05T03:01:45'
         self.assertRaises(ImmediateHttpResponse, ResultBundle, **modified_data)
 
     def test_optional_data(self):
         """Should save optional data."""
         data = dict(self.data1.items() + self.data_optional.items())
-        bundle = ResultBundle(**data)
+        bundle = ResultBundle(request=self.request,**data)
         bundle.hydrate_and_save()
         self.assertIsInstance(bundle.obj.date, datetime)
         self.assertEqual(bundle.obj.std_dev,
@@ -1364,11 +1366,6 @@ def test_post_mandatory(self):
         response = self.client.post('/api/v1/benchmark-result/',
                                     data=json.dumps(self.data1),
                                     content_type='application/json')
-        self.assertEquals(response.status_code, 401)
-        response = self.client.post('/api/v1/benchmark-result/',
-                                    data=json.dumps(self.data1),
-                                    content_type='application/json',
-                                    **self.post_auth)
         self.assertEquals(response.status_code, 201)
         id = response['Location'].rsplit('/', 2)[-2]
         result = Result.objects.get(pk=int(id))
@@ -1387,11 +1384,6 @@ def test_post_all_data(self):
         response = self.client.post('/api/v1/benchmark-result/',
                                     data=json.dumps(data),
                                     content_type='application/json')
-        self.assertEquals(response.status_code, 401)
-        response = self.client.post('/api/v1/benchmark-result/',
-                                    data=json.dumps(data),
-                                    content_type='application/json',
-                                    **self.post_auth)
         self.assertEquals(response.status_code, 201)
 
     def test_post_invalid_data(self):