From 61e662d08b13582b7567b581a0c3ef407c13e69b Mon Sep 17 00:00:00 2001 From: Kevin F Date: Fri, 15 Jul 2022 13:23:54 +0200 Subject: [PATCH] Fix issue with new implementations :heavy_check_mark: --- src/Nfdi4Plants.Fornax/Loaders.fs | 2 +- .../nfdi-sidebar-element-header.fs | 2 +- tests/Nfdi4Plants.Fornax.Tests/Loaders.Tests.fs | 13 ++----------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/Nfdi4Plants.Fornax/Loaders.fs b/src/Nfdi4Plants.Fornax/Loaders.fs index 88da29a..85c25e1 100644 --- a/src/Nfdi4Plants.Fornax/Loaders.fs +++ b/src/Nfdi4Plants.Fornax/Loaders.fs @@ -65,7 +65,7 @@ module Aux = Fornax.Nfdi4Plants.MarkdigExtensions.Aux.splitKey line |> fun (key, v) -> v - |> Option.map(fun v -> (key, v)) + |> Option.map(fun v -> (key.ToLower(), v)) let internal trimString (str : string) = str.Trim().TrimEnd('"').TrimStart('"') diff --git a/src/Nfdi4Plants.Fornax/MarkdigExtensions/nfdi-sidebar-element-header.fs b/src/Nfdi4Plants.Fornax/MarkdigExtensions/nfdi-sidebar-element-header.fs index d261ee1..c49001c 100644 --- a/src/Nfdi4Plants.Fornax/MarkdigExtensions/nfdi-sidebar-element-header.fs +++ b/src/Nfdi4Plants.Fornax/MarkdigExtensions/nfdi-sidebar-element-header.fs @@ -12,7 +12,7 @@ module internal Aux = let splitKey (line: string) = let seperatorIndex = line.IndexOf(':') if seperatorIndex > 0 then - let key = line.[.. seperatorIndex - 1].Trim().ToLower() + let key = line.[.. seperatorIndex - 1].Trim() let value = line.[seperatorIndex + 1 ..].Trim() key, Some value else diff --git a/tests/Nfdi4Plants.Fornax.Tests/Loaders.Tests.fs b/tests/Nfdi4Plants.Fornax.Tests/Loaders.Tests.fs index c0763f1..b663832 100644 --- a/tests/Nfdi4Plants.Fornax.Tests/Loaders.Tests.fs +++ b/tests/Nfdi4Plants.Fornax.Tests/Loaders.Tests.fs @@ -138,16 +138,7 @@ author: {name: Kevin Frey, github: https://github.com/Freymaurer, orcid: 0000-00 let docs = Docs.createFromConfig config Expect.equal docs.authors [|Author.create "Kevin Frey" (Some "https://github.com/Freymaurer") (Some "0000-0002-8510-6810")|] "" } - test "config_author_jsonObj" { - let test_case = """--- -title: My awesome title -author: {name: Kevin Frey, github: https://github.com/Freymaurer, orcid: 0000-0002-8510-6810 } ----""" - let config = getConfig test_case - let docs = Docs.createFromConfig config - Expect.equal docs.authors [|Author.create "Kevin Frey" (Some "https://github.com/Freymaurer") (Some "0000-0002-8510-6810")|] "" - } - test "config_authors" { + test "config_authors_mixed" { let test_case = """--- title: My awesome title author: John Doe @@ -161,7 +152,7 @@ author: {name: Kevin Frey, github: https://github.com/Freymaurer, orcid: 0000-00 |] Expect.equal docs.authors expected "" } - test "config_authors_multiple_JSON" { + test "config_authors_multipleMixed" { let test_case = """--- title: My awesome title author: {name: John Doe, github: https://github.com/JohnDoe, orcid: 0000-0000-0000-0000}