From 2cdff1b01e3aca6c56cef433e786e3ae75362739 Mon Sep 17 00:00:00 2001 From: Sébastien Piquemal Date: Tue, 7 Feb 2012 16:52:15 +0200 Subject: modified examples, somethin' still broken, can't find what --- examples/permissionsexample/views.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'examples/permissionsexample') diff --git a/examples/permissionsexample/views.py b/examples/permissionsexample/views.py index 86f458f8..bcf6619c 100644 --- a/examples/permissionsexample/views.py +++ b/examples/permissionsexample/views.py @@ -1,4 +1,5 @@ from djangorestframework.views import View +from djangorestframework.response import Response from djangorestframework.permissions import PerUserThrottling, IsAuthenticated from django.core.urlresolvers import reverse @@ -9,7 +10,7 @@ class PermissionsExampleView(View): """ def get(self, request): - return [ + return Response([ { 'name': 'Throttling Example', 'url': reverse('throttled-resource') @@ -18,7 +19,7 @@ class PermissionsExampleView(View): 'name': 'Logged in example', 'url': reverse('loggedin-resource') }, - ] + ]) class ThrottlingExampleView(View): @@ -36,7 +37,7 @@ class ThrottlingExampleView(View): """ Handle GET requests. """ - return "Successful response to GET request because throttle is not yet active." + return Response("Successful response to GET request because throttle is not yet active.") class LoggedInExampleView(View): @@ -49,4 +50,4 @@ class LoggedInExampleView(View): permissions = (IsAuthenticated, ) def get(self, request): - return 'You have permission to view this resource' + return Response('You have permission to view this resource') -- cgit v1.2.3 From af9e4f69d732cc643d6ec7ae13d4a19ac0332d44 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 21 Feb 2012 20:12:14 +0000 Subject: Merging master into develop --- examples/permissionsexample/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/permissionsexample') diff --git a/examples/permissionsexample/views.py b/examples/permissionsexample/views.py index bcf6619c..0bc31b27 100644 --- a/examples/permissionsexample/views.py +++ b/examples/permissionsexample/views.py @@ -1,7 +1,7 @@ from djangorestframework.views import View from djangorestframework.response import Response from djangorestframework.permissions import PerUserThrottling, IsAuthenticated -from django.core.urlresolvers import reverse +from djangorestframework.utils import reverse class PermissionsExampleView(View): @@ -13,11 +13,11 @@ class PermissionsExampleView(View): return Response([ { 'name': 'Throttling Example', - 'url': reverse('throttled-resource') + 'url': reverse('throttled-resource', request) }, { 'name': 'Logged in example', - 'url': reverse('loggedin-resource') + 'url': reverse('loggedin-resource', request) }, ]) -- cgit v1.2.3 From 5fd4c639d7c64572dd07dc31dcd627bed9469b05 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 21 Feb 2012 20:57:36 +0000 Subject: Merge master into develop --- examples/permissionsexample/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/permissionsexample') diff --git a/examples/permissionsexample/views.py b/examples/permissionsexample/views.py index 0bc31b27..13384c9f 100644 --- a/examples/permissionsexample/views.py +++ b/examples/permissionsexample/views.py @@ -1,7 +1,7 @@ from djangorestframework.views import View from djangorestframework.response import Response from djangorestframework.permissions import PerUserThrottling, IsAuthenticated -from djangorestframework.utils import reverse +from djangorestframework.reverse import reverse class PermissionsExampleView(View): -- cgit v1.2.3 From 023c008939c81ba8c33b4344b2c7756687e3be0b Mon Sep 17 00:00:00 2001 From: Sébastien Piquemal Date: Thu, 23 Feb 2012 23:19:51 +0200 Subject: fixed permissions examples + sanity test --- examples/permissionsexample/tests.py | 27 +++++++++++++++++++++++++++ examples/permissionsexample/views.py | 4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 examples/permissionsexample/tests.py (limited to 'examples/permissionsexample') diff --git a/examples/permissionsexample/tests.py b/examples/permissionsexample/tests.py new file mode 100644 index 00000000..5434437a --- /dev/null +++ b/examples/permissionsexample/tests.py @@ -0,0 +1,27 @@ +from django.test import TestCase +from django.core.urlresolvers import reverse +from django.test.client import Client + + +class NaviguatePermissionsExamples(TestCase): + """ + Sanity checks for permissions examples + """ + + def test_throttled_resource(self): + url = reverse('throttled-resource') + for i in range(0, 10): + response = self.client.get(url) + self.assertEqual(response.status_code, 200) + response = self.client.get(url) + self.assertEqual(response.status_code, 503) + + + def test_loggedin_resource(self): + url = reverse('loggedin-resource') + response = self.client.get(url) + self.assertEqual(response.status_code, 403) + loggedin_client = Client() + loggedin_client.login(username='test', password='test') + response = loggedin_client.get(url) + self.assertEqual(response.status_code, 200) diff --git a/examples/permissionsexample/views.py b/examples/permissionsexample/views.py index 13384c9f..f3dafcd4 100644 --- a/examples/permissionsexample/views.py +++ b/examples/permissionsexample/views.py @@ -30,7 +30,7 @@ class ThrottlingExampleView(View): throttle will be applied until 60 seconds have passed since the first request. """ - permissions = (PerUserThrottling,) + permissions_classes = (PerUserThrottling,) throttle = '10/min' def get(self, request): @@ -47,7 +47,7 @@ class LoggedInExampleView(View): `curl -X GET -H 'Accept: application/json' -u test:test http://localhost:8000/permissions-example` """ - permissions = (IsAuthenticated, ) + permissions_classes = (IsAuthenticated, ) def get(self, request): return Response('You have permission to view this resource') -- cgit v1.2.3 From eea2aa04378d27d79e7aba12ce95c697148bd57e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 29 Aug 2012 19:54:38 +0100 Subject: Remove examples (to be moved to a seperate project) --- examples/permissionsexample/__init__.py | 0 .../permissionsexample/fixtures/initial_data.json | 18 -------- examples/permissionsexample/models.py | 1 - examples/permissionsexample/tests.py | 27 ----------- examples/permissionsexample/urls.py | 8 ---- examples/permissionsexample/views.py | 53 ---------------------- 6 files changed, 107 deletions(-) delete mode 100644 examples/permissionsexample/__init__.py delete mode 100644 examples/permissionsexample/fixtures/initial_data.json delete mode 100644 examples/permissionsexample/models.py delete mode 100644 examples/permissionsexample/tests.py delete mode 100644 examples/permissionsexample/urls.py delete mode 100644 examples/permissionsexample/views.py (limited to 'examples/permissionsexample') diff --git a/examples/permissionsexample/__init__.py b/examples/permissionsexample/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/examples/permissionsexample/fixtures/initial_data.json b/examples/permissionsexample/fixtures/initial_data.json deleted file mode 100644 index 153de8e8..00000000 --- a/examples/permissionsexample/fixtures/initial_data.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "pk": 2, - "model": "auth.user", - "fields": { - "username": "test", - "first_name": "", - "last_name": "", - "is_active": true, - "is_superuser": false, - "is_staff": false, - "groups": [], - "user_permissions": [], - "password": "sha1$b3dff$671b4ab97f2714446da32670d27576614e176758", - "email": "" - } - } -] diff --git a/examples/permissionsexample/models.py b/examples/permissionsexample/models.py deleted file mode 100644 index 790bbaf8..00000000 --- a/examples/permissionsexample/models.py +++ /dev/null @@ -1 +0,0 @@ -#for fixture loading diff --git a/examples/permissionsexample/tests.py b/examples/permissionsexample/tests.py deleted file mode 100644 index 5434437a..00000000 --- a/examples/permissionsexample/tests.py +++ /dev/null @@ -1,27 +0,0 @@ -from django.test import TestCase -from django.core.urlresolvers import reverse -from django.test.client import Client - - -class NaviguatePermissionsExamples(TestCase): - """ - Sanity checks for permissions examples - """ - - def test_throttled_resource(self): - url = reverse('throttled-resource') - for i in range(0, 10): - response = self.client.get(url) - self.assertEqual(response.status_code, 200) - response = self.client.get(url) - self.assertEqual(response.status_code, 503) - - - def test_loggedin_resource(self): - url = reverse('loggedin-resource') - response = self.client.get(url) - self.assertEqual(response.status_code, 403) - loggedin_client = Client() - loggedin_client.login(username='test', password='test') - response = loggedin_client.get(url) - self.assertEqual(response.status_code, 200) diff --git a/examples/permissionsexample/urls.py b/examples/permissionsexample/urls.py deleted file mode 100644 index 33cb9b5f..00000000 --- a/examples/permissionsexample/urls.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.conf.urls.defaults import patterns, url -from permissionsexample.views import PermissionsExampleView, ThrottlingExampleView, LoggedInExampleView - -urlpatterns = patterns('', - url(r'^$', PermissionsExampleView.as_view(), name='permissions-example'), - url(r'^throttling$', ThrottlingExampleView.as_view(), name='throttled-resource'), - url(r'^loggedin$', LoggedInExampleView.as_view(), name='loggedin-resource'), -) diff --git a/examples/permissionsexample/views.py b/examples/permissionsexample/views.py deleted file mode 100644 index f3dafcd4..00000000 --- a/examples/permissionsexample/views.py +++ /dev/null @@ -1,53 +0,0 @@ -from djangorestframework.views import View -from djangorestframework.response import Response -from djangorestframework.permissions import PerUserThrottling, IsAuthenticated -from djangorestframework.reverse import reverse - - -class PermissionsExampleView(View): - """ - A container view for permissions examples. - """ - - def get(self, request): - return Response([ - { - 'name': 'Throttling Example', - 'url': reverse('throttled-resource', request) - }, - { - 'name': 'Logged in example', - 'url': reverse('loggedin-resource', request) - }, - ]) - - -class ThrottlingExampleView(View): - """ - A basic read-only View that has a **per-user throttle** of 10 requests per minute. - - If a user exceeds the 10 requests limit within a period of one minute, the - throttle will be applied until 60 seconds have passed since the first request. - """ - - permissions_classes = (PerUserThrottling,) - throttle = '10/min' - - def get(self, request): - """ - Handle GET requests. - """ - return Response("Successful response to GET request because throttle is not yet active.") - - -class LoggedInExampleView(View): - """ - You can login with **'test', 'test'.** or use curl: - - `curl -X GET -H 'Accept: application/json' -u test:test http://localhost:8000/permissions-example` - """ - - permissions_classes = (IsAuthenticated, ) - - def get(self, request): - return Response('You have permission to view this resource') -- cgit v1.2.3