Feature: Merge directory and file with the same name

tests/data/a.yml

@@ -1,2 +1,2 @@
-a1: 1
-a2: text
+number: 1
+string: text

tests/data/dir1.yml

@@ -0,0 +1,2 @@
+number: 1
+string: text

tests/data/dir1/b.yml

@@ -1,2 +1,2 @@
-b1: 2
-b2: text
+number: 2
+string: text

tests/data/dir2/c.json

@@ -1,4 +1,4 @@
 {
-  "c1": 3,
-  "c2": "text"
+  "number": 3,
+  "string": "text"
 }

tests/docs/test_dir_source.md

@@ -3,9 +3,9 @@ title: "Test Directory Source"
 ---
 
 - data.a: `{{ data.a }}`
-- data.a.a1: `{{ data.a.a1 }}`
-- data.a.a2: `{{ data.a.a2 }}`
-- data.dir1.b.b1: `{{ data.dir1.b.b1 }}`
-- data.dir1.b.b2: `{{ data.dir1.b.b2 }}`
-- data.dir2.c.c1: `{{ data.dir2.c.c1 }}`
-- data.dir2.c.c2: `{{ data.dir2.c.c2 }}`
+- data.a.number: `{{ data.a.number }}`
+- data.a.string: `{{ data.a.string }}`
+- data.dir1.b.number: `{{ data.dir1.b.number }}`
+- data.dir1.b.string: `{{ data.dir1.b.string }}`
+- data.dir2.c.number: `{{ data.dir2.c.number }}`
+- data.dir2.c.string: `{{ data.dir2.c.string }}`

tests/test_data_template.py

@@ -20,13 +20,13 @@ def test_dir_source_in_markdown_file():
         data_loaded = re.findall(r"<code>([^<]*)", f.read())
         print(data_loaded)
         assert(data_loaded == [
-            "{'a1': 1, 'a2': 'text'}", # data/a.yml
-            "1", # data/a.yml -> a1
-            "text", # data/a.yml -> a2
-            "2", # data/dir1/b.yml -> b1
-            "text", # data/dir1/b.yml -> b2
-            "3", # data/dir2/c.yml -> c1
-            "text", # data/dir2/c.yml -> c2
+            "{'number': 1, 'string': 'text'}", # data/a.yml
+            "1", # data/a.yml -> number
+            "text", # data/a.yml -> string
+            "2", # data/dir1/b.yml -> number
+            "text", # data/dir1/b.yml -> string
+            "3", # data/dir2/c.yml -> number
+            "text", # data/dir2/c.yml -> string
         ])
 
 def test_file_source_in_markdown_file():

tests/test_load_data.py

@@ -32,19 +32,21 @@ def test_folder_source():
 
     assert data == {
             "a": {
-                "a1": 1,
-                "a2": "text",
+                "number": 1,
+                "string": "text",
             },
             "dir1": {
+                "number": 1,
+                "string": "text",
                 "b": {
-                    "b1": 2,
-                    "b2": "text",
+                    "number": 2,
+                    "string": "text",
                 },
             },
             "dir2": {
                 "c": {
-                    "c1": 3,
-                    "c2": "text",
+                    "number": 3,
+                    "string": "text",
                 },
             },
     }
@@ -64,19 +66,21 @@ def test_folder_source_slash():
 
     assert data == {
             "a": {
-                "a1": 1,
-                "a2": "text",
+                "number": 1,
+                "string": "text",
             },
             "dir1": {
+                "number": 1,
+                "string": "text",
                 "b": {
-                    "b1": 2,
-                    "b2": "text",
+                    "number": 2,
+                    "string": "text",
                 },
             },
             "dir2": {
                 "c": {
-                    "c1": 3,
-                    "c2": "text",
+                    "number": 3,
+                    "string": "text",
                 },
             },
     }