Merge pull request tobami#149 from rchikhi/django-1.5.1-port

Django 1.5.1 port

Author: tobami

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,23 @@ 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 +305,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 +406,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 +446,9 @@ 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/templates/codespeed/changes.html

@@ -1,10 +1,11 @@
 {% extends "base.html" %}
+{% load url from future %}
 {% block title %}{{ block.super }}: Changes{% endblock %}
 
 {% block navigation %}
     {{ block.super }}
 {% endblock %}
-{% block nav-changes %}class="current"><a href="{% url changes %}">Changes</a>{% endblock %}
+{% block nav-changes %}class="current"><a href="{% url "changes" %}">Changes</a>{% endblock %}
 
 {% block body %}
 <div id="sidebar">
@@ -66,7 +67,7 @@
 <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}js/changes.js"></script>
 <script type="text/javascript">
-    var TIMELINE_URL = "{% url timeline %}";
+    var TIMELINE_URL = "{% url "timeline" %}";
 
     $(function() {
         Changes.config({

codespeed/templates/codespeed/comparison.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load url from future %}
 {% block title %}{{ block.super }}: Comparison{% endblock %}
 
 {% block extra_head %}
@@ -9,7 +10,7 @@
 {% block navigation %}
     {{ block.super }}
 {% endblock %}
-{% block nav-comparison %}class="current"><a href="{% url comparison %}">Comparison</a>{% endblock %}
+{% block nav-comparison %}class="current"><a href="{% url "comparison" %}">Comparison</a>{% endblock %}
 
 {% block body %}
 <div id="sidebar">

codespeed/templates/codespeed/timeline.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load url from future %}
 {% block title %}{{ block.super }}: Timeline{% endblock %}
 
 {% block extra_head %}
@@ -8,7 +9,7 @@
 {% block navigation %}
     {{ block.super }}
 {% endblock %}
-{% block nav-timeline %}class="current"><a href="{% url timeline %}">Timeline</a>{% endblock %}
+{% block nav-timeline %}class="current"><a href="{% url "timeline" %}">Timeline</a>{% endblock %}
 
 {% block body %}
 <div id="sidebar">
@@ -102,7 +103,7 @@
 <script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.canvasTextRenderer.min.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}js/jqplot/jqplot.canvasAxisLabelRenderer.min.js"></script>
 <script type="text/javascript">
-  var CHANGES_URL = "{% url changes %}";
+  var CHANGES_URL = "{% url "changes" %}";
 </script>
 <script type="text/javascript" src="{{ STATIC_URL }}js/timeline.js"></script>
 <script type="text/javascript">

codespeed/tests/tests.py

@@ -26,23 +26,23 @@ def setUp(self):
         self.cdate = datetime(
             temp.year, temp.month, temp.day, temp.hour, temp.minute, temp.second)
         self.data = {
-                'commitid': '23',
-                'branch': 'default',
-                'project': 'MyProject',
-                'executable': 'myexe O3 64bits',
-                'benchmark': 'float',
-                'environment': 'Dual Core',
-                'result_value': 456,
+            'commitid': '23',
+            'branch': 'default',
+            'project': 'MyProject',
+            'executable': 'myexe O3 64bits',
+            'benchmark': 'float',
+            'environment': 'Dual Core',
+            'result_value': 456,
         }
 
     def test_add_correct_result(self):
         """Add correct result data"""
         response = self.client.post(self.path, self.data)
-        
+
         # Check that we get a success response
         self.assertEquals(response.status_code, 202)
         self.assertEquals(response.content, "Result data saved successfully")
-        
+
         # Check that the data was correctly saved
         e = Environment.objects.get(name='Dual Core')
         b = Benchmark.objects.get(name='float')
@@ -171,36 +171,36 @@ def setUp(self):
         temp = datetime.today()
         self.cdate = datetime(
             temp.year, temp.month, temp.day, temp.hour, temp.minute, temp.second)
-        
+
         self.data = [
             {'commitid': '123',
-            'project': 'pypy',
-            'branch': 'default',
-            'executable': 'pypy-c',
-            'benchmark': 'Richards',
-            'environment': 'bigdog',
-            'result_value': 456},
+             'project': 'pypy',
+             'branch': 'default',
+             'executable': 'pypy-c',
+             'benchmark': 'Richards',
+             'environment': 'bigdog',
+             'result_value': 456},
             {'commitid': '456',
-            'project': 'pypy',
-            'branch': 'default',
-            'executable': 'pypy-c',
-            'benchmark': 'Richards',
-            'environment': 'bigdog',
-            'result_value': 457},
+             'project': 'pypy',
+             'branch': 'default',
+             'executable': 'pypy-c',
+             'benchmark': 'Richards',
+             'environment': 'bigdog',
+             'result_value': 457},
             {'commitid': '456',
-            'project': 'pypy',
-            'branch': 'default',
-            'executable': 'pypy-c',
-            'benchmark': 'Richards2',
-            'environment': 'bigdog',
-            'result_value': 34},
+             'project': 'pypy',
+             'branch': 'default',
+             'executable': 'pypy-c',
+             'benchmark': 'Richards2',
+             'environment': 'bigdog',
+             'result_value': 34},
             {'commitid': '789',
-            'project': 'pypy',
-            'branch': 'default',
-            'executable': 'pypy-c',
-            'benchmark': 'Richards',
-            'environment': 'bigdog',
-            'result_value': 458},
+             'project': 'pypy',
+             'branch': 'default',
+             'executable': 'pypy-c',
+             'benchmark': 'Richards',
+             'environment': 'bigdog',
+             'result_value': 458},
         ]
 
     def test_add_correct_results(self):
@@ -390,7 +390,8 @@ class TestViewHelpers(TestCase):
 
     def setUp(self):
         self.project = Project.objects.create(name='Test')
-        self.executable = Executable.objects.create(name='TestExecutable', project=self.project)
+        self.executable = Executable.objects.create(
+            name='TestExecutable', project=self.project)
         self.branch = Branch.objects.create(name='master', project=self.project)
 
     def test_get_baseline_executables(self):
@@ -421,7 +422,8 @@ class ProjectTest(TestCase):
     """Test project model"""
 
     def setUp(self):
-        self.github_project = Project(repo_type='H', repo_path='https://github.com/tobami/codespeed.git')
+        self.github_project = Project(repo_type='H',
+                                      repo_path='https://github.com/tobami/codespeed.git')
         self.git_project = Project(repo_type='G', repo_path='/home/foo/codespeed')
 
     def test_repo_name(self):
@@ -435,7 +437,8 @@ def test_working_copy(self):
         """Test that only projects with local repositories have a working_copy attribute
         """
         self.assertEqual(self.git_project.working_copy,
-                         os.path.join(settings.REPOSITORY_BASE_PATH, self.git_project.repo_name))
+                         os.path.join(settings.REPOSITORY_BASE_PATH,
+                                      self.git_project.repo_name))
 
         self.assertRaises(
             AttributeError, getattr, self.github_project, 'working_copy')