Swap to Markdown (#30)

wbaldoumas · Jan 3, 2022 · 381f58d · 381f58d
1 parent f131cfb
commit 381f58d
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 24 deletions.
diff --git a/src/Coding.Blog/Client/Coding.Blog.Client.csproj b/src/Coding.Blog/Client/Coding.Blog.Client.csproj
@@ -9,8 +9,9 @@
 	<ItemGroup>
     <PackageReference Include="Grpc.Net.Client.Web" Version="2.41.0" />
     <PackageReference Include="Grpc.Net.ClientFactory" Version="2.41.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
+    <PackageReference Include="Markdig" Version="0.26.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.1" PrivateAssets="all" />
     <PackageReference Include="TaskTupleAwaiter" Version="2.0.0" />
   </ItemGroup>
 

diff --git a/src/Coding.Blog/Client/Pages/PostDetails.razor b/src/Coding.Blog/Client/Pages/PostDetails.razor
@@ -5,6 +5,7 @@
 @using Coding.Blog.Engine
 @using Coding.Blog.Engine.Clients
 @using Coding.Blog.Engine.Extensions
+@using Markdig
 
 <div class="container mb-3">
     @if (_selectedPost is null)
@@ -36,7 +37,7 @@
             </div>
             <div class="row">
                 <div class="col">
-                    <div>@(new MarkupString(_selectedPost!.Content))</div>
+                    <div>@GeneratePostMarkup(_selectedPost.Content)</div>
                 </div>
             </div>
             <div class="row justify-content-between">
@@ -97,4 +98,15 @@
     }
 
     private void NavigateToMain() => _navigationManager.NavigateTo("blog");
+
+    private static MarkupString GeneratePostMarkup(string markdown)
+    {
+        var pipeline = new MarkdownPipelineBuilder()
+            .UseAdvancedExtensions()
+            .Build();
+
+        var result = Markdown.ToHtml(markdown, pipeline);
+
+        return new MarkupString(result);
+    }
 }
diff --git a/src/Coding.Blog/Engine/Clients/CosmicRequestRegistry.cs b/src/Coding.Blog/Engine/Clients/CosmicRequestRegistry.cs
@@ -9,6 +9,6 @@ internal static class CosmicRequestRegistry
     public static readonly IDictionary<string, CosmicRequest> Requests = new Dictionary<string, CosmicRequest>
     {
         { typeof(CosmicBooks).FullName!, new CosmicRequest("books", "title,content,metadata,created_at") },
-        { typeof(CosmicPosts).FullName!, new CosmicRequest("posts", "id,slug,title,content,metadata,created_at") },
+        { typeof(CosmicPosts).FullName!, new CosmicRequest("posts", "id,slug,title,metadata,created_at") },
     };
 }
diff --git a/src/Coding.Blog/Engine/Mappers/PostMapper.cs b/src/Coding.Blog/Engine/Mappers/PostMapper.cs
@@ -10,7 +10,7 @@ public override Post Map(CosmicPost source) => new()
         Id = source.Id,
         Slug = source.Slug,
         Title = source.Title,
-        Content = source.Content,
+        Content = source.Metadata.Markdown,
         DatePublished = Timestamp.FromDateTime(source.DatePublished),
         Tags =
         {

diff --git a/src/Coding.Blog/Engine/Records/CosmicPosts.cs b/src/Coding.Blog/Engine/Records/CosmicPosts.cs
@@ -10,14 +10,14 @@ public record CosmicPost(
     [property: JsonProperty("id")] string Id,
     [property: JsonProperty("slug")] string Slug,
     [property: JsonProperty("title")] string Title,
-    [property: JsonProperty("content")] string Content,
     [property: JsonProperty("created_at")] DateTime DatePublished,
     [property: JsonProperty("metadata")] CosmicPostMetadata Metadata
 );
 
 public record CosmicPostMetadata(
     [property: JsonProperty("hero")] CosmicPostHero Hero,
-    [property: JsonProperty("tags")] string Tags
+    [property: JsonProperty("tags")] string Tags,
+    [property: JsonProperty("markdown")] string Markdown
 );
 
 public record CosmicPostHero(

diff --git a/src/Coding.Blog/Server/Coding.Blog.Server.csproj b/src/Coding.Blog/Server/Coding.Blog.Server.csproj
@@ -13,7 +13,7 @@
 	<ItemGroup>
 		<PackageReference Include="Grpc.AspNetCore" Version="2.41.0" />
 		<PackageReference Include="Grpc.AspNetCore.Web" Version="2.41.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.1" />
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
 	</ItemGroup>
 

diff --git a/src/Tests/Coding.Blog.UnitTests/Coding.Blog.UnitTests.csproj b/src/Tests/Coding.Blog.UnitTests/Coding.Blog.UnitTests.csproj
@@ -9,12 +9,12 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="FluentAssertions" Version="6.2.0" />
+		<PackageReference Include="FluentAssertions" Version="6.3.0" />
 		<PackageReference Include="Grpc.Core.Testing" Version="2.42.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
 		<PackageReference Include="NSubstitute" Version="4.2.2" />
 		<PackageReference Include="NUnit" Version="3.13.2" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Tests/Coding.Blog.UnitTests/Mappers/PostMapperTests.cs b/src/Tests/Coding.Blog.UnitTests/Mappers/PostMapperTests.cs
@@ -22,17 +22,20 @@ public void Map_generates_expected_post()
             "12345",
             "test-post",
             "Test Post",
-            "This is some content talking about Test Post",
             mockDatePublished,
-            new CosmicPostMetadata(new CosmicPostHero("https://google.com/a", "https://google.com/b"), "tag1, tag2, tag3")
+            new CosmicPostMetadata(
+                new CosmicPostHero("https://google.com/a", "https://google.com/b"),
+                "tag1, tag2, tag3",
+                "This is some markdown for Test Post"
+            )
         );
 
         var expectedPost = new Post
         {
             Id = "12345",
             Slug = "test-post",
             Title = "Test Post",
-            Content = "This is some content talking about Test Post",
+            Content = "This is some markdown for Test Post",
             DatePublished = Timestamp.FromDateTime(mockDatePublished),
             Tags = { new List<string> { "tag1", "tag2", "tag3" } },
             Hero = new Hero
@@ -61,18 +64,24 @@ public void Map_generates_expected_posts()
             "12345",
             "test-post-a",
             "Test Post A",
-            "This is some content talking about Test Post A",
             mockDatePublished,
-            new CosmicPostMetadata(new CosmicPostHero("https://google.com/a", "https://google.com/b"), string.Empty)
+            new CosmicPostMetadata(
+                new CosmicPostHero("https://google.com/a", "https://google.com/b"),
+                string.Empty,
+                "This is some markdown talking about Test Post A"
+            )
         );
 
         var cosmicPostB = new CosmicPost(
             "123456",
             "test-post-b",
             "Test Post B",
-            "This is some content talking about Test Post B",
             mockDatePublished,
-            new CosmicPostMetadata(new CosmicPostHero("https://google.com/b", "https://google.com/c"), "tag1, tag2, tag3")
+            new CosmicPostMetadata(
+                new CosmicPostHero("https://google.com/b", "https://google.com/c"),
+                "tag1, tag2, tag3",
+                "This is some markdown talking about Test Post B"
+            )
         );
 
         var cosmicPosts = new List<CosmicPost>
@@ -86,7 +95,7 @@ public void Map_generates_expected_posts()
             Id = "12345",
             Slug = "test-post-a",
             Title = "Test Post A",
-            Content = "This is some content talking about Test Post A",
+            Content = "This is some markdown talking about Test Post A",
             DatePublished = Timestamp.FromDateTime(mockDatePublished),
             Tags = { new List<string>() },
             Hero = new Hero
@@ -101,7 +110,7 @@ public void Map_generates_expected_posts()
             Id = "123456",
             Slug = "test-post-b",
             Title = "Test Post B",
-            Content = "This is some content talking about Test Post B",
+            Content = "This is some markdown talking about Test Post B",
             DatePublished = Timestamp.FromDateTime(mockDatePublished),
             Tags = { new List<string> { "tag1", "tag2", "tag3" } },
             Hero = new Hero

diff --git a/src/Tests/Coding.Blog.UnitTests/Services/PostsServiceTests.cs b/src/Tests/Coding.Blog.UnitTests/Services/PostsServiceTests.cs
@@ -45,17 +45,23 @@ public async Task PostsService_generates_expected_response_when_posts_exist()
                     "12345",
                     "test-post-a",
                     "Test Post A",
-                    "This is some content talking about Test Post A",
                     mockDatePublished,
-                    new CosmicPostMetadata(new CosmicPostHero("https://google.com/a", "https://google.com/b"), string.Empty)
+                    new CosmicPostMetadata(
+                        new CosmicPostHero("https://google.com/a", "https://google.com/b"), 
+                        string.Empty,
+                        "This is some markdown talking about Test Post A"
+                        )
                 ),
                 new(
                     "123456",
                     "test-post-b",
                     "Test Post B",
-                    "This is some content talking about Test Post B",
                     mockDatePublished,
-                    new CosmicPostMetadata(new CosmicPostHero("https://google.com/b", "https://google.com/c"), string.Empty)
+                    new CosmicPostMetadata(
+                        new CosmicPostHero("https://google.com/b", "https://google.com/c"), 
+                        string.Empty,
+                        "This is some markdown talking about Test Post B"
+                        )
                 )
             }
         );
@@ -69,7 +75,7 @@ public async Task PostsService_generates_expected_response_when_posts_exist()
             Id = source.Id,
             Slug = source.Slug,
             Title = source.Title,
-            Content = source.Content,
+            Content = source.Metadata.Markdown,
             DatePublished = Timestamp.FromDateTime(source.DatePublished),
             Hero = new Hero
             {
@@ -138,6 +144,7 @@ public async Task PostsService_generates_expected_response_when_posts_do_not_exi
             .GetAsync()
             .Returns(mockCosmicPostsClientResponse);
 
+        // ReSharper disable once CollectionNeverUpdated.Local
         var mockPostMapperResponse = new List<Post>();
 
         _mockPostMapper