Merge pull request #320 from gregsdennis/logic-v3.1.2

Logic v3.1.2
gregsdennis · Aug 16, 2022 · 102b671 · 102b671
2 parents c991aa2 + 089018f
commit 102b671
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/JsonLogic.Tests/GithubTests.cs b/JsonLogic.Tests/GithubTests.cs
@@ -1,4 +1,5 @@
-using System.Text.Json;
+using System.Globalization;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using Json.Logic.Rules;
 using Json.More;
@@ -138,4 +139,22 @@ public void Issue313_VarEqualsNull()
 
 		Assert.IsTrue(result.IsEquivalentTo(true));
 	}
+
+	[Test]
+	public void Issue318_CanParseStringAsFloatingPointNumberInAnyCulture()
+	{
+		var culture = CultureInfo.CurrentCulture;
+
+		try
+		{
+			CultureInfo.CurrentCulture = new CultureInfo("de-AT");
+			var number = JsonValue.Create("3.14").Numberify();
+
+			Assert.AreEqual(3.14d, number);
+		}
+		finally
+		{
+			CultureInfo.CurrentCulture = culture;
+		}
+	}
 }
diff --git a/JsonLogic/JsonLogic.csproj b/JsonLogic/JsonLogic.csproj
@@ -15,9 +15,9 @@
 		<PackageTags>json logic json-logic jsonlogic</PackageTags>
 		<PackageReleaseNotes>https://gregsdennis.github.io/json-everything/release-notes/json-logic.html</PackageReleaseNotes>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<Version>3.1.1</Version>
+		<Version>3.1.2</Version>
 		<AssemblyVersion>3.0.0.0</AssemblyVersion>
-		<FileVersion>3.1.1.0</FileVersion>
+		<FileVersion>3.1.2.0</FileVersion>
 		<DocumentationFile>JsonLogic.xml</DocumentationFile>
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>

diff --git a/JsonLogic/JsonNodeExtensions.cs b/JsonLogic/JsonNodeExtensions.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text.Json.Nodes;
 using Json.More;
@@ -93,7 +94,7 @@ public static bool IsTruthy(this JsonNode? node)
 
 		if (node is not JsonValue value) return null;
 
-		if (value.TryGetValue(out string? s)) return decimal.TryParse(s, out var d) ? d : null;
+		if (value.TryGetValue(out string? s)) return decimal.TryParse(s, NumberStyles.Any, CultureInfo.InvariantCulture.NumberFormat, out var d) ? d : null;
 
 		if (value.TryGetValue(out bool b)) return b ? 1 : 0;
 

diff --git a/json-everything.net/wwwroot/md/release-notes/json-logic.md b/json-everything.net/wwwroot/md/release-notes/json-logic.md
@@ -1,4 +1,8 @@
-# 3.1.0 (no PR)
+# [3.1.2](https://github.com/gregsdennis/json-everything/pull/320)
+
+[#318](https://github.com/gregsdennis/json-everything/issues/318)/[#319](https://github.com/gregsdennis/json-everything/pull/319) - Conversions to numbers shouldn't be culture-dependent.  Thanks to [@warappa](https://github.com/warappa) for reporting and fixing this.
+
+# 3.1.1 (no PR)
 
 [#313](https://github.com/gregsdennis/json-everything/issues/313) - Deserialization of nulls resulted in an actual null rule instead of a variable rule with a null value.  Thanks to [@jhspinpanel](https://github.com/jhspinpanel) for reporting this.