From ddd36206bc7a403b2ba43de7b4c43d5bf6466399 Mon Sep 17 00:00:00 2001
From: markotibold <none@none>
Date: Sat, 25 Jun 2011 13:08:46 +0200
Subject: [PATCH 1/9] Added a fixture so that the users default have a user to
 login with and play with permissions.

---
 .../permissionsexample/fixtures/initial_data.yaml    | 12 ++++++++++++
 examples/permissionsexample/models.py                |  1 +
 examples/permissionsexample/urls.py                  |  2 +-
 examples/requirements.txt                            |  1 +
 examples/settings.py                                 |  7 +++++++
 5 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 examples/permissionsexample/fixtures/initial_data.yaml
 create mode 100644 examples/permissionsexample/models.py

diff --git a/examples/permissionsexample/fixtures/initial_data.yaml b/examples/permissionsexample/fixtures/initial_data.yaml
new file mode 100644
index 000000000..22276ec2b
--- /dev/null
+++ b/examples/permissionsexample/fixtures/initial_data.yaml
@@ -0,0 +1,12 @@
+- fields:
+    first_name: ''
+    groups: []
+    is_active: true
+    is_staff: true
+    is_superuser: true
+    last_name: ''
+    password: sha1$b3dff$671b4ab97f2714446da32670d27576614e176758
+    user_permissions: []
+    username: test
+  model: auth.user
+  pk: 2
diff --git a/examples/permissionsexample/models.py b/examples/permissionsexample/models.py
new file mode 100644
index 000000000..232085ad3
--- /dev/null
+++ b/examples/permissionsexample/models.py
@@ -0,0 +1 @@
+#for fixture loading
\ No newline at end of file
diff --git a/examples/permissionsexample/urls.py b/examples/permissionsexample/urls.py
index d17f5159a..e3b0ffbd1 100644
--- a/examples/permissionsexample/urls.py
+++ b/examples/permissionsexample/urls.py
@@ -2,5 +2,5 @@ from django.conf.urls.defaults import patterns, url
 from permissionsexample.views import ThrottlingExampleView
 
 urlpatterns = patterns('',
-    url(r'^$',                 ThrottlingExampleView.as_view(), name='throttled-resource'),
+    url(r'^$', ThrottlingExampleView.as_view(), name='throttled-resource'),
 )
diff --git a/examples/requirements.txt b/examples/requirements.txt
index 09cda9451..19d37673e 100644
--- a/examples/requirements.txt
+++ b/examples/requirements.txt
@@ -5,4 +5,5 @@ wsgiref==0.1.2
 Pygments==1.4
 httplib2==0.6.0
 Markdown==2.0.3
+Pyyaml
 
diff --git a/examples/settings.py b/examples/settings.py
index 1537c5f8e..2eab2cfa0 100644
--- a/examples/settings.py
+++ b/examples/settings.py
@@ -89,6 +89,12 @@ TEMPLATE_DIRS = (
     # Don't forget to use absolute paths, not relative paths.
 )
 
+# for loading initial data
+##SERIALIZATION_MODULES = { 
+  #  'yml': "django.core.serializers.pyyaml"
+
+#} 
+
 
 INSTALLED_APPS = (
     'django.contrib.auth',
@@ -104,6 +110,7 @@ INSTALLED_APPS = (
     'objectstore',
     'pygments_api',
     'blogpost',
+    'permissionsexample',
 )
 
 import os

From bae21b14c93e458014107a007e894e93a181bd0e Mon Sep 17 00:00:00 2001
From: markotibold <none@none>
Date: Sat, 25 Jun 2011 16:38:16 +0200
Subject: [PATCH 2/9] added a container view for the permissions example

---
 examples/permissionsexample/urls.py  |  6 ++++--
 examples/permissionsexample/views.py | 20 ++++++++++++++++++--
 examples/sandbox/views.py            |  3 ++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/examples/permissionsexample/urls.py b/examples/permissionsexample/urls.py
index e3b0ffbd1..c421c7cca 100644
--- a/examples/permissionsexample/urls.py
+++ b/examples/permissionsexample/urls.py
@@ -1,6 +1,8 @@
 from django.conf.urls.defaults import patterns, url
-from permissionsexample.views import ThrottlingExampleView
+from permissionsexample.views import PermissionsExampleView, ThrottlingExampleView, LoggedinView
 
 urlpatterns = patterns('',
-    url(r'^$', ThrottlingExampleView.as_view(), name='throttled-resource'),
+    url(r'^$', PermissionsExampleView.as_view(), name='permissions-example'),
+    url(r'^throttling$', ThrottlingExampleView.as_view(), name='throttled-resource'),
+    url(r'^loggedin$', LoggedinView.as_view(), name='loggedin-resource'),
 )
diff --git a/examples/permissionsexample/views.py b/examples/permissionsexample/views.py
index 20e7cba7a..ca4561912 100644
--- a/examples/permissionsexample/views.py
+++ b/examples/permissionsexample/views.py
@@ -1,6 +1,16 @@
 from djangorestframework.views import View
-from djangorestframework.permissions import PerUserThrottling
+from djangorestframework.permissions import PerUserThrottling, IsAuthenticated
+from django.core.urlresolvers import reverse
 
+class PermissionsExampleView(View):
+    """
+    A container view for permissions examples.
+    """
+    
+    def get(self, request):
+        return [{'name': 'Throttling Example', 'url': reverse('throttled-resource')},
+                {'name': 'Logged in example', 'url': reverse('loggedin-resource')},]
+        
 
 class ThrottlingExampleView(View):
     """
@@ -17,4 +27,10 @@ class ThrottlingExampleView(View):
         """
         Handle GET requests.
         """
-        return "Successful response to GET request because throttle is not yet active."
\ No newline at end of file
+        return "Successful response to GET request because throttle is not yet active."
+    
+class LoggedinView(View):
+    
+    permissions = (IsAuthenticated, )
+    def get(self, request):
+        return 'Logged in or not?'
\ No newline at end of file
diff --git a/examples/sandbox/views.py b/examples/sandbox/views.py
index 1e326f432..f8d87a0bc 100644
--- a/examples/sandbox/views.py
+++ b/examples/sandbox/views.py
@@ -22,6 +22,7 @@ class Sandbox(View):
     4. A generic object store API.
     5. A code highlighting API.
     6. A blog posts and comments API.
+    7. A basic example using permissions. You can login with **'test', 'test'.** 
 
     Please feel free to browse, create, edit and delete the resources in these examples."""
 
@@ -32,5 +33,5 @@ class Sandbox(View):
                 {'name': 'Object store API', 'url': reverse('object-store-root')},
                 {'name': 'Code highlighting API', 'url': reverse('pygments-root')},
                 {'name': 'Blog posts API', 'url': reverse('blog-posts-root')},
-                {'name': 'Permissions example', 'url': reverse('throttled-resource')}
+                {'name': 'Permissions example', 'url': reverse('permissions-example')}
                 ]

From 43c63c60ce8e89dbdb8e102f1c7ce1cd11fa8808 Mon Sep 17 00:00:00 2001
From: markotibold <none@none>
Date: Sat, 25 Jun 2011 23:07:06 +0200
Subject: [PATCH 3/9] Smaller version in the header

---
 djangorestframework/templates/renderer.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/djangorestframework/templates/renderer.html b/djangorestframework/templates/renderer.html
index 97d3837a3..507b5c251 100644
--- a/djangorestframework/templates/renderer.html
+++ b/djangorestframework/templates/renderer.html
@@ -8,6 +8,8 @@
        #site-name a {color: #F4F379 !important;}
        .errorlist {display: inline !important}
        .errorlist li {display: inline !important; background: white !important; color: black !important; border: 0 !important;}
+	   /* Custom styles */
+	   .version{font-size:8px;}
      </style>
      <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/base.css'/>
      <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/forms.css'/>
@@ -18,7 +20,7 @@
   
 	<div id="header">
 		<div id="branding">
-		  <h1 id="site-name"><a href='http://django-rest-framework.org'>Django REST framework</a> <small>{{ version }}</small></h1>
+		  <h1 id="site-name"><a href='http://django-rest-framework.org'>Django REST framework</a> <span class="version"> v {{ version }}</span></h1>
 		</div>
 		<div id="user-tools">
 		  {% if user.is_active %}Welcome, {{ user }}.{% if logout_url %} <a href='{{ logout_url }}'>Log out</a>{% endif %}{% else %}Anonymous {% if login_url %}<a href='{{ login_url }}'>Log in</a>{% endif %}{% endif %}

From 0b18b58c170aae0c2a93a608997e557fdcefe826 Mon Sep 17 00:00:00 2001
From: markotibold <none@none>
Date: Sun, 26 Jun 2011 01:32:27 +0200
Subject: [PATCH 4/9] On 403's no forms will be displayed anymore

---
 djangorestframework/templates/renderer.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/djangorestframework/templates/renderer.html b/djangorestframework/templates/renderer.html
index 507b5c251..44e032aa7 100644
--- a/djangorestframework/templates/renderer.html
+++ b/djangorestframework/templates/renderer.html
@@ -60,8 +60,8 @@
 			</form>
 	{% endif %}
 	
-	{# Only display the POST/PUT/DELETE forms if method tunneling via POST forms is enabled. #}	
-	{% if METHOD_PARAM %}
+	{# Only display the POST/PUT/DELETE forms if method tunneling via POST forms is enabled and the user has permissions on this view. #}	
+	{% if METHOD_PARAM and response.status != 403 %}
 
 		{% if 'POST' in view.allowed_methods %}
 				<form action="{{ request.get_full_path }}" method="post" {% if post_form.is_multipart %}enctype="multipart/form-data"{% endif %}>

From 7f536c1db3950bff2486fd243748f833565c9155 Mon Sep 17 00:00:00 2001
From: markotibold <none@none>
Date: Sun, 26 Jun 2011 01:34:52 +0200
Subject: [PATCH 5/9] Very basic YAML support. Probably needs some tweaking,
 and definitely needs tests.

---
 djangorestframework/parsers.py   | 23 +++++++++++++++++++++++
 djangorestframework/renderers.py | 25 ++++++++++++++++++++-----
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/djangorestframework/parsers.py b/djangorestframework/parsers.py
index 3346a26e2..a25ca89e3 100644
--- a/djangorestframework/parsers.py
+++ b/djangorestframework/parsers.py
@@ -18,12 +18,15 @@ from djangorestframework import status
 from djangorestframework.response import ErrorResponse
 from djangorestframework.utils.mediatypes import media_type_matches
 
+import yaml
+
 __all__ = (
     'BaseParser',
     'JSONParser',
     'PlainTextParser',
     'FormParser',
     'MultiPartParser',
+    'YAMLParser',
 )
 
 
@@ -84,6 +87,26 @@ class JSONParser(BaseParser):
                                 {'detail': 'JSON parse error - %s' % unicode(exc)})
 
 
+class YAMLParser(BaseParser):
+    """
+    Parses YAML-serialized data.
+    """
+
+    media_type = 'application/yaml'
+
+    def parse(self, stream):
+        """
+        Returns a 2-tuple of `(data, files)`.
+
+        `data` will be an object which is the parsed content of the response.
+        `files` will always be `None`.
+        """
+        try:
+            return (yaml.safe_load(stream), None)
+        except ValueError, exc:
+            raise ErrorResponse(status.HTTP_400_BAD_REQUEST,
+                                {'detail': 'YAML parse error - %s' % unicode(exc)})
+
 
 class PlainTextParser(BaseParser):
     """
diff --git a/djangorestframework/renderers.py b/djangorestframework/renderers.py
index 13cd52f5c..18ffbf661 100644
--- a/djangorestframework/renderers.py
+++ b/djangorestframework/renderers.py
@@ -11,7 +11,7 @@ from django.core.serializers.json import DateTimeAwareJSONEncoder
 from django.template import RequestContext, loader
 from django.utils import simplejson as json
 
-from djangorestframework import status
+
 from djangorestframework.compat import apply_markdown
 from djangorestframework.utils import dict2xml, url_resolves
 from djangorestframework.utils.breadcrumbs import get_breadcrumbs
@@ -19,10 +19,9 @@ from djangorestframework.utils.description import get_name, get_description
 from djangorestframework.utils.mediatypes import get_media_type_params, add_media_type_param, media_type_matches
 from djangorestframework import VERSION
 
-from decimal import Decimal
-import re
 import string
 from urllib import quote_plus
+import yaml
 
 __all__ = (
     'BaseRenderer',
@@ -31,7 +30,8 @@ __all__ = (
     'DocumentingHTMLRenderer',
     'DocumentingXHTMLRenderer',
     'DocumentingPlainTextRenderer',
-    'XMLRenderer'
+    'XMLRenderer',
+    'YAMLRenderer'
 )
 
 
@@ -120,6 +120,20 @@ class XMLRenderer(BaseRenderer):
             return ''
         return dict2xml(obj)
 
+class YAMLRenderer(BaseRenderer):
+    """
+    Renderer which serializes to YAML.
+    """
+
+    media_type = 'application/yaml'
+
+    def render(self, obj=None, media_type=None):
+        """
+        Renders *obj* into serialized YAML.
+        """
+        if obj is None:
+            return ''
+        return yaml.dump(obj)
 
 class TemplateRenderer(BaseRenderer):
     """
@@ -346,6 +360,7 @@ DEFAULT_RENDERERS = ( JSONRenderer,
                       DocumentingHTMLRenderer,
                       DocumentingXHTMLRenderer,
                       DocumentingPlainTextRenderer,
-                      XMLRenderer )
+                      XMLRenderer,
+                      YAMLRenderer )
 
 

From 9be3d38aa02ff2a64adc9cab60db05f37cbfe476 Mon Sep 17 00:00:00 2001
From: markotibold <none@none>
Date: Sun, 26 Jun 2011 01:35:38 +0200
Subject: [PATCH 6/9] Very basic YAML support. Probably needs some tweaking,
 and definitely needs tests.

---
 djangorestframework/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/djangorestframework/views.py b/djangorestframework/views.py
index 18d064e10..757d89db4 100644
--- a/djangorestframework/views.py
+++ b/djangorestframework/views.py
@@ -44,7 +44,8 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView):
                   renderers.DocumentingHTMLRenderer,
                   renderers.DocumentingXHTMLRenderer,
                   renderers.DocumentingPlainTextRenderer,
-                  renderers.XMLRenderer )
+                  renderers.XMLRenderer,
+                  renderers.YAMLRenderer )
     
     """
     List of parsers the resource can parse the request with.

From 8cab127c2a99ab027e981f3e9198b7c548f0aa46 Mon Sep 17 00:00:00 2001
From: markotibold <none@none>
Date: Sun, 26 Jun 2011 01:38:56 +0200
Subject: [PATCH 7/9] some restyling and updated requirements.txt for yaml
 support

---
 examples/permissionsexample/urls.py  | 4 ++--
 examples/permissionsexample/views.py | 6 ++++--
 examples/sandbox/views.py            | 2 +-
 requirements.txt                     | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/examples/permissionsexample/urls.py b/examples/permissionsexample/urls.py
index c421c7cca..33cb9b5f1 100644
--- a/examples/permissionsexample/urls.py
+++ b/examples/permissionsexample/urls.py
@@ -1,8 +1,8 @@
 from django.conf.urls.defaults import patterns, url
-from permissionsexample.views import PermissionsExampleView, ThrottlingExampleView, LoggedinView
+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$', LoggedinView.as_view(), name='loggedin-resource'),
+    url(r'^loggedin$', LoggedInExampleView.as_view(), name='loggedin-resource'),
 )
diff --git a/examples/permissionsexample/views.py b/examples/permissionsexample/views.py
index ca4561912..f95c2c842 100644
--- a/examples/permissionsexample/views.py
+++ b/examples/permissionsexample/views.py
@@ -29,8 +29,10 @@ class ThrottlingExampleView(View):
         """
         return "Successful response to GET request because throttle is not yet active."
     
-class LoggedinView(View):
-    
+class LoggedInExampleView(View):
+    """
+    You can login with **'test', 'test'.** 
+    """
     permissions = (IsAuthenticated, )
     def get(self, request):
         return 'Logged in or not?'
\ No newline at end of file
diff --git a/examples/sandbox/views.py b/examples/sandbox/views.py
index f8d87a0bc..29f2e3ce6 100644
--- a/examples/sandbox/views.py
+++ b/examples/sandbox/views.py
@@ -22,7 +22,7 @@ class Sandbox(View):
     4. A generic object store API.
     5. A code highlighting API.
     6. A blog posts and comments API.
-    7. A basic example using permissions. You can login with **'test', 'test'.** 
+    7. A basic example using permissions.
 
     Please feel free to browse, create, edit and delete the resources in these examples."""
 
diff --git a/requirements.txt b/requirements.txt
index 7ae0ee451..7d5e66828 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,4 @@
 Django==1.2.4
 wsgiref==0.1.2
 coverage==3.4
-
+yaml==3.10

From d417a1a20abdb4d4c96cf3318ea1b0d5806f803a Mon Sep 17 00:00:00 2001
From: markotibold <none@none>
Date: Sun, 26 Jun 2011 01:41:15 +0200
Subject: [PATCH 8/9] moved from examples/requirements.txt to main
 requirements.txt

---
 examples/requirements.txt | 2 +-
 requirements.txt          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/requirements.txt b/examples/requirements.txt
index 19d37673e..bfaf11d54 100644
--- a/examples/requirements.txt
+++ b/examples/requirements.txt
@@ -5,5 +5,5 @@ wsgiref==0.1.2
 Pygments==1.4
 httplib2==0.6.0
 Markdown==2.0.3
-Pyyaml
+
 
diff --git a/requirements.txt b/requirements.txt
index 7d5e66828..9e2e9ae4d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,4 @@
 Django==1.2.4
 wsgiref==0.1.2
 coverage==3.4
-yaml==3.10
+PyYaml==3.10

From f67c0651baf1cea65221b4fb7f4df11a54abed90 Mon Sep 17 00:00:00 2001
From: markotibold <none@none>
Date: Sun, 26 Jun 2011 02:58:42 +0200
Subject: [PATCH 9/9] syncing dependencies.

---
 requirements.txt |  2 +-
 tox.ini          | 32 ++++++++++++++++++++++----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 9e2e9ae4d..c596890da 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,4 @@
 Django==1.2.4
 wsgiref==0.1.2
 coverage==3.4
-PyYaml==3.10
+Pyyaml==3.10
diff --git a/tox.ini b/tox.ini
index 47bb3880b..5a9065334 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,6 +29,7 @@ deps=
     django==1.2.4
     coverage==3.4
     unittest-xml-reporting==1.2
+    Pyyaml==3.10
 
 [testenv:py26-django12]
 basepython=python2.6
@@ -36,6 +37,7 @@ deps=
     django==1.2.4
     coverage==3.4
     unittest-xml-reporting==1.2
+	Pyyaml==3.10
 
 [testenv:py27-django12]
 basepython=python2.7
@@ -43,28 +45,32 @@ deps=
     django==1.2.4
     coverage==3.4
     unittest-xml-reporting==1.2
-
+	Pyyaml==3.10
+	
 [testenv:py25-django13]
 basepython=python2.5
 deps=
     django==1.3
     coverage==3.4
     unittest-xml-reporting==1.2
-
+	Pyyaml==3.10
+	
 [testenv:py26-django13]
 basepython=python2.6
 deps=
     django==1.3
     coverage==3.4
 	unittest-xml-reporting==1.2
-
+	Pyyaml==3.10
+	
 [testenv:py27-django13]
 basepython=python2.7
 deps=
     django==1.3
     coverage==3.4
 	unittest-xml-reporting==1.2
-
+	Pyyaml==3.10
+	
 ####################################### EXAMPLES ################################################
     
 [testenv:py25-django12e]
@@ -79,7 +85,8 @@ deps=
 	httplib2==0.6.0
 	Markdown==2.0.3
     unittest-xml-reporting==1.2
-
+	Pyyaml==3.10
+	
 [testenv:py26-django12e]
 basepython=python2.6
 commands=
@@ -92,7 +99,8 @@ deps=
 	httplib2==0.6.0
 	Markdown==2.0.3
     unittest-xml-reporting==1.2
-
+	Pyyaml==3.10
+	
 [testenv:py27-django12e]
 basepython=python2.7
 commands=
@@ -105,7 +113,8 @@ deps=
 	httplib2==0.6.0
 	Markdown==2.0.3
     unittest-xml-reporting==1.2
-
+	Pyyaml==3.10
+	
 [testenv:py25-django13e]
 basepython=python2.5
 commands=
@@ -118,7 +127,8 @@ deps=
 	httplib2==0.6.0
 	Markdown==2.0.3
     unittest-xml-reporting==1.2
-
+	Pyyaml==3.10
+	
 [testenv:py26-django13e]
 basepython=python2.6
 commands=
@@ -131,7 +141,8 @@ deps=
 	httplib2==0.6.0
 	Markdown==2.0.3
 	unittest-xml-reporting==1.2
-
+	Pyyaml==3.10
+	
 [testenv:py27-django13e]
 basepython=python2.7
 commands=
@@ -143,4 +154,5 @@ deps=
 	Pygments==1.4
 	httplib2==0.6.0
 	Markdown==2.0.3
-	unittest-xml-reporting==1.2
\ No newline at end of file
+	unittest-xml-reporting==1.2
+	Pyyaml==3.10
\ No newline at end of file