{{ resource_doc }}
+
+{% include 'emitter.txt' %}
+
+
\ No newline at end of file
diff --git a/src/rest/templates/emitter.txt b/src/rest/templates/emitter.txt
new file mode 100644
index 00000000..3bf094c6
--- /dev/null
+++ b/src/rest/templates/emitter.txt
@@ -0,0 +1,4 @@
+{% autoescape off %}HTTP Status {{ status }}
+{% for key, val in headers.items %}{{ key }}: {{ val }}
+{% endfor %}
+{{ content }}{% endautoescape %}
\ No newline at end of file
diff --git a/src/rest/templates/emitter.xhtml b/src/rest/templates/emitter.xhtml
new file mode 100644
index 00000000..d9fb3ce9
--- /dev/null
+++ b/src/rest/templates/emitter.xhtml
@@ -0,0 +1,3 @@
+HTML:
+
+{{ content }}
\ No newline at end of file
diff --git a/src/settings.py b/src/settings.py
index 2a55c76a..fa3476db 100644
--- a/src/settings.py
+++ b/src/settings.py
@@ -75,7 +75,7 @@ MIDDLEWARE_CLASSES = (
'django.contrib.messages.middleware.MessageMiddleware',
)
-ROOT_URLCONF = 'src.urls'
+ROOT_URLCONF = 'urls'
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -93,5 +93,6 @@ INSTALLED_APPS = (
'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
- 'testarchive',
+ 'testapp',
+ 'rest',
)
diff --git a/src/testapp/__init__.py b/src/testapp/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/testapp/models.py b/src/testapp/models.py
new file mode 100644
index 00000000..71a83623
--- /dev/null
+++ b/src/testapp/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/src/testapp/tests.py b/src/testapp/tests.py
new file mode 100644
index 00000000..5543cd96
--- /dev/null
+++ b/src/testapp/tests.py
@@ -0,0 +1,54 @@
+"""
+This file demonstrates two different styles of tests (one doctest and one
+unittest). These will both pass when you run "manage.py test".
+
+Replace these with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+from django.core.urlresolvers import reverse
+from testapp.views import ReadOnlyResource, MirroringWriteResource
+
+class AcceptHeaderTests(TestCase):
+ def assert_accept_mimetype(self, mimetype, expect=None, expect_match=True):
+ """
+ Assert that a request with given mimetype in the accept header,
+ gives a response with the appropriate content-type.
+ """
+ if expect is None:
+ expect = mimetype
+
+ resp = self.client.get(reverse(ReadOnlyResource), HTTP_ACCEPT=mimetype)
+
+ if expect_match:
+ self.assertEquals(resp['content-type'], expect)
+ else:
+ self.assertNotEquals(resp['content-type'], expect)
+
+ def test_accept_xml(self):
+ self.assert_accept_mimetype('application/xml')
+
+ def test_accept_json(self):
+ self.assert_accept_mimetype('application/json')
+
+ def test_accept_xml_prefered_to_json(self):
+ self.assert_accept_mimetype('application/xml,q=0.9;application/json,q=0.1', expect='application/xml')
+
+ def test_accept_json_prefered_to_xml(self):
+ self.assert_accept_mimetype('application/json,q=0.9;application/xml,q=0.1', expect='application/json')
+
+ def test_dont_accept_invalid(self):
+ self.assert_accept_mimetype('application/invalid', expect_match=False)
+
+ def test_invalid_accept_header_returns_406(self):
+ resp = self.client.get(reverse(ReadOnlyResource), HTTP_ACCEPT='invalid/invalid')
+ self.assertEquals(resp.status_code, 406)
+
+class AllowedMethodsTests(TestCase):
+ def test_write_on_read_only_resource_returns_405(self):
+ resp = self.client.put(reverse(ReadOnlyResource), {})
+ self.assertEquals(resp.status_code, 405)
+
+ def test_read_on_write_only_resource_returns_405(self):
+ resp = self.client.get(reverse(MirroringWriteResource))
+ self.assertEquals(resp.status_code, 405)
diff --git a/src/testapp/urls.py b/src/testapp/urls.py
new file mode 100644
index 00000000..a41c156b
--- /dev/null
+++ b/src/testapp/urls.py
@@ -0,0 +1,8 @@
+from django.conf.urls.defaults import patterns
+from testapp.views import ReadOnlyResource, MirroringWriteResource
+
+
+urlpatterns = patterns('',
+ (r'^read-only$', ReadOnlyResource),
+ (r'^mirroring-write$', MirroringWriteResource),
+)
diff --git a/src/testapp/views.py b/src/testapp/views.py
new file mode 100644
index 00000000..f0174414
--- /dev/null
+++ b/src/testapp/views.py
@@ -0,0 +1,21 @@
+from decimal import Decimal
+from rest.resource import Resource
+
+class ReadOnlyResource(Resource):
+ """This is my docstring
+ """
+ allowed_methods = ('GET',)
+
+ def read(self, headers={}, *args, **kwargs):
+ return (200, {'ExampleString': 'Example',
+ 'ExampleInt': 1,
+ 'ExampleDecimal': 1.0}, {})
+
+
+class MirroringWriteResource(Resource):
+ """This is my docstring
+ """
+ allowed_methods = ('PUT',)
+
+ def create(self, data, headers={}, *args, **kwargs):
+ return (200, data, {})
diff --git a/src/testarchive/__init__.py b/src/testarchive/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/testarchive/models.py b/src/testarchive/models.py
deleted file mode 100644
index 71a83623..00000000
--- a/src/testarchive/models.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.
diff --git a/src/testarchive/templates/emitter.html b/src/testarchive/templates/emitter.html
deleted file mode 100644
index 4c843aa3..00000000
--- a/src/testarchive/templates/emitter.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- {{ resource_doc }}
-
-{% include 'emitter.txt' %}
-
-
\ No newline at end of file
diff --git a/src/testarchive/templates/emitter.txt b/src/testarchive/templates/emitter.txt
deleted file mode 100644
index 3bf094c6..00000000
--- a/src/testarchive/templates/emitter.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{% autoescape off %}HTTP Status {{ status }}
-{% for key, val in headers.items %}{{ key }}: {{ val }}
-{% endfor %}
-{{ content }}{% endautoescape %}
\ No newline at end of file
diff --git a/src/testarchive/templates/emitter.xhtml b/src/testarchive/templates/emitter.xhtml
deleted file mode 100644
index d9fb3ce9..00000000
--- a/src/testarchive/templates/emitter.xhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-HTML:
-
-{{ content }}
\ No newline at end of file
diff --git a/src/testarchive/tests.py b/src/testarchive/tests.py
deleted file mode 100644
index 2aaf1bab..00000000
--- a/src/testarchive/tests.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-This file demonstrates two different styles of tests (one doctest and one
-unittest). These will both pass when you run "manage.py test".
-
-Replace these with more appropriate tests for your application.
-"""
-
-from django.test import TestCase
-
-class SimpleTest(TestCase):
- def test_basic_addition(self):
- """
- Tests that 1 + 1 always equals 2.
- """
- self.failUnlessEqual(1 + 1, 3)
-
-__test__ = {"doctest": """
-Another way to test that 1 + 1 is equal to 2.
-
->>> 1 + 1 == 2
-True
-"""}
-
diff --git a/src/testarchive/urls.py b/src/testarchive/urls.py
deleted file mode 100644
index 81aa0fa8..00000000
--- a/src/testarchive/urls.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.conf.urls.defaults import patterns
-from testarchive.views import RootResource
-
-
-urlpatterns = patterns('',
- (r'^$', RootResource),
-)
diff --git a/src/testarchive/views.py b/src/testarchive/views.py
deleted file mode 100644
index a7812dc3..00000000
--- a/src/testarchive/views.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from rest.resource import Resource
-
-class RootResource(Resource):
- """This is my docstring
- """
-
- def handle_get(self, headers={}, *args, **kwargs):
- return (200, {'Name': 'Test', 'Value': 1}, {'Location': 'BLAH'})
diff --git a/src/urls.py b/src/urls.py
index f6c598ce..f95e9afa 100644
--- a/src/urls.py
+++ b/src/urls.py
@@ -5,7 +5,7 @@ admin.autodiscover()
urlpatterns = patterns('',
# Example:
- (r'^testarchive/', include('testarchive.urls')),
+ (r'^testapp/', include('testapp.urls')),
# Uncomment the admin/doc line below to enable admin documentation:
(r'^admin/doc/', include('django.contrib.admindocs.urls')),
--
cgit v1.2.3