add deeply nested topics

functionhaus · Sep 17, 2019 · 336c8e3 · 336c8e3
1 parent 6a769af
commit 336c8e3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/lib/archivist/archive.ex b/lib/archivist/archive.ex
@@ -90,7 +90,7 @@ defmodule Archivist.Archive do
       end
 
       def topics do
-        unquote topics
+        unquote Macro.escape(topics)
       end
 
       def tags do

diff --git a/lib/archivist/parsers/article_parser.ex b/lib/archivist/parsers/article_parser.ex
@@ -1,4 +1,7 @@
 defmodule Archivist.ArticleParser do
+
+  alias Archivist.MapUtils
+
   def get_paths(content_dir, pattern) do
     content_dir
     |> Path.relative_to_cwd
@@ -42,13 +45,17 @@ defmodule Archivist.ArticleParser do
   def parse_topics(articles) do
     articles
     |> Stream.map(&Map.get(&1, :topics))
-    |> Stream.map(&nest_topics(&1))
-    |> Enum.to_list
+    |> Stream.map(&mapify_topics(&1))
+    |> Enum.reduce(%{}, fn topics_map, acc ->
+      MapUtils.deep_merge(acc, topics_map)
+    end)
   end
 
-  defp nest_topics(topics_list) do
-    topics_list
+  defp mapify_topics(nested_topics) do
+    nested_topics
     |> Enum.reverse
-    |> Enum.reduce([], fn topic, acc -> [topic | [acc]] end)
+    |> Enum.reduce(%{}, fn topic, acc ->
+      Map.put(%{}, topic, acc)
+    end)
   end
 end
diff --git a/test/archivist/archive_test.exs b/test/archivist/archive_test.exs
@@ -61,15 +61,15 @@ defmodule ArchiveTest do
     assert ArchiveMock.topics() == %{
       "Fiction" => %{
         "Sci-Fi" => %{
-          "Classic" => nil
+          "Classic" => %{}
         },
       },
       "Films" => %{
         "Sci-Fi" => %{
-          "Classic" => nil
+          "Classic" => %{}
         },
         "Action" => %{
-          "Crime" => nil
+          "Crime" => %{}
         }
       }
     }