Fix ORM methods to handle relative paths

jacebrowning · Feb 9, 2020 · fe9f0a0 · fe9f0a0
1 parent b3dd417
commit fe9f0a0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 0.7 (unreleased)
 
 - Added a `YAML_LIBRARY` setting to control the underlying YAML library.
+- Fixed ORM methods to handle relative file patterns.
 
 # 0.6 (2020-01-25)
 

diff --git a/datafiles/formats.py b/datafiles/formats.py
@@ -119,7 +119,7 @@ def extensions(cls):
     def deserialize(cls, file_object):
         import yaml
 
-        data = yaml.safe_load(file_object)
+        data = yaml.safe_load(file_object) or {}
 
         return data
 

diff --git a/datafiles/manager.py b/datafiles/manager.py
@@ -62,8 +62,13 @@ def get_or_create(self, *args, **kwargs) -> HasDatafile:
             return self.model(*args, **kwargs)
 
     def all(self) -> Iterator[HasDatafile]:
-        root = Path(inspect.getfile(self.model)).parent
-        pattern = str(root / self.model.Meta.datafile_pattern)
+        path = Path(self.model.Meta.datafile_pattern)
+        if path.is_absolute() or self.model.Meta.datafile_pattern.startswith('./'):
+            pattern = str(path.resolve())
+        else:
+            root = Path(inspect.getfile(self.model)).parent
+            pattern = str(root / self.model.Meta.datafile_pattern)
+
         splatted = pattern.format(self=Splats())
         log.info(f'Finding files matching pattern: {splatted}')
         for filename in iglob(splatted):

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "datafiles"
-version = "0.7b2"
+version = "0.7b3"
 description = "File-based ORM for dataclasses."
 
 license = "MIT"