Added missing StringUtils. Also, resolved the errors in the InlineSvgTagHelperTests file by adding nulls in place of the newly added dependencies within the constructor.

Author: AndyBoot

Our.Umbraco.TagHelpers.Tests/InlineSvgTagHelperTests.cs

@@ -41,7 +41,7 @@ public void Setup()
         [Test]
         public void NoOutputIfNoMediaOrFileSet()
         {
-            var tagHelper = new InlineSvgTagHelper(null, null, null);
+            var tagHelper = new InlineSvgTagHelper(null, null, null, null, null);
 
             tagHelper.Process(_context, _output);
 
@@ -52,7 +52,7 @@ public void NoOutputIfNoMediaOrFileSet()
         public void NoOutputIfBothMediaAndFileSet()
         {
             var umbContent = Mock.Of<IPublishedContent>(c => c.ContentType.ItemType == PublishedItemType.Media);
-            var tagHelper = new InlineSvgTagHelper(null, null, null)
+            var tagHelper = new InlineSvgTagHelper(null, null, null, null, null)
             {
                 FileSource = "test.svg",
                 MediaItem = umbContent
@@ -66,7 +66,7 @@ public void NoOutputIfBothMediaAndFileSet()
         [Test]
         public void NoOutputIfFileNotSvg()
         {
-            var tagHelper = new InlineSvgTagHelper(null, null, null)
+            var tagHelper = new InlineSvgTagHelper(null, null, null, null, null)
             {
                 FileSource = "test.notsvg"
             };
@@ -82,7 +82,7 @@ public void NoOutputIfFileNotFound()
             var fileProvider = new Mock<IFileProvider>();
             fileProvider.Setup(p => p.GetFileInfo(It.IsAny<string>())).Returns(Mock.Of<IFileInfo>(f => !f.Exists));
             var hostEnv = Mock.Of<IWebHostEnvironment>(e => e.WebRootFileProvider == fileProvider.Object);
-            var tagHelper = new InlineSvgTagHelper(null, hostEnv, null)
+            var tagHelper = new InlineSvgTagHelper(null, hostEnv, null, null, null)
             {
                 FileSource = "test.svg"
             };
@@ -98,7 +98,7 @@ public void ExpectedOutputIfValidFile()
             var fileProvider = new Mock<IFileProvider>();
             fileProvider.Setup(p => p.GetFileInfo(It.IsAny<string>())).Returns(Mock.Of<IFileInfo>(f => f.Exists && f.CreateReadStream() == new MemoryStream(Encoding.UTF8.GetBytes("test svg"))));
             var hostEnv = Mock.Of<IWebHostEnvironment>(e => e.WebRootFileProvider == fileProvider.Object);
-            var tagHelper = new InlineSvgTagHelper(null, hostEnv, null)
+            var tagHelper = new InlineSvgTagHelper(null, hostEnv, null, null, null)
             {
                 FileSource = "test.svg"
             };
@@ -116,7 +116,7 @@ public void NoOutputIfMediaUrlNull()
         {
             var urlProvider = new Mock<IPublishedUrlProvider>();
             urlProvider.Setup(p => p.GetMediaUrl(It.IsAny<IPublishedContent>(), It.IsAny<UrlMode>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns((string)null!);
-            var tagHelper = new InlineSvgTagHelper(null, null, urlProvider.Object)
+            var tagHelper = new InlineSvgTagHelper(null, null, urlProvider.Object, null, null)
             {
                 MediaItem = Mock.Of<IPublishedContent>(c => c.ContentType.ItemType == PublishedItemType.Media)
             };
@@ -132,7 +132,7 @@ public void NoOutputIfMediaNotSvg()
             var umbContent = Mock.Of<IPublishedContent>(c => c.ContentType.ItemType == PublishedItemType.Media);
             var urlProvider = new Mock<IPublishedUrlProvider>();
             urlProvider.Setup(p => p.GetMediaUrl(umbContent, It.IsAny<UrlMode>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns("test.notsvg");
-            var tagHelper = new InlineSvgTagHelper(null, null, urlProvider.Object)
+            var tagHelper = new InlineSvgTagHelper(null, null, urlProvider.Object, null, null)
             {
                 MediaItem = umbContent
             };
@@ -152,7 +152,9 @@ public void NoOutputIfMediaNotFound()
             var tagHelper = new InlineSvgTagHelper(
                 new MediaFileManager(fileSystem, null, null, null, null, Mock.Of<IOptions<ContentSettings>>()),
                 null,
-                urlProvider.Object)
+                urlProvider.Object, 
+                null, 
+                null)
             {
                 MediaItem = umbContent
             };
@@ -172,7 +174,9 @@ public void ExpectedOutputIfValidMedia()
             var tagHelper = new InlineSvgTagHelper(
                 new MediaFileManager(fileSystem, null, null, null, null, Mock.Of<IOptions<ContentSettings>>()),
                 null,
-                urlProvider.Object)
+                urlProvider.Object, 
+                null, 
+                null)
             {
                 MediaItem = umbContent
             };
@@ -193,7 +197,7 @@ public void SanitizesJavascript()
                 .Setup(p => p.GetFileInfo(It.IsAny<string>()))
                 .Returns(Mock.Of<IFileInfo>(f => f.Exists && f.CreateReadStream() == new MemoryStream(Encoding.UTF8.GetBytes("<a xlink:href=\"javascript:alert('test');\">Click here</a><script attr=\"test\">test</script>end"))));
             var hostEnv = Mock.Of<IWebHostEnvironment>(e => e.WebRootFileProvider == fileProvider.Object);
-            var tagHelper = new InlineSvgTagHelper(null, hostEnv, null)
+            var tagHelper = new InlineSvgTagHelper(null, hostEnv, null, null, null)
             {
                 FileSource = "test.svg"
             };

Our.Umbraco.TagHelpers/Utils/StringUtils.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Our.Umbraco.TagHelpers.Utils
+{
+    internal static class StringUtils
+    {
+        internal static double GetDouble(object value, double defaultValue = 0)
+        {
+            double num;
+            if (!IsDouble(value))
+            {
+                return defaultValue;
+            }
+            try
+            {
+                num = Convert.ToDouble(value);
+            }
+            catch
+            {
+                num = defaultValue;
+            }
+            return num;
+        }
+
+        internal static decimal GetDecimal(object input, decimal defaultValue = 0)
+        {
+            decimal value = decimal.MinValue;
+            decimal.TryParse(input != null ? input.ToString().Replace("£", "") : "", out value);
+
+            if (value > decimal.MinValue)
+            {
+                return value;
+            }
+
+            return defaultValue;
+        }
+
+        internal static int GetInteger(object input, int defaultValue = 0)
+        {
+            var value = 0;
+            int.TryParse(input != null ? input.ToString() : "", out value);
+
+            if (value > 0)
+            {
+                return value;
+            }
+
+            return defaultValue;
+        }
+
+        internal static bool IsDouble(object value)
+        {
+            double num;
+            if (IsNull(value))
+            {
+                return false;
+            }
+            if (value is double)
+            {
+                return true;
+            }
+            string str = Convert.ToString(value);
+            if (double.TryParse(str, out num))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        internal static bool IsNull(object value)
+        {
+            if (value == null)
+            {
+                return true;
+            }
+            return value == DBNull.Value;
+        }
+    }
+}