Merge pull request #112 from MrDave1999/feature/issue_111

Added conversion of properties to `UpperCaseSnakeCase`
MrDave1999 · Nov 17, 2022 · bd0041a · bd0041a
2 parents 6c4040f + bec6844
commit bd0041a
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 6 deletions.
diff --git a/src/Binder/EnvBinder.cs b/src/Binder/EnvBinder.cs
@@ -1,3 +1,4 @@
+using System.Text;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -42,19 +43,22 @@ public TSettings Bind<TSettings>() where TSettings : new()
         /// <inheritdoc />
         public TSettings Bind<TSettings>(out EnvValidationResult result) where TSettings : new()
         {
-            var settings = new TSettings();
-            var type = typeof(TSettings);
-            result = _validationResult;
+            var sb         = new StringBuilder(capacity: 40);
+            var envVars    = _configuration.EnvVars;
+            var settings   = new TSettings();
+            var type       = typeof(TSettings);
             var properties = _configuration.BindNonPublicProperties ? type.GetPublicAndNonPublicProperties() : type.GetProperties();
+            result         = _validationResult;
             foreach (PropertyInfo property in properties)
             {
                 if(IsReadOnlyOrWriteOnly(property)) 
                     continue;
 
                 var envKeyAttribute = (EnvKeyAttribute)Attribute.GetCustomAttribute(property, typeof(EnvKeyAttribute));
-                var variableName = envKeyAttribute is not null ? envKeyAttribute.Name : property.Name;
-                var retrievedValue = _configuration.EnvVars[variableName];
-
+                var variableName    = envKeyAttribute is not null ? envKeyAttribute.Name : property.Name;
+                var retrievedValue  = envVars[variableName];
+                retrievedValue    ??= envKeyAttribute is not null ? retrievedValue : envVars[variableName.ToUpperCaseSnakeCase(sb)];
+                sb.Clear();
                 if (retrievedValue is null)
                 {
                     string errorMsg;

diff --git a/src/Extensions/StringExtensions.cs b/src/Extensions/StringExtensions.cs
@@ -36,5 +36,21 @@ public static bool EndsWith(this string str, char value)
             int len = str.Length;
             return len != 0 && str[len - 1] == value;
         }
+
+        /// <summary>
+        /// Converts from PascalCase to UpperCaseSnakeCase.
+        /// </summary>
+        /// <param name="str"></param>
+        /// <param name="sb"></param>
+        /// <returns></returns>
+        public static string ToUpperCaseSnakeCase(this string str, StringBuilder sb)
+        {
+            int len = str.Length;
+            sb.Append(str[0]);
+            for (int i = 1; i < len; i++)
+                sb.Append(char.IsUpper(str[i]) ? $"_{str[i]}" : char.ToUpper(str[i]));
+
+            return sb.ToString();
+        }
     }
 }
diff --git a/tests/Binder/AppSettings.cs b/tests/Binder/AppSettings.cs
@@ -16,6 +16,11 @@ public class AppSettings
     private string IgnoredProperty { get; set; }
 }
 
+public class SettingsExample0
+{
+    public string RealKey { get; set; }
+}
+
 public class SettingsExample1
 {
     public string SecretKey { get; set; }

diff --git a/tests/Binder/EnvBinderTests.cs b/tests/Binder/EnvBinderTests.cs
@@ -3,6 +3,16 @@ namespace DotEnv.Core.Tests.Binder;
 [TestClass]
 public class EnvBinderTests
 {
+    [TestMethod]
+    public void Bind_WhenPropertyNameDoesNotMatchRealKey_ShouldReturnSettingsInstance()
+    {
+        SetEnvironmentVariable("REAL_KEY", "1234D");
+
+        var settings = new EnvBinder().Bind<SettingsExample0>();
+
+        Assert.AreEqual(expected: "1234D",  actual: settings.RealKey);
+    }
+
     [TestMethod]
     public void Bind_WhenPropertiesAreLinkedToTheDefaultProviderInstance_ShouldReturnSettingsInstance()
     {