✨

hlaueriksson · Apr 10, 2022 · 1955858 · 1955858
1 parent 99920c6
commit 1955858
Show file tree

Hide file tree

Showing 17 changed files with 97 additions and 15 deletions.
diff --git a/nuget-local.bat b/nuget-local.bat
@@ -1,3 +1,3 @@
 nuget init .\src\GEmojiSharp\bin\Release\ .\packages
+nuget init .\src\GEmojiSharp.AspNetCore\bin\Release\ .\packages
 nuget init .\src\GEmojiSharp.Blazor\bin\Release\ .\packages
-nuget init .\src\GEmojiSharp.TagHelpers\bin\Release\ .\packages
diff --git a/samples/GEmojiSharp.Sample.Web/GEmojiSharp.Sample.Web.csproj b/samples/GEmojiSharp.Sample.Web/GEmojiSharp.Sample.Web.csproj
@@ -8,12 +8,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GEmojiSharp.TagHelpers" Version="1.5.0" />
     <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.6.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.161" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\GEmojiSharp.AspNetCore\GEmojiSharp.AspNetCore.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/samples/GEmojiSharp.Sample.Web/Pages/Component.cshtml b/samples/GEmojiSharp.Sample.Web/Pages/Component.cshtml
@@ -1,5 +1,5 @@
 @page
-@using GEmojiSharp.TagHelpers
+@using GEmojiSharp.AspNetCore
 @using Microsoft.AspNetCore.Mvc.Razor.TagHelpers
 @inject ITagHelperComponentManager manager;
 @model GEmojiSharp.Sample.Web.Pages.ComponentModel

diff --git a/samples/GEmojiSharp.Sample.Web/Pages/Index.cshtml b/samples/GEmojiSharp.Sample.Web/Pages/Index.cshtml
@@ -33,4 +33,9 @@
     <div><emoji>@Model.Text</emoji></div>
     <div><span emoji="@Model.Emoji" /></div>
 
+    <hr />
+
+    <div>@Html.Emoji(":octopus: :heavy_plus_sign: :cat2: ⩵ :heart:")</div>
+    <div>@Html.Emoji(x => x.Text)</div>
+
 </div>
diff --git a/samples/GEmojiSharp.Sample.Web/Pages/_ViewImports.cshtml b/samples/GEmojiSharp.Sample.Web/Pages/_ViewImports.cshtml
@@ -1,4 +1,5 @@
 @using GEmojiSharp.Sample.Web
 @namespace GEmojiSharp.Sample.Web.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@addTagHelper *, GEmojiSharp.TagHelpers
+@addTagHelper *, GEmojiSharp.AspNetCore
+@using GEmojiSharp.AspNetCore
diff --git a/....AspNetCore/TagHelpers/EmojiExtensions.cs → ...GEmojiSharp.AspNetCore/EmojiExtensions.cs b/....AspNetCore/TagHelpers/EmojiExtensions.cs → ...GEmojiSharp.AspNetCore/EmojiExtensions.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace GEmojiSharp.AspNetCore.TagHelpers
+namespace GEmojiSharp.AspNetCore
 {
     /// <summary>
     /// Extension methods for working with emoji markup.

diff --git a/src/GEmojiSharp.AspNetCore/GEmojiSharp.AspNetCore.csproj b/src/GEmojiSharp.AspNetCore/GEmojiSharp.AspNetCore.csproj
@@ -15,10 +15,10 @@
 ⩵
 ❤️ :heart:
     </Description>
-    <PackageId>GEmojiSharp.TagHelpers</PackageId>
+    <PackageId>GEmojiSharp.AspNetCore</PackageId>
     <PackageProjectUrl>https://github.com/hlaueriksson/GEmojiSharp</PackageProjectUrl>
     <PackageIcon>icon.png</PackageIcon>
-    <PackageTags>emoji;gemoji;aspnetcore;aspnetcoremvc;taghelper;taghelpers</PackageTags>
+    <PackageTags>emoji;gemoji;aspnetcore;aspnetcoremvc;taghelper;taghelpers;htmlhelper;htmlhelpers</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
@@ -30,6 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.2.0" />
   </ItemGroup>
 

diff --git a/src/GEmojiSharp.AspNetCore/HtmlHelpers/HtmlHelperExtensions.cs b/src/GEmojiSharp.AspNetCore/HtmlHelpers/HtmlHelperExtensions.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Linq.Expressions;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace GEmojiSharp.AspNetCore
+{
+    /// <summary>
+    /// Emoji extensions for <see cref="IHtmlHelper"/> and <see cref="IHtmlHelper{TModel}"/>.
+    /// </summary>
+    public static class HtmlHelperExtensions
+    {
+        /// <summary>
+        /// Returns emojified HTML markup for the content.
+        /// </summary>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper"/> instance this method extends.</param>
+        /// <param name="content">The content.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        public static IHtmlContent Emoji(this IHtmlHelper htmlHelper, string content) =>
+            new HtmlString(content.MarkupContent());
+
+        /// <summary>
+        /// Returns emojified HTML markup for the <paramref name="expression"/>.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="htmlHelper">The <see cref="IHtmlHelper{TModel}"/> instance this method extends.</param>
+        /// <param name="expression">An expression to be evaluated against the current model.</param>
+        /// <returns>A new <see cref="IHtmlContent"/> containing the created HTML.</returns>
+        public static IHtmlContent Emoji<TModel>(this IHtmlHelper<TModel> htmlHelper, Expression<Func<TModel, string>> expression)
+        {
+            if (htmlHelper == null)
+            {
+                throw new ArgumentNullException(nameof(htmlHelper));
+            }
+
+            if (expression == null)
+            {
+                throw new ArgumentNullException(nameof(expression));
+            }
+
+            Func<TModel, string> func = expression.Compile();
+
+            return new HtmlString(func(htmlHelper.ViewData.Model).MarkupContent());
+        }
+    }
+}
diff --git a/src/GEmojiSharp.AspNetCore/TagHelpers/BodyTagHelperComponent.cs b/src/GEmojiSharp.AspNetCore/TagHelpers/BodyTagHelperComponent.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace GEmojiSharp.AspNetCore.TagHelpers
+namespace GEmojiSharp.AspNetCore
 {
     /// <summary>
     /// <see cref="ITagHelper"/> implementation targeting <![CDATA[<body>]]> elements.

diff --git a/src/GEmojiSharp.AspNetCore/TagHelpers/EmojiAttributeTagHelper.cs b/src/GEmojiSharp.AspNetCore/TagHelpers/EmojiAttributeTagHelper.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace GEmojiSharp.AspNetCore.TagHelpers
+namespace GEmojiSharp.AspNetCore
 {
     /// <summary>
     /// <see cref="ITagHelper"/> implementation targeting elements with an <c>emoji</c> attribute.

diff --git a/src/GEmojiSharp.AspNetCore/TagHelpers/EmojiTagHelper.cs b/src/GEmojiSharp.AspNetCore/TagHelpers/EmojiTagHelper.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace GEmojiSharp.AspNetCore.TagHelpers
+namespace GEmojiSharp.AspNetCore
 {
     /// <summary>
     /// <see cref="ITagHelper"/> implementation targeting <![CDATA[<emoji>]]> elements.

diff --git a/...etCore/TagHelpers/EmojiExtensionsTests.cs → ....Tests/AspNetCore/EmojiExtensionsTests.cs b/...etCore/TagHelpers/EmojiExtensionsTests.cs → ....Tests/AspNetCore/EmojiExtensionsTests.cs
@@ -1,8 +1,8 @@
 using FluentAssertions;
-using GEmojiSharp.AspNetCore.TagHelpers;
+using GEmojiSharp.AspNetCore;
 using NUnit.Framework;
 
-namespace GEmojiSharp.Tests.AspNetCore.TagHelpers
+namespace GEmojiSharp.Tests.AspNetCore
 {
     public class EmojiExtensionsTests
     {

diff --git a/tests/GEmojiSharp.Tests/AspNetCore/HtmlHelpers/EmojiExtensionsTests.cs b/tests/GEmojiSharp.Tests/AspNetCore/HtmlHelpers/EmojiExtensionsTests.cs
@@ -0,0 +1,25 @@
+using FluentAssertions;
+using GEmojiSharp.AspNetCore;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace GEmojiSharp.Tests.AspNetCore.HtmlHelpers
+{
+    public class HtmlHelperExtensionsTests
+    {
+        [Test]
+        public void Emoji()
+        {
+            var subject = Substitute.For<IHtmlHelper>();
+
+            subject.Emoji("<p>Hello, :earth_africa:</p>").ToString().Should().Be(@"<p>Hello, <g-emoji class=""g-emoji"" alias=""earth_africa"" fallback-src=""https://github.githubassets.com/images/icons/emoji/unicode/1f30d.png"">🌍</g-emoji></p>");
+            subject.Emoji("<p>Hello, :fail:</p>").ToString().Should().Be(@"<p>Hello, :fail:</p>");
+
+            subject.Emoji("<textarea>Hello, :earth_africa:</textarea>").ToString().Should().Be(@"<textarea>Hello, 🌍</textarea>");
+            subject.Emoji(@"<input type=""text"" value=""Hello, :earth_africa:"">").ToString().Should().Be(@"<input type=""text"" value=""Hello, 🌍"">");
+
+            subject.Emoji("<body><form><div>:book: :pencil2:<br /><textarea>:heart: :+1:</textarea></div></form></body>").ToString().Should().Be(@"<body><form><div><g-emoji class=""g-emoji"" alias=""book"" fallback-src=""https://github.githubassets.com/images/icons/emoji/unicode/1f4d6.png"">📖</g-emoji> <g-emoji class=""g-emoji"" alias=""pencil2"" fallback-src=""https://github.githubassets.com/images/icons/emoji/unicode/270f.png"">✏️</g-emoji><br /><textarea>❤️ 👍</textarea></div></form></body>");
+        }
+    }
+}
diff --git a/tests/GEmojiSharp.Tests/AspNetCore/TagHelpers/BodyTagHelperComponentTests.cs b/tests/GEmojiSharp.Tests/AspNetCore/TagHelpers/BodyTagHelperComponentTests.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using FluentAssertions;
-using GEmojiSharp.AspNetCore.TagHelpers;
+using GEmojiSharp.AspNetCore;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using NUnit.Framework;
 

diff --git a/tests/GEmojiSharp.Tests/AspNetCore/TagHelpers/EmojiAttributeTagHelperTests.cs b/tests/GEmojiSharp.Tests/AspNetCore/TagHelpers/EmojiAttributeTagHelperTests.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using FluentAssertions;
-using GEmojiSharp.AspNetCore.TagHelpers;
+using GEmojiSharp.AspNetCore;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using NUnit.Framework;
 

diff --git a/tests/GEmojiSharp.Tests/AspNetCore/TagHelpers/EmojiTagHelperTests.cs b/tests/GEmojiSharp.Tests/AspNetCore/TagHelpers/EmojiTagHelperTests.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using FluentAssertions;
-using GEmojiSharp.AspNetCore.TagHelpers;
+using GEmojiSharp.AspNetCore;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using NUnit.Framework;
 

diff --git a/tests/GEmojiSharp.Tests/GEmojiSharp.Tests.csproj b/tests/GEmojiSharp.Tests/GEmojiSharp.Tests.csproj
@@ -7,6 +7,7 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.5.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="NSubstitute" Version="4.3.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
       <PrivateAssets>all</PrivateAssets>