Merge pull request #84 from django-mongodb-engine/gridfs-url

Added url() support to GridFSStorage.

Author: flaper87

django_mongodb_engine/storage.py

@@ -1,9 +1,12 @@
 import os
+import urlparse
 
 from gridfs import GridFS, NoFile
 
 from django.core.exceptions import ImproperlyConfigured
 from django.core.files.storage import Storage
+from django.utils.encoding import filepath_to_uri
+
 
 def _get_subcollections(collection):
     """
@@ -15,6 +18,7 @@ def _get_subcollections(collection):
         if cleaned != collection.name and cleaned.startswith(collection.name):
             yield cleaned
 
+
 class GridFSStorage(Storage):
     """
     GridFS Storage backend for Django.
@@ -39,15 +43,24 @@ class GridFSStorage(Storage):
     :param database:
         Alias of the Django database to use. Defaults to 'default' (the default
         Django database).
+    :param base_url:
+        URL that serves the files in GridFS (for instance, through nginx-gridfs).
+        Defaults to None (file not accessible through a URL).
     """
 
-    def __init__(self, location='', collection='storage', database='default'):
+    def __init__(self, location='', collection='storage', database='default',
+                 base_url=None):
         self.location = location.strip(os.sep)
         self.collection = collection
         self.database = database
+        self.base_url = base_url
+
         if not self.collection:
             raise ImproperlyConfigured("'collection' may not be empty")
 
+        if self.base_url and not self.base_url.endswith('/'):
+            raise ImproperlyConfigured("If set, 'base_url' must end with a slash")
+
     def _open(self, path, mode='rb'):
         """
         Returns a :class:`~gridfs.GridOut` file opened in `mode`, or raises
@@ -104,6 +117,11 @@ def size(self, path):
         gridfs, filename = self._get_gridfs(path)
         return gridfs.get_last_version(filename=filename).length
 
+    def url(self, name):
+        if self.base_url is None:
+            raise ValueError("This file is not accessible via a URL.")
+        return urlparse.urljoin(self.base_url, filepath_to_uri(name))
+
     def created_time(self, path):
         """
         Returns the datetime the file at `path` was created.

tests/storage/tests.py

@@ -15,12 +15,13 @@ def setUp(self):
         self.storage = self.get_storage(self.temp_dir)
 
     def tearDown(self):
-        for collection in self.storage._db.collection_names():
-            if not collection.startswith('system.'):
-                self.storage._db.drop_collection(collection)
+        if hasattr(self.storage, '_db'):
+            for collection in self.storage._db.collection_names():
+                if not collection.startswith('system.'):
+                    self.storage._db.drop_collection(collection)
 
-    def get_storage(self, location):
-        return self.storage_class(location=location)
+    def get_storage(self, location, **kwargs):
+        return self.storage_class(location=location, **kwargs)
 
     def test_file_access_options(self):
         """
@@ -113,15 +114,15 @@ def test_file_save_without_name(self):
     #
     #     self.storage.delete(f_name)
 
-    # def test_file_url(self):
-    #     """
-    #     File storage returns a url to access a given file from the Web.
-    #     """
-    #     self.assertEqual(self.storage.url('test.file'),
-    #         '%s%s' % (self.storage.base_url, 'test.file'))
-    #
-    #     self.storage.base_url = None
-    #     self.assertRaises(ValueError, self.storage.url, 'test.file')
+    def test_file_url(self):
+        """
+        File storage returns a url to access a given file from the Web.
+        """
+        self.assertRaises(ValueError, self.storage.url, 'test.file')
+
+        self.storage = self.get_storage(self.storage.location, base_url='foo/')
+        self.assertEqual(self.storage.url('test.file'),
+            '%s%s' % (self.storage.base_url, 'test.file'))
 
     def test_file_with_mixin(self):
         """