2.4.13

Author: StefH

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.4.13 (01 March 2025)
+- [#122](https://github.com/Handlebars-Net/Handlebars.Net.Helpers/pull/122) - Adding compare helpers to the Object helpers [enhancement] contributed by [fabianosuet](https://github.com/fabianosuet)
+- [#121](https://github.com/Handlebars-Net/Handlebars.Net.Helpers/issues/121) - Add generic object compare helpers to the ObjectHelpers [enhancement]
+
 # 2.4.12 (20 February 2025)
 - [#115](https://github.com/Handlebars-Net/Handlebars.Net.Helpers/pull/115) - Add New Features to Object and DateTime Helpers contributed by [fabianosuet](https://github.com/fabianosuet)
 - [#117](https://github.com/Handlebars-Net/Handlebars.Net.Helpers/pull/117) - Update DateTimeHelper [enhancement] contributed by [StefH](https://github.com/StefH)

Generate-ReleaseNotes.cmd

@@ -1,5 +1,5 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=2.4.12
+SET version=2.4.13
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid documentation duplicate --version %version% --token %GH_TOKEN%

examples/BlazorAppWebAssembly/Pages/Home.razor

@@ -89,6 +89,7 @@ else
             "{{GetEnvironmentVariable \"x\"}}",
             "{{GetEnvironmentVariable \"x\" \"User\"}}",
             "{{GetEnvironmentVariables}}",
+            "{{Object.Equal 1 2}}",
 
             "{{Linq 'test' 'SubString(0, 2)'}}",
             "{{Linq x 'it.AddYears(1)'}}",

examples/ConsoleApp/Program.cs

@@ -124,6 +124,7 @@ static void Main(string[] args)
             "{{GetEnvironmentVariable \"x\"}}",
             "{{GetEnvironmentVariable \"x\" \"User\"}}",
             "{{GetEnvironmentVariables}}",
+            "{{Object.Equal 1 2}}",
 
             "{{Linq 'test' 'SubString(0, 2)'}}",
             "{{Linq x 'it.AddYears(1)'}}",

src/Directory.Build.props

@@ -5,7 +5,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net451;net452;net46;netstandard1.3;netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
-    <VersionPrefix>2.4.12</VersionPrefix>
+    <VersionPrefix>2.4.13</VersionPrefix>
     <LangVersion>12</LangVersion>
     <Nullable>enable</Nullable>
     <Copyright>Copyright © 2020-2025 Stef Heyenrath</Copyright>

src/Handlebars.Net.Helpers/Helpers/ObjectHelpers.cs

@@ -4,12 +4,8 @@
 
 namespace HandlebarsDotNet.Helpers.Helpers;
 
-internal class ObjectHelpers : BaseHelpers, IHelpers
+internal class ObjectHelpers(IHandlebars context) : BaseHelpers(context), IHelpers
 {
-    public ObjectHelpers(IHandlebars context) : base(context)
-    {
-    }
-
     [HandlebarsWriter(WriterType.Value)]
     public object? FormatAsObject(object? value)
     {
@@ -23,53 +19,53 @@ public string ToString(object? value)
     }
 
     [HandlebarsWriter(WriterType.Value, Name = "Object.IsNull")]
-    public bool IsNull(object value)
+    public bool IsNull(object? value)
     {
         return value is null;
     }
 
     [HandlebarsWriter(WriterType.Value, Name = "Object.IsNotNull")]
-    public bool IsNotNull(object value)
+    public bool IsNotNull(object? value)
     {
         return value is not null;
     }
 
     [HandlebarsWriter(WriterType.Value, Name = "Object.Equal")]
-    public bool Equal(object value1, object value2)
+    public bool Equal(object? value1, object? value2)
     {
         if (value1 is null && value2 is null)
         {
             return true;
-        } 
-        
+        }
+
         if (value1 is null ^ value2 is null)
         {
             return false;
         }
-        
+
         return value1!.Equals(value2);
     }
 
     [HandlebarsWriter(WriterType.Value, Name = "Object.NotEqual")]
-    public bool NotEqual(object value1, object value2)
+    public bool NotEqual(object? value1, object? value2)
     {
         if (value1 is null && value2 is null)
         {
             return false;
         }
-        
+
         if (value1 is null ^ value2 is null)
         {
             return true;
         }
 
-        return !value1!.Equals(value2);        
+        return !value1!.Equals(value2);
     }
 
     [HandlebarsWriter(WriterType.Value, Name = "Object.GreaterThan")]
     public bool GreaterThan(object value1, object value2)
     {
-       return CompareTo(value1, value2) > 0;
+        return CompareTo(value1, value2) > 0;
     }
 
     [HandlebarsWriter(WriterType.Value, Name = "Object.GreaterThanEqual")]
@@ -91,7 +87,7 @@ public bool LowerThanEqual(object value1, object value2)
     }
 
     [HandlebarsWriter(WriterType.Value, Name = "Object.CompareTo")]
-    public int CompareTo(object value1, object value2)
+    public int CompareTo(object? value1, object? value2)
     {
         if (value1 is null || value2 is null)
         {

test/Handlebars.Net.Helpers.Tests/Helpers/ObjectHelpersTests.cs

@@ -1,9 +1,8 @@
-using CultureAwareTesting.xUnit;
+using System;
+using CultureAwareTesting.xUnit;
 using FluentAssertions;
 using HandlebarsDotNet.Helpers.Helpers;
 using Moq;
-using Newtonsoft.Json.Linq;
-using System;
 using Xunit;
 
 namespace HandlebarsDotNet.Helpers.Tests.Helpers;
@@ -212,9 +211,9 @@ private bool ActTestCompare(string method, object value1, object value2)
             nameof(ObjectHelpers.Equal) => _sut.Equal(value1, value2),
             nameof(ObjectHelpers.NotEqual) => _sut.NotEqual(value1, value2),
             nameof(ObjectHelpers.GreaterThan) => _sut.GreaterThan(value1, value2),
-            nameof (ObjectHelpers.GreaterThanEqual) => _sut.GreaterThanEqual(value1, value2),
-            nameof (ObjectHelpers.LowerThan) => _sut.LowerThan(value1, value2),
-            nameof (ObjectHelpers.LowerThanEqual) => _sut.LowerThanEqual(value1, value2),
+            nameof(ObjectHelpers.GreaterThanEqual) => _sut.GreaterThanEqual(value1, value2),
+            nameof(ObjectHelpers.LowerThan) => _sut.LowerThan(value1, value2),
+            nameof(ObjectHelpers.LowerThanEqual) => _sut.LowerThanEqual(value1, value2),
 
             _ => throw new ArgumentException("Invalid method name.")
         };
@@ -231,7 +230,7 @@ public CustomObject(int value)
 
         public int CompareTo(object? other)
         {
-            if (other is null || other is not CustomObject comparable)
+            if (other is not CustomObject comparable)
             {
                 return 0;
             }