Tidy

Author: colinangusmackay

src/Example/Program.cs

@@ -13,7 +13,15 @@ static void Main()
             var config = BuildConfig();
 
             ServiceCollection services = new ServiceCollection();
-            services.AddShortCodeGenerator<SequentialCodeGenerator>(config);
+            services.AddShortCodeGenerator<SequentialCodeGenerator>(options =>
+            {
+                options.Pattern = new[]
+                {
+                    new PatternOptions(NamedCharacterSpaces.UpperLatinLetters, 3),
+                    new PatternOptions("-"),
+                    new PatternOptions(NamedCharacterSpaces.Digits, 3),
+                };
+            });
 
             ServiceProvider provider = services.BuildServiceProvider();
             var factory = provider.GetRequiredService<IShortCodeFactory>();

src/Stravaig.ShortCode.DependencyInjection/PatternOptionsExtensions.cs

@@ -2,7 +2,7 @@ namespace Stravaig.ShortCode.DependencyInjection
 {
     internal static class PatternOptionsExtensions
     {
-        public static PatternPart ToPatternPart(this ShortCodeOptions.PatternOptions options)
+        public static PatternPart ToPatternPart(this PatternOptions options)
         {
             if (options.Type == PatternType.Fixed)
                 return new PatternPart(options.FixedString);

src/Stravaig.ShortCode/Internal/StringExtensions.cs

@@ -0,0 +1,21 @@
+using System;
+
+namespace Stravaig.ShortCode.Internal
+{
+    internal static class StringExtensions
+    {
+        private const int CharacterSpaceMinLength = 2;
+
+        internal static void ValidateCharacterSpace(this string characterSpace)
+        {
+            if (string.IsNullOrWhiteSpace(characterSpace))
+                throw new ArgumentException(
+                    "The value cannot be, null, Empty or contain whitespace.",
+                    nameof(characterSpace));
+            if (characterSpace.Length < CharacterSpaceMinLength)
+                throw new ArgumentException(
+                    $"The value must contain at least {CharacterSpaceMinLength} characters.",
+                    nameof(characterSpace));
+        }
+    }
+}

src/Stravaig.ShortCode/PatternOptions.cs

@@ -0,0 +1,42 @@
+using Stravaig.ShortCode.Internal;
+
+namespace Stravaig.ShortCode
+{
+    public class PatternOptions
+    {
+        private string _characterSpace;
+        public PatternType Type { get; set; }
+
+        public string CharacterSpace
+        {
+            get => _characterSpace;
+            set
+            {
+                value.ValidateCharacterSpace();
+                _characterSpace = value;
+            }
+        }
+            
+        public int Length { get; set; }
+            
+        public string FixedString { get; set; }
+
+        public PatternOptions()
+        {
+        }
+
+        public PatternOptions(string fixedString)
+        {
+            Type = PatternType.Fixed;
+            FixedString = fixedString;
+            Length = fixedString.Length;
+        }
+
+        public PatternOptions(string characterSpace, int length)
+        {
+            Type = PatternType.EncodeIntoCharacterSpace;
+            CharacterSpace = characterSpace;
+            Length = length;
+        }
+    }
+}

src/Stravaig.ShortCode/ShortCodeOptions.cs

@@ -1,32 +1,13 @@
 using System;
 using System.Collections.Generic;
+using Stravaig.ShortCode.Internal;
 
 namespace Stravaig.ShortCode
 {
     public class ShortCodeOptions
     {
-        public class PatternOptions
-        {
-            private string _characterSpace;
-            public PatternType Type { get; set; }
-
-            public string CharacterSpace
-            {
-                get => _characterSpace;
-                set
-                {
-                    ValidateCharacterSpace(value);
-                    _characterSpace = value;
-                }
-            }
-            
-            public int Length { get; set; }
-            
-            public string FixedString { get; set; }
-        }
         private const int AbsoluteMinLength = 1;
         private const int AbsoluteMaxLength = 64;
-        private const int CharacterSpaceMinLength = 2;
 
         private int _maxLength = AbsoluteMaxLength;
         private int? _fixedLength;
@@ -37,22 +18,12 @@ public string CharacterSpace
             get => _characterSpace;
             set
             {
-                ValidateCharacterSpace(value);
+                value.ValidateCharacterSpace();
                 _characterSpace = value;
             }
         }
 
-        private static void ValidateCharacterSpace(string value)
-        {
-            if (string.IsNullOrWhiteSpace(value))
-                throw new ArgumentException(
-                    "The value cannot be, null, Empty or contain whitespace.",
-                    nameof(CharacterSpace));
-            if (value.Length < CharacterSpaceMinLength)
-                throw new ArgumentException(
-                    $"The value must contain at least {CharacterSpaceMinLength} characters.",
-                    nameof(CharacterSpace));
-        }
+
 
         public int MaxLength
         {