Merge pull request #208 from simleo/fix_dir_id

Fix dataset id when adding a local dir with trailing slash

rocrate/model/file_or_dir.py

@@ -47,5 +47,5 @@ def __init__(self, crate, source=None, dest_path=None, fetch_remote=False,
             if is_url(str(source)):
                 identifier = os.path.basename(source) if fetch_remote else source
             else:
-                identifier = "./" if source == "./" else os.path.basename(source)
+                identifier = os.path.basename(str(source).rstrip("/"))
         super().__init__(crate, identifier, properties)

test/test_model.py

@@ -41,7 +41,7 @@
 RAW_REPO_URL = "https://raw.githubusercontent.com/ResearchObject/ro-crate-py"
 
 
-def test_dereferencing(test_data_dir, helpers):
+def test_dereferencing(test_data_dir, helpers, monkeypatch):
     crate = ROCrate(gen_preview=True)
 
     # verify default entities
@@ -69,6 +69,12 @@ def test_dereferencing(test_data_dir, helpers):
     # alias
     assert crate.get(readme_url) is readme_entity
 
+    # dereference local dir added with trailing slash
+    monkeypatch.chdir(test_data_dir)
+    local_dir = "test_add_dir/"
+    local_dir_entity = crate.add_dataset(local_dir)
+    assert crate.dereference(local_dir) is local_dir_entity
+
 
 @pytest.mark.parametrize("name", [".foo", "foo.", ".foo/", "foo./"])
 def test_dereferencing_equivalent_id(test_data_dir, name):