Merge pull request #55 from drozdoff/skip_nil_child_elements

Ignore nils in child elements list
joshnuss · Apr 15, 2022 · 5b5ae47 · 5b5ae47
2 parents 3a1ae4e + a5bfdae
commit 5b5ae47
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/xml_builder.ex b/lib/xml_builder.ex
@@ -110,7 +110,7 @@ defmodule XmlBuilder do
     do: element({name})
 
   def element(list) when is_list(list),
-    do: Enum.map(list, &element/1)
+    do: list |> Enum.reject(&is_nil/1) |> Enum.map(&element/1)
 
   def element({name}),
     do: element({name, nil, nil})
@@ -122,7 +122,7 @@ defmodule XmlBuilder do
     do: element({name, nil, content})
 
   def element({name, attrs, content}) when is_list(content),
-    do: {name, attrs, Enum.map(content, &element/1)}
+    do: {name, attrs, element(content)}
 
   def element({name, attrs, content}),
     do: {name, attrs, content}

diff --git a/test/xml_builder_test.exs b/test/xml_builder_test.exs
@@ -254,6 +254,12 @@ defmodule XmlBuilderTest do
 
         assert doc([{:first_name, "Josh"}, {:last_name, "Nussbaum"}]) ==
                  ~s|<?xml version="1.0" encoding="UTF-8"?>\n<first_name>Josh</first_name>\n<last_name>Nussbaum</last_name>|
+
+        assert doc([:first_name, :middle_name, :last_name]) ==
+                 ~s|<?xml version="1.0" encoding="UTF-8"?>\n<first_name/>\n<middle_name/>\n<last_name/>|
+
+        assert doc([:first_name, nil, :last_name]) ==
+                 ~s|<?xml version="1.0" encoding="UTF-8"?>\n<first_name/>\n<last_name/>|
       end)
 
     assert warning =~ "doc/1 is deprecated. Use document/1 with generate/1 instead."