chore: additional unit tests and refactor

Author: swagfin

ObjectSemantics.NET.Tests/EnumerableLoopTests.cs

@@ -140,5 +140,20 @@ public void Should_Map_Array_Of_String_With_Formatting()
             string expectedResult = " MORGAN  GEORGE  JANE ";
             Assert.Equal(expectedResult, generatedTemplate, false, true, true);
         }
+
+        [Theory]
+        [InlineData(@"{{ #foreach(MyFriends)  }}[{{ .:uppercase }}]{{ #endforeach }}")]
+        [InlineData(@"{{# foreach(MyFriends)  }}[{{ .:uppercase }}]{{# endforeach }}")]
+        [InlineData(@"{{ #foreach(MyFriends)  }}[{{ .:uppercase }}]{{  #endforeach }}")]
+        public void Should_Evaluate_ForEach_Having_Spaces_Before_And_After_Parentheses(string template)
+        {
+            Person person = new Person
+            {
+                MyFriends = new string[] { "Morgan", "George" }
+            };
+
+            string result = person.Map(template);
+            Assert.Equal("[MORGAN][GEORGE]", result);
+        }
     }
 }

ObjectSemantics.NET.Tests/IfConditionTests.cs

@@ -130,5 +130,21 @@ public void Should_Render_Multiple_If_Condition_Statements(int age, string expec
             string result = person.Map(template);
             Assert.Equal(expected, result);
         }
+
+
+        [Theory]
+        [InlineData(@"{{#if(MyCars==0)}}Zero Cars{{#else}}Hmmm!{{#endif}}")]
+        [InlineData(@"{{# if (MyCars==0)}}Zero Cars{{ # else }}Hmmm!{{ # endif}}")]
+        [InlineData(@"{{ #if(MyCars==0) }}Zero Cars{{ #endif }}")]
+        public void Should_Evaluate_If_Having_Spaces_Before_And_After_Parentheses(string template)
+        {
+            Person person = new Person
+            {
+                MyCars = null
+            };
+
+            string result = person.Map(template);
+            Assert.Equal("Zero Cars", result);
+        }
     }
 }

ObjectSemantics.NET/Engine/EngineAlgorithim.cs

@@ -15,8 +15,7 @@ internal static class EngineAlgorithim
     {
         private static readonly ConcurrentDictionary<Type, PropertyInfo[]> PropertyCache = new ConcurrentDictionary<Type, PropertyInfo[]>();
 
-        private static readonly Regex IfConditionRegex = new Regex(@"{{\s*#if\s*\(\s*(?<param>\w+)\s*(?<operator>==|!=|>=|<=|>|<)\s*(?<value>[^)]+)\s*\)\s*}}(?<code>[\s\S]*?)(?:{{\s*#else\s*}}(?<else>[\s\S]*?))?{{\s*#endif\s*}}", RegexOptions.IgnoreCase | RegexOptions.Compiled);
-
+        private static readonly Regex IfConditionRegex = new Regex(@"{{\s*#\s*if\s*\(\s*(?<param>\w+)\s*(?<operator>==|!=|>=|<=|>|<)\s*(?<value>[^)]+?)\s*\)\s*}}(?<code>[\s\S]*?)(?:{{\s*#\s*else\s*}}(?<else>[\s\S]*?))?{{\s*#\s*endif\s*}}", RegexOptions.IgnoreCase | RegexOptions.Compiled);
         private static readonly Regex LoopBlockRegex = new Regex(@"{{\s*#\s*foreach\s*\(\s*(\w+)\s*\)\s*\}\}([\s\S]*?)\{\{\s*#\s*endforeach\s*}}", RegexOptions.IgnoreCase | RegexOptions.Compiled);
         private static readonly Regex DirectParamRegex = new Regex(@"{{(.+?)}}", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 

ObjectSemantics.NET/Engine/Extensions/StringBuilderExtensions.cs

@@ -0,0 +1,37 @@
+using System.Text;
+
+namespace ObjectSemantics.NET.Engine.Extensions
+{
+    public static class StringBuilderExtensions
+    {
+        public static StringBuilder ReplaceFirstOccurrence(this StringBuilder sb, string search, string replace)
+        {
+            if (sb == null || string.IsNullOrEmpty(search))
+                return sb;
+
+            int len = sb.Length - search.Length + 1;
+            for (int i = 0; i < len; i++)
+            {
+                bool match = true;
+                for (int j = 0; j < search.Length; j++)
+                {
+                    if (sb[i + j] != search[j])
+                    {
+                        match = false;
+                        break;
+                    }
+                }
+
+                if (match)
+                {
+                    sb.Remove(i, search.Length);
+                    sb.Insert(i, replace);
+                    break;
+                }
+            }
+
+            return sb;
+        }
+
+    }
+}

ObjectSemantics.NET/Engine/Extensions/StringExtensions.cs

@@ -5,21 +5,6 @@ namespace ObjectSemantics.NET.Engine.Extensions
 {
     internal static class StringExtensions
     {
-        public static StringBuilder ReplaceFirstOccurrence(this StringBuilder sb, string search, string replace)
-        {
-            if (sb == null || string.IsNullOrEmpty(search))
-                return sb;
-
-            int pos = sb.ToString().IndexOf(search, StringComparison.Ordinal);
-            if (pos < 0)
-                return sb;
-
-            sb.Remove(pos, search.Length);
-            sb.Insert(pos, replace);
-
-            return sb;
-        }
-
         public static string ReplaceFirstOccurrence(this string text, string search, string replace)
         {
             int pos = text.IndexOf(search);