Merge pull request #28 from miki725/cookiecutter

Restructure

.travis.yml

@@ -1,5 +1,12 @@
 language: python
+
 python:
-  - 2.7
-install: pip install -q --use-mirrors tox
-script: tox
+  - "3.4"
+  - "2.7"
+  - "pypy"
+
+# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
+install: pip install -r requirements-dev.txt
+
+# command to run tests, e.g. python setup.py test
+script: make check

AUTHORS.rst

@@ -0,0 +1,18 @@
+Credits
+-------
+
+Development Lead
+~~~~~~~~~~~~~~~~
+
+* Miroslav Shubernetskiy - https://github.com/miki725
+
+Contributors
+~~~~~~~~~~~~
+
+* Arien Tolner - https://github.com/Bounder
+* Davide Mendolia - https://github.com/davideme
+* Kevin Brown - https://github.com/kevin-brown
+* Martin Cavoj - https://github.com/macav
+* Mjumbe Poe - https://github.com/mjumbewu
+* Thomas Wajs - https://github.com/thomasWajs
+* Xavier Ordoquy - https://github.com/xordoquy

CONTRIBUTING.rst

@@ -0,0 +1,103 @@
+============
+Contributing
+============
+
+Contributions are welcome, and they are greatly appreciated! Every
+little bit helps, and credit will always be given.
+
+You can contribute in many ways:
+
+Types of Contributions
+----------------------
+
+Report Bugs
+~~~~~~~~~~~
+
+Report bugs at https://github.com/miki725/django-rest-framework-bulk/issues.
+
+If you are reporting a bug, please include:
+
+* Your operating system name and version.
+* Any details about your local setup that might be helpful in troubleshooting.
+* Detailed steps to reproduce the bug.
+
+Fix Bugs
+~~~~~~~~
+
+Look through the GitHub issues for bugs. Anything tagged with "bug"
+is open to whoever wants to implement it.
+
+Implement Features
+~~~~~~~~~~~~~~~~~~
+
+Look through the GitHub issues for features. Anything tagged with "feature"
+is open to whoever wants to implement it.
+
+Write Documentation
+~~~~~~~~~~~~~~~~~~~
+
+Django REST Bulk could always use more documentation, whether
+as part of the official Django REST Bulk docs (one day...), in docstrings,
+or even on the web in blog posts, articles, and such.
+
+Submit Feedback
+~~~~~~~~~~~~~~~
+
+The best way to send feedback is to file an issue at
+https://github.com/miki725/django-rest-framework-bulk/issues.
+
+If you are proposing a feature:
+
+* Explain in detail how it would work.
+* Keep the scope as narrow as possible, to make it easier to implement.
+* Remember that this is a volunteer-driven project, and that contributions
+  are welcome :)
+
+Get Started!
+------------
+
+Ready to contribute? Here's how to set up ``django-rest-framework-bulk`` for local development.
+
+1. Fork the ``django-rest-framework-bulk`` repo on GitHub.
+2. Clone your fork locally::
+
+    $ git clone git@github.com:your_name_here/django-rest-framework-bulk.git
+
+3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development::
+
+    $ mkvirtualenv djangorestbulk
+    $ cd django-rest-framework-bulk/
+    $ make install
+
+4. Create a branch for local development::
+
+    $ git checkout -b name-of-your-bugfix-or-feature
+
+   Now you can make your changes locally.
+
+5. When you're done making changes, check that your changes pass
+   flake8 and the tests, including testing other Python versions with tox::
+
+    $ make lint
+    $ make test-all
+
+6. Commit your changes and push your branch to GitHub::
+
+    $ git add .
+    $ git commit -m "Your detailed description of your changes."
+    $ git push origin name-of-your-bugfix-or-feature
+
+7. Submit a pull request through the GitHub website.
+
+Pull Request Guidelines
+-----------------------
+
+Before you submit a pull request, check that it meets these guidelines:
+
+1. The pull request should include tests.
+2. If the pull request adds functionality, the docs should be updated.
+   Put your new functionality into a function with a docstring,
+   and add the feature to the list in README.rst.
+3. The pull request should work for Python 2.7, 3.4, and for PyPy.
+   Check https://travis-ci.org/miki725/django-rest-framework-bulk/pull_requests
+   and make sure that the tests pass for all supported Python versions.

HISTORY.rst

@@ -0,0 +1,34 @@
+.. :changelog:
+
+History
+-------
+
+0.1.4 (2014-02-01)
+~~~~~~~~~~~~~~~~~~
+
+* Added base model viewset.
+* Fixed installation issues.
+  See `#18 <https://github.com/miki725/django-rest-framework-bulk/pull/18>`_,
+  `#22 <https://github.com/miki725/django-rest-framework-bulk/pull/22>`_.
+
+0.1.3 (2014-06-11)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed bug how ``post_save()`` was called in bulk create.
+
+0.1.2 (2014-04-15)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed bug how ``pre_save()`` was called in bulk update.
+* Fixed bug of unable to mixins by importing directly ``from rest_framework_bulk import <mixin>``.
+  See `#5 <https://github.com/miki725/django-rest-framework-bulk/pull/5>`_ for more info.
+
+0.1.1 (2014-01-20)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed installation bug with setuptools.
+
+0.1 (2014-01-18)
+~~~~~~~~~~~~~~~~
+
+* First release on PyPI.

LICENSE.rst

@@ -1,9 +1,11 @@
 License
 -------
 
-The source code can be found at `Github <https://github.com/miki725/django-rest-framework-bulk>`_.
+Source code can be found at `Github <https://github.com/miki725/django-rest-framework-bulk>`_.
 
-This library is licensed with `MIT License <http://opensource.org/licenses/MIT>`_::
+`The MIT License (MIT) <http://opensource.org/licenses/MIT>`_::
+
+    Copyright (c) 2014-2015, Miroslav Shubernetskiy
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

@@ -1,2 +1,4 @@
-include *.rst
+include *.rst *.txt
 recursive-include tests *.sh *.py
+recursive-exclude * __pycache__
+recursive-exclude * *.py[co]

Makefile

@@ -0,0 +1,65 @@
+.PHONY: clean-pyc clean-build docs clean
+
+NOSE_FLAGS=-s --verbosity=2
+COVER_CONFIG_FLAGS=--with-coverage --cover-package=rest_framework_bulk --cover-erase
+COVER_REPORT_FLAGS=--cover-html --cover-html-dir=htmlcov
+COVER_FLAGS=${COVER_CONFIG_FLAGS} ${COVER_REPORT_FLAGS}
+
+help:
+	@echo "install - install all requirements including for testing"
+	@echo "clean - remove all artifacts"
+	@echo "clean-build - remove build artifacts"
+	@echo "clean-pyc - remove Python file artifacts"
+	@echo "clean-test - remove test and coverage artifacts"
+	@echo "clean-test-all - remove all test-related artifacts including tox"
+	@echo "lint - check style with flake8"
+	@echo "test - run tests quickly with the default Python"
+	@echo "test-coverage - run tests with coverage report"
+	@echo "test-all - run tests on every Python version with tox"
+	@echo "check - run all necessary steps to check validity of project"
+	@echo "release - package and upload a release"
+	@echo "dist - package"
+
+install:
+	pip install -r requirements-dev.txt
+
+clean: clean-build clean-pyc clean-test-all
+
+clean-build:
+	@rm -rf build/
+	@rm -rf dist/
+	@rm -rf *.egg-info
+
+clean-pyc:
+	-@find . -name '*.pyc' -follow -print0 | xargs -0 rm -f
+	-@find . -name '*.pyo' -follow -print0 | xargs -0 rm -f
+	-@find . -name '__pycache__' -type d -follow -print0 | xargs -0 rm -rf
+
+clean-test:
+	rm -rf .coverage coverage*
+	rm -rf tests/.coverage test/coverage*
+	rm -rf htmlcov/
+
+clean-test-all: clean-test
+	rm -rf .tox/
+
+lint:
+	flake8 rest_framework_bulk
+
+test:
+	python tests/manage.py test ${NOSE_FLAGS}
+
+test-coverage:
+	python tests/manage.py test ${NOSE_FLAGS} ${COVER_FLAGS}
+
+test-all:
+	tox
+
+check: clean-build clean-pyc clean-test lint test
+
+release: clean
+	python setup.py sdist upload
+
+dist: clean
+	python setup.py sdist
+	ls -l dist

README.rst

@@ -2,11 +2,10 @@ Django REST Framework Bulk
 ==========================
 
 .. image:: https://badge.fury.io/py/djangorestframework-bulk.png
-   :target: http://badge.fury.io/py/djangorestframework-bulk
+    :target: http://badge.fury.io/py/djangorestframework-bulk
 
-.. image:: https://d2weczhvl823v0.cloudfront.net/miki725/django-rest-framework-bulk/trend.png
-   :alt: Bitdeli badge
-   :target: https://bitdeli.com/free
+.. image:: https://travis-ci.org/miki725/django-rest-framework-bulk.svg?branch=master
+    :target: https://travis-ci.org/miki725/django-rest-framework-bulk
 
 Django REST Framework bulk CRUD view mixins.
 
@@ -24,7 +23,7 @@ Requirements
 
 * Python (2.6, 2.7 and 3.3)
 * Django 1.3+
-* Django REST Framework >= 2.2.5 (when bulk features were added to serializers)
+* Django REST Framework >= 2.2.5 (when bulk features were added to serializers), < 3.0
 
 Installing
 ----------
@@ -86,21 +85,18 @@ The above will allow to create the following queries
 Router
 ------
 
-The bulk router can map automatically the bulk actions ::
-
-	from rest_framework_bulk.routes import BulkRouter
-		
-	class UserViewSet(BulkCreateModelMixin
-	                  BulkUpdateModelMixin,
-	                  BulkDestroyModelMixin,
-	                  viewsets.ModelViewSet):
-	    model = User
-	    
-	    def allow_bulk_destroy(self, qs, filtered):
-	        """Don't forget to fine-grain this method"""
-	
-	router = BulkRouter()
-	router.register(r'users', UserViewSet)
+The bulk router can map automatically the bulk actions::
+
+    from rest_framework_bulk.routes import BulkRouter
+
+    class UserViewSet(BulkModelViewSet):
+        model = User
+
+        def allow_bulk_destroy(self, qs, filtered):
+            """Don't forget to fine-grain this method"""
+
+    router = BulkRouter()
+    router.register(r'users', UserViewSet)
 
 Notes
 -----
@@ -122,10 +118,10 @@ take a look at the source code at ``generics.py`` as it is mostly
 self-explanatory.
 
 Most bulk operations are pretty safe in terms of how they operate,
-that is you excplicitly describe all requests. For example, if you
+that is you explicitly describe all requests. For example, if you
 need to update 3 specific resources, you have to explicitly identify
 those resources in the request's ``PUT`` or ``PATCH`` data.
-The only exception to this is bulk delete. Conside a ``DELETE``
+The only exception to this is bulk delete. Consider a ``DELETE``
 request to the first url. That can potentially delete all resources
 without any special confirmation. To try to account for this, bulk delete
 mixin allows to implement a hook to determine if the bulk delete
@@ -146,20 +142,5 @@ is filtered to only get certain resources, more attention was payed hence
 the action is less likely to be accidental. On how to filter requests,
 please refer to Django REST
 `docs <http://www.django-rest-framework.org/api-guide/filtering>`_.
-Either way, please use bulk deletes with extreme causion since they
+Either way, please use bulk deletes with extreme caution since they
 can be dangerous.
-
-Credits
--------
-
-Maintainers/contributors:
-
-* Miroslav Shubernetskiy - https://github.com/miki725
-* Arien Tolner - https://github.com/Bounder
-* Kevin Brown - https://github.com/kevin-brown
-* Martin Cavoj - https://github.com/macav
-* Mjumbe Poe - https://github.com/mjumbewu
-* Thomas Wajs - https://github.com/thomasWajs
-* Xavier Ordoquy - https://github.com/xordoquy
-* Davide Mendolia - https://github.com/davideme
-

requirements-dev.txt

@@ -0,0 +1,5 @@
+-r requirements.txt
+coverage
+django-nose
+flake8
+tox

requirements.txt

@@ -1,6 +1,2 @@
-coverage
 django
-django-nose
-djangorestframework
-mock
-tox
+djangorestframework<3

rest_framework_bulk/__init__.py

@@ -1,8 +1,8 @@
-__version__ = '0.1.3'
+__version__ = '0.1.4'
 __author__ = 'Miroslav Shubernetskiy'
 
 try:
-    from .generics import *
-    from .mixins import *
+    from .generics import *  # noqa
+    from .mixins import *  # noqa
 except Exception:
     pass

rest_framework_bulk/generics.py

@@ -1,18 +1,29 @@
 from __future__ import unicode_literals, print_function
 from rest_framework import mixins
 from rest_framework.generics import GenericAPIView
+from rest_framework.viewsets import ModelViewSet
+
 from . import mixins as bulk_mixins
 
 
-__all__ = ["BulkCreateAPIView", "BulkUpdateAPIView", "BulkDestroyAPIView", "ListBulkCreateAPIView",
-           "ListCreateBulkUpdateAPIView", "ListCreateBulkUpdateDestroyAPIView", "ListBulkCreateUpdateAPIView",
-           "ListBulkCreateUpdateDestroyAPIView"]
+__all__ = [
+    'BulkCreateAPIView',
+    'BulkDestroyAPIView',
+    'BulkModelViewSet',
+    'BulkUpdateAPIView',
+    'ListBulkCreateAPIView',
+    'ListBulkCreateDestroyAPIView',
+    'ListBulkCreateUpdateAPIView',
+    'ListBulkCreateUpdateDestroyAPIView',
+    'ListCreateBulkUpdateAPIView',
+    'ListCreateBulkUpdateDestroyAPIView',
+]
 
 
-##########################################################
-### Concrete view classes that provide method handlers ###
-### by composing the mixin classes with the base view. ###
-##########################################################
+# ################################################## #
+# Concrete view classes that provide method handlers #
+# by composing the mixin classes with the base view. #
+# ################################################## #
 
 class BulkCreateAPIView(bulk_mixins.BulkCreateModelMixin,
                         GenericAPIView):
@@ -100,6 +111,20 @@ class ListBulkCreateUpdateAPIView(mixins.ListModelMixin,
         return self.partial_bulk_update(request, *args, **kwargs)
 
 
+class ListBulkCreateDestroyAPIView(mixins.ListModelMixin,
+                                   bulk_mixins.BulkCreateModelMixin,
+                                   bulk_mixins.BulkDestroyModelMixin,
+                                   GenericAPIView):
+    def get(self, request, *args, **kwargs):
+        return self.list(request, *args, **kwargs)
+
+    def post(self, request, *args, **kwargs):
+        return self.create(request, *args, **kwargs)
+
+    def delete(self, request, *args, **kwargs):
+        return self.bulk_destroy(request, *args, **kwargs)
+
+
 class ListBulkCreateUpdateDestroyAPIView(mixins.ListModelMixin,
                                          bulk_mixins.BulkCreateModelMixin,
                                          bulk_mixins.BulkUpdateModelMixin,
@@ -121,15 +146,13 @@ class ListBulkCreateUpdateDestroyAPIView(mixins.ListModelMixin,
         return self.bulk_destroy(request, *args, **kwargs)
 
 
-class ListBulkCreateDestroyAPIView(mixins.ListModelMixin,
-                                   bulk_mixins.BulkCreateModelMixin,
-                                   bulk_mixins.BulkDestroyModelMixin,
-                                   GenericAPIView):
-    def get(self, request, *args, **kwargs):
-        return self.list(request, *args, **kwargs)
-
-    def post(self, request, *args, **kwargs):
-        return self.create(request, *args, **kwargs)
+# ########################################################## #
+# Concrete viewset classes that provide method handlers      #
+# by composing the bulk mixin classes with the base viewset. #
+# ########################################################## #
 
-    def delete(self, request, *args, **kwargs):
-        return self.bulk_destroy(request, *args, **kwargs)
+class BulkModelViewSet(bulk_mixins.BulkCreateModelMixin,
+                       bulk_mixins.BulkUpdateModelMixin,
+                       bulk_mixins.BulkDestroyModelMixin,
+                       ModelViewSet):
+    pass

rest_framework_bulk/mixins.py

@@ -5,7 +5,11 @@ from rest_framework.mixins import CreateModelMixin
 from rest_framework.response import Response
 
 
-__all__ = ["BulkCreateModelMixin", "BulkUpdateModelMixin", "BulkDestroyModelMixin"]
+__all__ = [
+    'BulkCreateModelMixin',
+    'BulkDestroyModelMixin',
+    'BulkUpdateModelMixin',
+]
 
 
 class BulkCreateModelMixin(CreateModelMixin):

rest_framework_bulk/routes.py

@@ -3,7 +3,9 @@ import copy
 from rest_framework.routers import DefaultRouter, SimpleRouter
 
 
-__all__ = ["BulkRouter"]
+__all__ = [
+    'BulkRouter',
+]
 
 
 class BulkRouter(DefaultRouter):

rest_framework_bulk/tests/simple_app/models.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals, print_function
+from django.db import models
+
+
+class SimpleModel(models.Model):
+    number = models.IntegerField()
+    contents = models.CharField(max_length=16)

rest_framework_bulk/tests/simple_app/urls.py

@@ -0,0 +1,15 @@
+from __future__ import print_function, unicode_literals
+from django.conf.urls import patterns, url, include
+from rest_framework_bulk.routes import BulkRouter
+
+from .views import SimpleViewSet
+
+
+router = BulkRouter()
+router.register('simple', SimpleViewSet, 'simple')
+
+urlpatterns = patterns(
+    '',
+
+    url(r'^api/', include(router.urls, namespace='api')),
+)

rest_framework_bulk/tests/simple_app/views.py

@@ -0,0 +1,22 @@
+from __future__ import unicode_literals, print_function
+from rest_framework_bulk import generics
+
+from . import models
+
+
+class SimpleBulkAPIView(generics.ListBulkCreateUpdateDestroyAPIView):
+    model = models.SimpleModel
+
+
+class FilteredBulkAPIView(generics.ListBulkCreateUpdateDestroyAPIView):
+    model = models.SimpleModel
+
+    def filter_queryset(self, queryset):
+        return queryset.filter(number__gt=5)
+
+
+class SimpleViewSet(generics.BulkModelViewSet):
+    model = models.SimpleModel
+
+    def filter_queryset(self, queryset):
+        return queryset.filter(number__gt=5)

rest_framework_bulk/tests/test_generics.py

@@ -1,16 +1,258 @@
+from __future__ import unicode_literals, print_function
+import json
+from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
-from simple_app.views import SimpleBulkUpdateAPIView
+from rest_framework import status
 
+from .simple_app.models import SimpleModel
+from .simple_app.views import FilteredBulkAPIView, SimpleBulkAPIView
 
-class TestBulkUpdateAPIView(TestCase):
-    def test_OPTIONS_request(self):
+
+class TestBulkAPIView(TestCase):
+    def setUp(self):
+        super(TestBulkAPIView, self).setUp()
+        self.view = SimpleBulkAPIView.as_view()
+        self.request = RequestFactory()
+
+    def test_get(self):
+        """
+        Test that GET request is successful on bulk view.
+        """
+        response = self.view(self.request.get(''))
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+    def test_post_single(self):
+        """
+        Test that POST request with single resource only creates a single resource.
+        """
+        response = self.view(self.request.post(
+            '',
+            json.dumps({'contents': 'hello world', 'number': 1}),
+            content_type='application/json',
+        ))
+
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        self.assertEqual(SimpleModel.objects.count(), 1)
+        self.assertEqual(SimpleModel.objects.get().contents, 'hello world')
+
+    def test_post_bulk(self):
+        """
+        Test that POST request with multiple resources creates all posted resources.
+        """
+        response = self.view(self.request.post(
+            '',
+            json.dumps([
+                {'contents': 'hello world', 'number': 1},
+                {'contents': 'hello mars', 'number': 2},
+            ]),
+            content_type='application/json',
+        ))
+
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        self.assertEqual(SimpleModel.objects.count(), 2)
+        self.assertEqual(list(SimpleModel.objects.all().values_list('contents', flat=True)), [
+            'hello world',
+            'hello mars',
+        ])
+
+    def test_put(self):
+        """
+        Test that PUT request updates all submitted resources.
+        """
+        obj1 = SimpleModel.objects.create(contents='hello world', number=1)
+        obj2 = SimpleModel.objects.create(contents='hello mars', number=2)
+
+        response = self.view(self.request.put(
+            '',
+            json.dumps([
+                {'contents': 'foo', 'number': 3, 'id': obj1.pk},
+                {'contents': 'bar', 'number': 4, 'id': obj2.pk},
+            ]),
+            content_type='application/json',
+        ))
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(SimpleModel.objects.count(), 2)
+        self.assertEqual(
+            list(SimpleModel.objects.all().values_list('id', 'contents', 'number')),
+            [
+                (obj1.pk, 'foo', 3),
+                (obj2.pk, 'bar', 4),
+            ]
+        )
+
+    def test_patch(self):
+        """
+        Test that PATCH request partially updates all submitted resources.
+        """
+        obj1 = SimpleModel.objects.create(contents='hello world', number=1)
+        obj2 = SimpleModel.objects.create(contents='hello mars', number=2)
+
+        response = self.view(self.request.patch(
+            '',
+            json.dumps([
+                {'contents': 'foo', 'id': obj1.pk},
+                {'contents': 'bar', 'id': obj2.pk},
+            ]),
+            content_type='application/json',
+        ))
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(SimpleModel.objects.count(), 2)
+        self.assertEqual(
+            list(SimpleModel.objects.all().values_list('id', 'contents', 'number')),
+            [
+                (obj1.pk, 'foo', 1),
+                (obj2.pk, 'bar', 2),
+            ]
+        )
+
+    def test_delete_not_filtered(self):
+        """
+        Test that DELETE is not allowed when results are not filtered.
+        """
+        SimpleModel.objects.create(contents='hello world', number=1)
+        SimpleModel.objects.create(contents='hello mars', number=10)
+
+        response = self.view(self.request.delete(''))
+
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+
+    def test_delete_filtered(self):
+        """
+        Test that DELETE removes all filtered resources.
+        """
+        SimpleModel.objects.create(contents='hello world', number=1)
+        SimpleModel.objects.create(contents='hello mars', number=10)
+
+        response = FilteredBulkAPIView.as_view()(self.request.delete(''))
+
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+        self.assertEqual(SimpleModel.objects.count(), 1)
+        self.assertEqual(SimpleModel.objects.get().contents, 'hello world')
+
+    def test_options(self):
+        """
+        Test that OPTIONS request is successful on bulk view.
+        """
+        response = self.view(self.request.options(''))
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+
+class TestBulkAPIViewSet(TestCase):
+    """
+    Integration class testing that viewset requests are correctly
+    routed via bulk router and that expected status code is returned.
+    """
+
+    def setUp(self):
+        super(TestBulkAPIViewSet, self).setUp()
+        self.url = reverse('api:simple-list')
+
+    def test_get(self):
+        """
+        Test that GET returns 200
+        """
+        response = self.client.get(self.url)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+    def test_post_single(self):
+        """
+        Test that POST with single resource returns 201
+        """
+        response = self.client.post(
+            self.url,
+            data=json.dumps({
+                'contents': 'hello world',
+                'number': 1,
+            }),
+            content_type='application/json',
+        )
+
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+
+    def test_post_bulk(self):
+        """
+        Test that POST with multiple resources returns 201
+        """
+        response = self.client.post(
+            self.url,
+            data=json.dumps([
+                {
+                    'contents': 'hello world',
+                    'number': 1,
+                },
+                {
+                    'contents': 'hello mars',
+                    'number': 2,
+                },
+            ]),
+            content_type='application/json',
+        )
+
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+
+    def test_put(self):
+        """
+        Test that PUT with multiple resources returns 200
+        """
+        obj1 = SimpleModel.objects.create(contents='hello world', number=7)
+        obj2 = SimpleModel.objects.create(contents='hello mars', number=10)
+
+        response = self.client.put(
+            self.url,
+            data=json.dumps([
+                {
+                    'contents': 'foo',
+                    'number': 1,
+                    'id': obj1.pk,
+                },
+                {
+                    'contents': 'bar',
+                    'number': 2,
+                    'id': obj2.pk,
+                },
+            ]),
+            content_type='application/json',
+        )
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+    def test_patch(self):
+        """
+        Test that PATCH with multiple partial resources returns 200
+        """
+        obj1 = SimpleModel.objects.create(contents='hello world', number=7)
+        obj2 = SimpleModel.objects.create(contents='hello mars', number=10)
+
+        response = self.client.patch(
+            self.url,
+            data=json.dumps([
+                {
+                    'contents': 'foo',
+                    'id': obj1.pk,
+                },
+                {
+                    'contents': 'bar',
+                    'id': obj2.pk,
+                },
+            ]),
+            content_type='application/json',
+        )
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+    def test_delete(self):
         """
-        OPTIONS requests must work for CORS requests. Test that OPTIONS
-        requests aren't failing for simple cases.
+        Test that PATCH with multiple partial resources returns 200
         """
-        view = SimpleBulkUpdateAPIView.as_view()
-        request = RequestFactory().options('')
-        response = view(request)
+        SimpleModel.objects.create(contents='hello world', number=7)
+        SimpleModel.objects.create(contents='hello mars', number=10)
+
+        response = self.client.delete(self.url)
 
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)

setup.py

@@ -1,47 +1,30 @@
-"""
-Based on Django REST Framework's ``setup.py``.
-"""
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 import os
-from setuptools import setup
-from rest_framework_bulk import __version__, __author__
-
-
-def get_packages(package):
-    """
-    Return root package and all sub-packages.
-    """
-    return [dirpath
-            for dirpath, dirnames, filenames in os.walk(package)
-            if os.path.exists(os.path.join(dirpath, '__init__.py'))]
+from setuptools import find_packages, setup
 
+from rest_framework_bulk import __version__, __author__
 
-def get_package_data(package):
-    """
-    Return all files under the root package, that are not in a
-    package themselves.
-    """
-    def is_python_dir(dirpath):
-        return (os.path.exists(os.path.join(dirpath, '__init__.py')) or
-                '__pycache__' in dirpath)
-
-    walk = [(dirpath.replace(package + os.sep, '', 1), filenames)
-            for dirpath, dirnames, filenames in os.walk(package)
-            if not is_python_dir(dirpath)]
 
-    filepaths = []
-    for base, filenames in walk:
-        filepaths.extend([os.path.join(base, filename)
-                          for filename in filenames])
+def read(fname):
+    return (open(os.path.join(os.path.dirname(__file__), fname), 'rb')
+            .read().decode('utf-8'))
 
-    if filepaths:
-        return {package: filepaths}
-    else:
-        return {}
 
+authors = read('AUTHORS.rst')
+history = read('HISTORY.rst').replace('.. :changelog:', '')
+licence = read('LICENSE.rst')
+readme = read('README.rst')
 
-def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+requirements = read('requirements.txt').splitlines() + [
+    'setuptools',
+]
 
+test_requirements = (
+    read('requirements.txt').splitlines()
+    + read('requirements-dev.txt').splitlines()[1:]
+)
 
 setup(
     name='djangorestframework-bulk',
@@ -49,16 +32,13 @@ setup(
     author=__author__,
     author_email='miroslav@miki725.com',
     description='Django REST Framework bulk CRUD view mixins',
-    long_description=read('README.rst') + read('LICENSE.rst'),
+    long_description='\n\n'.join([readme, history, authors, licence]),
     url='https://github.com/miki725/django-rest-framework-bulk',
     license='MIT',
     keywords='django',
-    packages=get_packages('rest_framework_bulk'),
-    package_data=get_package_data('rest_framework_bulk'),
-    install_requires=[
-        'django',
-        'djangorestframework',
-    ],
+    packages=find_packages(),
+    install_requires=requirements,
+    tests_require=test_requirements,
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Framework :: Django',

tests/settings.py

@@ -5,23 +5,23 @@ DEBUG = True
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'rest_framework_bulk.sqlite'
+        'NAME': 'rest_framework_bulk.sqlite',
     }
 }
 
+MIDDLEWARE_CLASSES = ()
+
 INSTALLED_APPS = (
+    'django.contrib.staticfiles',
     'django_nose',
+    'rest_framework',
     'rest_framework_bulk',
-    'simple_app',
+    'rest_framework_bulk.tests.simple_app',
 )
 
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-NOSE_ARGS = (
-    '--all-modules',
-    '--with-doctest',
-    '--with-coverage',
-    '--cover-package=rest_framework_bulk',
-)
 
 STATIC_URL = '/static/'
 SECRET_KEY = 'foo'
+
+ROOT_URLCONF = 'rest_framework_bulk.tests.simple_app.urls'

tests/simple_app/models.py

@@ -1,5 +0,0 @@
-from django.db import models
-
-
-class SimpleModel (models.Model):
-    contents = models.TextField()

tests/simple_app/views.py

@@ -1,6 +0,0 @@
-from rest_framework_bulk import generics
-from . import models
-
-
-class SimpleBulkUpdateAPIView (generics.BulkUpdateAPIView):
-    model = models.SimpleModel

tox.ini

@@ -1,26 +1,17 @@
 [tox]
 envlist =
-    py26, py27, py33, docs
+    py27, py34, pypy, pypy3
 
 [testenv]
-downloadcache = {toxworkdir}/_download/
+setenv =
+    PYTHONPATH = {toxinidir}:{toxinidir}/multinosetests
 commands =
-    ./runtests.sh
-changedir =
-    {toxinidir}/tests
+    pip freeze
+    make check
 deps =
-    coverage
-    django
-    django-nose
-    djangorestframework
-    mock
-    six
+    -rrequirements-dev.txt
+whitelist_externals =
+    make
 
-[testenv:py26]
-basepython = python2.6
-
-[testenv:py27]
-basepython = python2.7
-
-[testenv:py33]
-basepython = python3.3
+[flake8]
+max-line-length = 100