Use List.key*/*, re-organize tests

keyfind/keystore didn't really improve things that much, so using
keytake/prepend as originally suggested

Author: voughtdq

lib/ex_doc/markdown/earmark.ex

@@ -82,34 +82,35 @@ defmodule ExDoc.Markdown.Earmark do
           blockquote_meta}
        )
        when tag in ["h3", "h4"] do
-    {h_classes, h_attrs} = Enum.split_with(h_attrs, &match?({"class", _}, &1))
-
     h_admonition =
-      with [{"class", classes}] <- h_classes,
+      with {{"class", classes}, attrs} <- List.keytake(h_attrs, "class", 0),
            class_list <- String.split(classes),
            adm_classes = [_ | _] <- Enum.filter(class_list, &(&1 in @admonition_classes)) do
-        {Enum.join(adm_classes, " "), classes}
+        {"admonition " <> Enum.join(adm_classes, " "),
+         [{"class", "admonition-title #{classes}"} | attrs]}
       else
-        [] -> nil
+        _ -> nil
       end
 
-    blockquote_attrs_fn = fn admonition_classes ->
-      case Enum.split_with(blockquote_attrs, &match?({"class", _}, &1)) do
-        {[], attrs} ->
-          [{"class", admonition_classes}, {"role", "note"} | attrs]
+    section_attrs_fn = fn admonition_classes ->
+      {classes, attrs} =
+        case List.keytake(blockquote_attrs, "class", 0) do
+          nil ->
+            {admonition_classes, blockquote_attrs}
 
-        {[{"class", classes}], attrs} ->
-          classes = String.trim_trailing(classes) <> " #{admonition_classes}"
-          [{"class", classes}, {"role", "note"} | attrs]
-      end
+          {{"class", classes}, attrs} ->
+            {"#{admonition_classes} #{classes}", attrs}
+        end
+
+      [{"role", "note"}, {"class", classes} | attrs]
     end
 
     if h_admonition do
-      {h_admonition_classes, h_classes} = h_admonition
-      blockquote_attrs = blockquote_attrs_fn.("admonition #{h_admonition_classes}")
-      h_elem = {tag, [{"class", "admonition-title #{h_classes}"} | h_attrs], h_content, h_meta}
+      {admonition_classes, h_attrs} = h_admonition
+      section_attrs = section_attrs_fn.(admonition_classes)
+      h_elem = {tag, h_attrs, h_content, h_meta}
 
-      fixup({"section", blockquote_attrs, [h_elem | rest], blockquote_meta})
+      fixup({"section", section_attrs, [h_elem | rest], blockquote_meta})
     else
       # regular blockquote, copied fixup/1 here to avoid infinite loop
       {:blockquote, Enum.map(blockquote_attrs, &fixup_attr/1), fixup(ast), blockquote_meta}

test/ex_doc/markdown/earmark_test.exs

@@ -75,20 +75,7 @@ defmodule ExDoc.Markdown.EarmarkTest do
              ]
     end
 
-    test "converts blockquote admonitions to regular divs" do
-      info = """
-      > #### Info {: .info .ignore}
-      > This is info.
-      """
-
-      assert Markdown.to_ast(info, []) == [
-               {:section, [class: "admonition info", role: "note"],
-                [
-                  {:h4, [class: "admonition-title ignore info"], ["Info"], %{}},
-                  {:p, [], ["This is info."], %{}}
-                ], %{}}
-             ]
-
+    test "leaves blockquotes with the wrong markup as is" do
       not_admonition = """
       > ### H3 {: .xyz}
       > This is NOT an admonition!
@@ -102,18 +89,80 @@ defmodule ExDoc.Markdown.EarmarkTest do
                 ], %{}}
              ]
 
+      no_h_tag_beginning = """
+      > {: .warning}
+      > #### Warning {: .warning}
+      > This blockquote didn't start with the h4 tag, so it wasn't converted.
+      """
+
+      assert Markdown.to_ast(no_h_tag_beginning, []) == [
+               {:blockquote, [],
+                [
+                  {:p, [], ["{: .warning}"], %{}},
+                  {:h4, [class: "warning"], ["Warning"], %{}},
+                  {:p, [],
+                   ["This blockquote didn't start with the h4 tag, so it wasn't converted."], %{}}
+                ], %{}}
+             ]
+    end
+
+    test "converts blockquotes with the appropriate markup to admonition sections" do
+      info = """
+      > #### Info {: .info .ignore}
+      > This is info.
+      """
+
+      assert [
+               {:section, section_attrs,
+                [
+                  {:h4, h_attrs, ["Info"], %{}},
+                  {:p, [], ["This is info."], %{}}
+                ], %{}}
+             ] = Markdown.to_ast(info, [])
+
+      assert section_attrs[:role] == "note"
+      assert section_attrs[:class] == "admonition info"
+
+      assert h_attrs[:class] == "admonition-title ignore info"
+
       warning_error = """
       > ### Warning! Error! {: .warning .error}
       > A warning and an error.
       """
 
-      assert Markdown.to_ast(warning_error, []) == [
-               {:section, [class: "admonition error warning", role: "note"],
+      assert [
+               {:section, section_attrs,
                 [
-                  {:h3, [class: "admonition-title error warning"], ["Warning! Error!"], %{}},
+                  {:h3, h_attrs, ["Warning! Error!"], %{}},
                   {:p, [], ["A warning and an error."], %{}}
                 ], %{}}
-             ]
+             ] = Markdown.to_ast(warning_error, [])
+
+      assert section_attrs[:role] == "note"
+      assert section_attrs[:class] == "admonition error warning"
+
+      assert h_attrs[:class] == "admonition-title error warning"
+
+      with_blockquote_level_attrs = """
+      > ### Eggs and baskets  {: .tip}
+      > Don't put all your eggs in one basket, especially if they're golden.
+      {: .egg-basket-bg #egg-basket-tip}
+      """
+
+      assert [
+               {:section, section_attrs,
+                [
+                  {:h3, h_attrs, ["Eggs and baskets"], %{}},
+                  {:p, [],
+                   ["Don't put all your eggs in one basket, especially if they're golden."], %{}}
+                ], %{}}
+             ] = Markdown.to_ast(with_blockquote_level_attrs, [])
+
+      assert section_attrs[:role] == "note"
+      assert section_attrs[:class] == "admonition tip egg-basket-bg"
+      assert section_attrs[:id] == "egg-basket-tip"
+
+      assert h_attrs[:class] == "admonition-title tip"
     end
 
     test "keeps math syntax without interpreting math as markdown" do