Merge branch 'restframework2' of git://github.com/tomchristie/django-rest-framework into improved-view-decorators

* 'restframework2' of git://github.com/tomchristie/django-rest-framework: (56 commits)
  Bits of cleanup
  Add request.QUERY_PARAMS
  Add readonly 'id' field
  Tweak browseable API
  Don't display readonly fields
  Fix some bits of serialization
  Add csrf note
  Fix incorrect bit of tutorial
  Added tox.ini
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Clean up bits of templates etc
  Hack out bunch of unneccesary private methods on View class
  Clean up template tags
  Remove dumbass __all__ variables
  Remove old 'djangorestframework directories
  Change package name: djangorestframework -> rest_framework
  Dont strip final '/'
  Use get_script_prefix to play nicely if not installed at the root.
  ...

Conflicts:
	rest_framework/decorators.py

1 files changed, 87 insertions, 0 deletions

diff --git a/rest_framework/resources.py b/rest_framework/resources.py
new file mode 100644
index 00000000..41b7c1c6
--- /dev/null
+++ b/rest_framework/resources.py
@@ -0,0 +1,87 @@
+from functools import update_wrapper
+import inspect
+from django.utils.decorators import classonlymethod
+from djanorestframework import views, generics
+
+
+def wrapped(source, dest):
+    """
+    Copy public, non-method attributes from source to dest, and return dest.
+    """
+    for attr in [attr for attr in dir(source)
+                 if not attr.startswith('_') and not inspect.ismethod(attr)]:
+        setattr(dest, attr, getattr(source, attr))
+    return dest
+
+
+class ResourceMixin(object):
+    """
+    Clone Django's `View.as_view()` behaviour *except* using REST framework's
+    'method -> action' binding for resources.
+    """
+
+    @classonlymethod
+    def as_view(cls, actions, **initkwargs):
+        """
+        Main entry point for a request-response process.
+        """
+        # sanitize keyword arguments
+        for key in initkwargs:
+            if key in cls.http_method_names:
+                raise TypeError("You tried to pass in the %s method name as a "
+                                "keyword argument to %s(). Don't do that."
+                                % (key, cls.__name__))
+            if not hasattr(cls, key):
+                raise TypeError("%s() received an invalid keyword %r" % (
+                    cls.__name__, key))
+
+        def view(request, *args, **kwargs):
+            self = cls(**initkwargs)
+
+            # Bind methods to actions
+            for method, action in actions.items():
+                handler = getattr(self, action)
+                setattr(self, method, handler)
+
+            # As you were, solider.
+            if hasattr(self, 'get') and not hasattr(self, 'head'):
+                self.head = self.get
+            return self.dispatch(request, *args, **kwargs)
+
+        # take name and docstring from class
+        update_wrapper(view, cls, updated=())
+
+        # and possible attributes set by decorators
+        # like csrf_exempt from dispatch
+        update_wrapper(view, cls.dispatch, assigned=())
+        return view
+
+
+class Resource(ResourceMixin, views.APIView):
+    pass
+
+
+class ModelResource(ResourceMixin, views.APIView):
+    root_class = generics.RootAPIView
+    detail_class = generics.InstanceAPIView
+
+    def root_view(self):
+        return wrapped(self, self.root_class())
+
+    def detail_view(self):
+        return wrapped(self, self.detail_class())
+
+    def list(self, request, *args, **kwargs):
+        return self.root_view().list(request, args, kwargs)
+
+    def create(self, request, *args, **kwargs):
+        return self.root_view().create(request, args, kwargs)
+
+    def retrieve(self, request, *args, **kwargs):
+        return self.detail_view().retrieve(request, args, kwargs)
+
+    def update(self, request, *args, **kwargs):
+        return self.detail_view().update(request, args, kwargs)
+
+    def destroy(self, request, *args, **kwargs):
+        return self.detail_view().destroy(request, args, kwargs)