Merge pull request #18 from no-more-coffee/refactor

Add path showing on PathDoesNotExist.

inmemorystorage/storage.py

@@ -101,15 +101,15 @@ def resolve(self, path, create=False, use_bytes=False):
             if current in self.children.keys():
                 return self.children[current]
             if not create:
-                raise PathDoesNotExist()
+                raise PathDoesNotExist(path)
             content = six.binary_type() if use_bytes else six.text_type()
             node = InMemoryFile(name=current, content=content)
             self.add_child(current, node)
             return node
         if current in self.children.keys():
             return self.children[current].resolve(rest, create=create, use_bytes=use_bytes)
         if not create:
-            raise PathDoesNotExist()
+            raise PathDoesNotExist(path)
         node = InMemoryDir()
         self.add_child(current, node)
         return self.children[current].resolve(rest, create=create, use_bytes=use_bytes)

tests.py

@@ -1,11 +1,13 @@
 import time
 import unittest
-from inmemorystorage import InMemoryStorage
-from inmemorystorage.storage import InMemoryDir, InMemoryFile
-from django.core.files.base import ContentFile
+
 from django.conf import settings
+from django.core.files.base import ContentFile
 from django.test.utils import override_settings
 
+from inmemorystorage import InMemoryStorage
+from inmemorystorage.storage import InMemoryDir, InMemoryFile, PathDoesNotExist
+
 
 class MemoryStorageTests(unittest.TestCase):
     def setUp(self):
@@ -65,6 +67,12 @@ def test_write(self):
         with self.storage.open("file", "r") as f:
             self.assertEqual(f.read(), "hello")
 
+    def test_missing(self):
+        missing_file_name = "missing-file"
+        with self.assertRaises(PathDoesNotExist) as context_manager:
+            self.storage.open(missing_file_name, "r")
+            self.assertEqual(context_manager.exception.args, (missing_file_name,))
+
     def test_all(self):
         self.assertEqual(self.storage.listdir('/'), [[], []])
         self.assertEqual(self.storage.save('dir/subdir/file', ContentFile('testing')), 'dir/subdir/file')
@@ -157,5 +165,6 @@ def test_no_persistance_without_setting(self):
         # Can't use self.assertIs because it isn't available in Python 2.6
         self.assertTrue(storage_a.filesystem is not storage_b.filesystem)
 
+
 if __name__ == '__main__':
     unittest.main()