Merge pull request #53 from guibranco/develop

Develop
guibranco · Aug 4, 2020 · 715434d · 715434d
2 parents 402b03d + 4d139ac
commit 715434d
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 31 deletions.
diff --git a/Src/CrispyWaffle/Composition/ServiceLocator.cs b/Src/CrispyWaffle/Composition/ServiceLocator.cs
@@ -67,7 +67,7 @@ static ServiceLocator()
                          .CurrentDomain
                          .GetAssemblies()
                          .SelectMany(a => a.GetTypes())
-                         .Where(a => a != null && a.Name.IndexOf(@"_canon", StringExtensions.Comparison) == -1)
+                         .Where(a => a != null && a.Name.IndexOf(@"_canon", StringComparison.InvariantCultureIgnoreCase) == -1)
                          .ToList();
             var cancellationToken = typeof(CancellationToken);
             RegistrationsCalls.Add(cancellationToken, 0);

diff --git a/Src/CrispyWaffle/Extensions/ConversionExtensions.cs b/Src/CrispyWaffle/Extensions/ConversionExtensions.cs
@@ -38,7 +38,7 @@ public static byte[] ToBytes(this IEnumerable<string> input)
         /// <returns>The given data converted to a Boolean.</returns>
         public static bool ToBoolean(this string str, string validValueForTrue = "S")
         {
-            return str != null && str.Equals(validValueForTrue, StringExtensions.Comparison);
+            return str != null && str.Equals(validValueForTrue, StringComparison.InvariantCultureIgnoreCase);
         }
 
         /// <summary>
@@ -175,7 +175,7 @@ public static int ToInt32(this string input)
                 return 0;
             }
 
-            var success = int.TryParse(input, NumberStyles.Number, StringExtensions.Culture, out var result);
+            var success = int.TryParse(input, NumberStyles.Number, CultureInfo.CurrentCulture, out var result);
 
             return success ? result : 0;
         }
@@ -192,7 +192,7 @@ public static long ToInt64(this string input)
                 return 0;
             }
 
-            var success = long.TryParse(input, NumberStyles.Number, StringExtensions.Culture, out var result);
+            var success = long.TryParse(input, NumberStyles.Number, CultureInfo.CurrentCulture, out var result);
 
             return success ? result : 0;
         }
@@ -209,7 +209,7 @@ public static decimal ToDecimal(this string input)
                 return 0M;
             }
 
-            return decimal.TryParse(input, NumberStyles.Number, StringExtensions.Culture, out var result)
+            return decimal.TryParse(input, NumberStyles.Number, CultureInfo.CurrentCulture, out var result)
                 ? result
                 : 0M;
         }
@@ -301,13 +301,13 @@ public static bool TryParseBrazilianPhoneNumber(this string number, ref PhoneNum
                 return false;
             }
 
-            var prefix = dirty.Substring(0, 1).Equals(@"0", StringExtensions.Comparison) &&
+            var prefix = dirty.Substring(0, 1).Equals(@"0", StringComparison.InvariantCultureIgnoreCase) &&
                          (dirtyLength == 11 || dirtyLength == 12)
                              ? dirty.Substring(1, 2)
                              : dirty.Substring(0, 2);
 
             var hasNineDigits = dirty.Substring(dirtyLength - 9, 1)
-                                     .Equals(@"9", StringExtensions.Comparison);
+                                     .Equals(@"9", StringComparison.InvariantCultureIgnoreCase);
 
             var allowedDigits = hasNineDigits ? 9 : 8;
 

diff --git a/Src/CrispyWaffle/Extensions/EnumExtensions.cs b/Src/CrispyWaffle/Extensions/EnumExtensions.cs
@@ -37,8 +37,8 @@ public static T GetEnumByHumanReadableAttribute<T>(string humanReadableValue)
                     })
                 .Where(item =>
                     item.Attr != null &&
-                    item.Attr.StringValue.Equals(humanReadableValue, StringExtensions.Comparison) ||
-                    item.Field.Name.Equals(humanReadableValue, StringExtensions.Comparison))
+                    item.Attr.StringValue.Equals(humanReadableValue, StringComparison.InvariantCultureIgnoreCase) ||
+                    item.Field.Name.Equals(humanReadableValue, StringComparison.InvariantCultureIgnoreCase))
                 .Select(item => item.Field)
                 .SingleOrDefault();
             if (field == null)
@@ -82,8 +82,8 @@ public static T GetEnumByInternalValueAttribute<T>(string internalValue)
                     })
                 .Where(item =>
                     item.Attr != null &&
-                    item.Attr.InternalValue.Equals(internalValue, StringExtensions.Comparison) ||
-                    item.Field.Name.Equals(internalValue, StringExtensions.Comparison))
+                    item.Attr.InternalValue.Equals(internalValue, StringComparison.InvariantCultureIgnoreCase) ||
+                    item.Field.Name.Equals(internalValue, StringComparison.InvariantCultureIgnoreCase))
                 .Select(item => item.Field)
                 .SingleOrDefault();
             if (field == null)

diff --git a/Src/CrispyWaffle/Extensions/StringExtensions.cs b/Src/CrispyWaffle/Extensions/StringExtensions.cs
@@ -4,7 +4,6 @@
     using System;
     using System.Collections.Generic;
     using System.Diagnostics.Contracts;
-    using System.Globalization;
     using System.IO;
     using System.Linq;
     using System.Text;
@@ -16,16 +15,6 @@
     /// </summary>
     public static class StringExtensions
     {
-        /// <summary>
-        /// The culture
-        /// </summary>
-        public static readonly CultureInfo Culture = CultureInfo.GetCultureInfo("en-US");
-
-        /// <summary>
-        /// The comparison
-        /// </summary>
-        public static readonly StringComparison Comparison = StringComparison.InvariantCultureIgnoreCase;
-
         /// <summary>
         /// Replaces the non alphanumeric.
         /// </summary>
@@ -197,6 +186,7 @@ public static string ToUcWords(this string input)
         public static string UcWords(this string[] input, string[] toUpper, string[] toLower)
         {
             var result = new StringBuilder();
+
             if (!input.Any())
             {
                 return string.Empty;
@@ -205,6 +195,7 @@ public static string UcWords(this string[] input, string[] toUpper, string[] toL
             foreach (var s in input)
             {
                 result.Append(@" ");
+
                 if (toUpper.Contains(s.ToUpper()))
                 {
                     result.Append(s.ToUpper());
@@ -218,6 +209,7 @@ public static string UcWords(this string[] input, string[] toUpper, string[] toL
                     result.Append(s.ToCamelCase());
                 }
             }
+
             return result.ToString();
         }
 

diff --git a/Src/CrispyWaffle/Extensions/TypeExtensions.cs b/Src/CrispyWaffle/Extensions/TypeExtensions.cs
@@ -190,7 +190,7 @@ public static string GetCallingMethod(int frame = 1, bool excludeBegin = true)
                 return method.Name;
             }
 
-            if (excludeBegin && ns.StartsWith(@"CrispyWaffle", StringExtensions.Comparison))
+            if (excludeBegin && ns.StartsWith(@"CrispyWaffle", StringComparison.InvariantCultureIgnoreCase))
             {
                 ns = ns.Substring(13);
             }

diff --git a/Src/CrispyWaffle/Log/Handlers/DefaultExceptionHandler.cs b/Src/CrispyWaffle/Log/Handlers/DefaultExceptionHandler.cs
@@ -91,7 +91,7 @@ private static bool GetNamespace(MethodBase method, out string category)
                 return false;
             }
 
-            if (ns.StartsWith(@"CrispyWaffle.", StringExtensions.Comparison))
+            if (ns.StartsWith(@"CrispyWaffle.", StringComparison.InvariantCultureIgnoreCase))
             {
                 ns = ns.Substring(13);
             }

diff --git a/Src/CrispyWaffle/Log/LogConsumer.cs b/Src/CrispyWaffle/Log/LogConsumer.cs
@@ -128,7 +128,7 @@ private static bool GetNamespace(MethodBase method, out string category)
                 return false;
             }
 
-            if (ns.StartsWith(@"CrispyWaffle.", StringExtensions.Comparison))
+            if (ns.StartsWith(@"CrispyWaffle.", StringComparison.InvariantCultureIgnoreCase))
             {
                 ns = ns.Substring(13);
             }

diff --git a/Src/CrispyWaffle/Utilities/QueryStringBuilder.cs b/Src/CrispyWaffle/Utilities/QueryStringBuilder.cs
@@ -199,7 +199,7 @@ public QueryStringBuilder AddFromType<T>(T instance, bool convertCamelCaseToUnde
                     propertyName = string.Concat(propertyName.Select((x, i) => i > 0 && char.IsUpper(x) ? @"_" + x.ToString(CultureInfo.InvariantCulture).ToLower() : x.ToString(CultureInfo.InvariantCulture)));
                 }
 
-                if (propertyName.StartsWith(type.Name, StringExtensions.Comparison))
+                if (propertyName.StartsWith(type.Name, StringComparison.InvariantCultureIgnoreCase))
                 {
                     propertyName = $@"{type.Name.ToLower()}[{propertyName.Substring(type.Name.Length + (convertCamelCaseToUnderscore ? 1 : 0))}]";
                 }

diff --git a/Src/CrispyWaffle/Validations/PersonalDataValidation.cs b/Src/CrispyWaffle/Validations/PersonalDataValidation.cs
@@ -1,4 +1,6 @@
-namespace CrispyWaffle.Validations
+using System.Globalization;
+
+namespace CrispyWaffle.Validations
 {
     using Extensions;
     using System.Text.RegularExpressions;
@@ -83,7 +85,7 @@ private static int CalculateModule11(string working, int[] multiplier)
 
             for (var i = 0; i < multiplier.Length; i++)
             {
-                sum += working[i].ToString(StringExtensions.Culture).ToInt32() * multiplier[i];
+                sum += working[i].ToString(CultureInfo.CurrentCulture).ToInt32() * multiplier[i];
             }
 
             var rest = sum % 11;
@@ -121,7 +123,7 @@ public static string CalculateBrazilianPersonDocumentDigits(this string document
 
             var rest = CalculateModule11(working, multiplierA);
 
-            var digit = rest.ToString(StringExtensions.Culture);
+            var digit = rest.ToString(CultureInfo.CurrentCulture);
 
             working = string.Concat(working, digit);
 
@@ -159,7 +161,7 @@ public static string CalculateBrazilianCorporationDocument(this string document)
 
             var rest = CalculateModule11(working, multiplierA);
 
-            var digit = rest.ToString(StringExtensions.Culture);
+            var digit = rest.ToString(CultureInfo.CurrentCulture);
 
             working = string.Concat(working, digit);
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.3.{build}
+version: 2.0.{build}
 skip_tags: true
 image: Visual Studio 2019
 configuration: Release