Merge pull request #20 from pinax/duplicates

Disallow Duplicate Document and Folder Names

Author: paltman

pinax/documents/exceptions.py

@@ -0,0 +1,6 @@
+class DuplicateFolderNameError(Exception):
+    pass
+
+
+class DuplicateDocumentNameError(Exception):
+    pass

pinax/documents/forms.py

@@ -21,6 +21,12 @@ class Meta:
             "parent": forms.HiddenInput,
         }
 
+    def clean(self):
+        name = self.cleaned_data["name"]
+        parent = self.cleaned_data.get("parent")
+        if Folder.already_exists(name, parent):
+            raise forms.ValidationError("{} already exists.".format(name))
+
     def __init__(self, *args, **kwargs):
         folders = kwargs.pop("folders")
         super(FolderCreateForm, self).__init__(*args, **kwargs)
@@ -48,6 +54,12 @@ def clean_file(self):
             raise forms.ValidationError("File will exceed storage capacity.")
         return value
 
+    def clean(self):
+        name = self.cleaned_data["file"].name
+        folder = self.cleaned_data.get("folder")
+        if Document.already_exists(name, folder):
+            raise forms.ValidationError("{} already exists.".format(name))
+
 
 class UserMultipleChoiceField(forms.ModelMultipleChoiceField):
 

pinax/documents/models.py

@@ -11,6 +11,7 @@
 
 from .compat import izip_longest
 from .conf import settings
+from .exceptions import DuplicateFolderNameError, DuplicateDocumentNameError
 from .hooks import hookset
 from .managers import FolderManager, FolderQuerySet, DocumentQuerySet
 
@@ -40,10 +41,16 @@ class Folder(models.Model):
     def shared_user_model(cls):
         return FolderSharedUser
 
+    @classmethod
+    def already_exists(cls, name, parent=None):
+        return cls.objects.filter(name=name, parent=parent).exists()
+
     def __unicode__(self):
         return self.name
 
     def save(self, **kwargs):
+        if not self.pk and Folder.already_exists(self.name, self.parent):
+            raise DuplicateFolderNameError("{} already exists in this folder.".format(self.name))
         self.touch(self.author, commit=False)
         super(Folder, self).save(**kwargs)
 
@@ -185,10 +192,16 @@ class Document(models.Model):
     def shared_user_model(cls):
         return DocumentSharedUser
 
+    @classmethod
+    def already_exists(cls, name, folder=None):
+        return cls.objects.filter(name=name, folder=folder).exists()
+
     def __unicode__(self):
         return self.name
 
     def save(self, **kwargs):
+        if not self.pk and Document.already_exists(self.name, self.folder):
+            raise DuplicateDocumentNameError("{} already exists in this folder.".format(self.name))
         self.touch(self.author, commit=False)
         super(Document, self).save(**kwargs)
 

pinax/documents/tests/test.py

@@ -1,5 +1,49 @@
+from django.core.files.uploadedfile import SimpleUploadedFile
+
 from test_plus.test import TestCase as PlusTestCase
 
+from ..exceptions import DuplicateFolderNameError, DuplicateDocumentNameError
+from ..models import (
+    Document,
+    Folder
+)
+
+
+class BaseTest(PlusTestCase):
+
+    def setUp(self):
+        self.user = self.make_user("eldarion")
+
+
+class FolderTestCase(BaseTest):
+
+    def test_cannot_have_duplicate_sibling_folder_names(self):
+        Folder.objects.create(name="Foo", author=self.user, modified_by=self.user)
+        with self.assertRaises(DuplicateFolderNameError):
+            Folder.objects.create(name="Foo", author=self.user, modified_by=self.user)
+
+    def test_can_have_duplicate_folder_names_at_different_paths(self):
+        foo = Folder.objects.create(name="Foo", author=self.user, modified_by=self.user)
+        bar = Folder.objects.create(name="Bar", parent=foo, author=self.user, modified_by=self.user)
+        Folder.objects.create(name="Foo", parent=bar, author=self.user, modified_by=self.user)
+        with self.assertRaises(DuplicateFolderNameError):
+            Folder.objects.create(name="Bar", parent=foo, author=self.user, modified_by=self.user)
+
+
+class DocumentTestCase(BaseTest):
+
+    def test_cannot_have_duplicate_sibling_document_names(self):
+        simple_file = SimpleUploadedFile("delicious.txt", b"something tasty")
+        Document.objects.create(name="Foo", author=self.user, file=simple_file, modified_by=self.user)
+        with self.assertRaises(DuplicateDocumentNameError):
+            Document.objects.create(name="Foo", author=self.user, file=simple_file, modified_by=self.user)
 
-class TestCase(PlusTestCase):
-    pass
+    def test_can_have_duplicate_document_names_at_different_paths(self):
+        simple_file = SimpleUploadedFile("delicious.txt", b"something tasty")
+        foo = Folder.objects.create(name="Foo", author=self.user, modified_by=self.user)
+        bar = Folder.objects.create(name="Bar", parent=foo, author=self.user, modified_by=self.user)
+        Document.objects.create(name="Foo", author=self.user, file=simple_file, modified_by=self.user)
+        Document.objects.create(name="Bar", folder=foo, author=self.user, file=simple_file, modified_by=self.user)
+        Document.objects.create(name="Foo", folder=bar, author=self.user, file=simple_file, modified_by=self.user)
+        with self.assertRaises(DuplicateDocumentNameError):
+            Document.objects.create(name="Bar", folder=foo, author=self.user, file=simple_file, modified_by=self.user)

pinax/documents/tests/test_views.py

@@ -7,19 +7,10 @@
     Document,
     Folder,
 )
-from .test import TestCase
+from .test import BaseTest
 
 
-class TestViews(TestCase):
-
-    def setUp(self):
-        """
-        Create default User.
-        """
-        self.user = self.make_user("eldarion")
-
-
-class TestFolders(TestViews):
+class TestFolders(BaseTest):
 
     def setUp(self):
         super(TestFolders, self).setUp()
@@ -102,6 +93,19 @@ def test_post_create_with_illegal_parent(self):
             self.assertFalse("object" in self.last_response.context)
             self.assertFalse(Folder.objects.filter(name=folder_name))
 
+    def test_post_create_with_duplicate_name(self):
+        """
+        Ensure POST does not create a folder with duplicate name
+        """
+        folder_name = "Spindle"
+        Folder.objects.create(name=folder_name, author=self.user, modified_by=self.user)
+        post_args = {"name": folder_name}
+        with self.login(self.user):
+            response = self.post(self.create_urlname, data=post_args, follow=True)
+            self.response_200(response)
+            self.assertTrue("{} already exists.".format(folder_name) in str(response.context["form"].errors))
+            self.assertFalse("object" in self.last_response.context)
+
     def test_detail(self):
         """
         Ensure we can see folder detail.
@@ -224,7 +228,7 @@ def test_share_non_author(self):
             self.response_404(response)
 
 
-class TestDocuments(TestViews):
+class TestDocuments(BaseTest):
 
     def setUp(self):
         super(TestDocuments, self).setUp()
@@ -310,6 +314,20 @@ def test_post_create_with_illegal_parent(self):
             self.assertFalse("object" in self.last_response.context)
             self.assertFalse(Document.objects.filter(name=simple_file.name))
 
+    def test_post_create_with_duplicate_name(self):
+        """
+        Ensure POST does not create a document with duplicate name
+        """
+        simple_file = SimpleUploadedFile("delicious.txt", self.file_contents)
+        Document.objects.create(name="delicious.txt", author=self.user, file=simple_file, modified_by=self.user)
+        simple_file = SimpleUploadedFile("delicious.txt", self.file_contents)
+        post_args = {"name": "file", "file": simple_file}
+        with self.login(self.user):
+            response = self.post(self.create_urlname, data=post_args, follow=True)
+            self.response_200(response)
+            self.assertTrue("delicious.txt already exists." in str(response.context["form"].errors))
+            self.assertFalse("object" in self.last_response.context)
+
     def test_detail(self):
         """
         Ensure we can see document detail.