Add abstract validations API + FluentValidations extension

CommandLineParser.Tests/Command/SubCommandTests.cs

@@ -1,6 +1,7 @@
 using MatthiWare.CommandLine;
 using MatthiWare.CommandLine.Abstractions;
 using MatthiWare.CommandLine.Abstractions.Command;
+using MatthiWare.CommandLine.Core;
 using MatthiWare.CommandLine.Core.Attributes;
 using System;
 using System.Linq;
@@ -41,7 +42,7 @@ public void TestSubCommandWorksCorrectlyInModel(bool autoExecute, string bla, in
             Assert.All(result.CommandResults.Select(r => r.Executed), Assert.True);
         }
 
-        private class CustomInstantiator : IContainerResolver
+        private class CustomInstantiator : DefaultContainerResolver
         {
             private readonly ManualResetEventSlim lock1;
             private readonly ManualResetEventSlim lock2;
@@ -60,14 +61,16 @@ public CustomInstantiator(ManualResetEventSlim lock1, ManualResetEventSlim lock2
                 this.n = n;
             }
 
-            public T Resolve<T>()
+            public override T Resolve<T>() => (T)Resolve(typeof(T));
+
+            public override object Resolve(Type type)
             {
-                if (typeof(T) == typeof(MainCommand))
-                    return (T)Activator.CreateInstance(typeof(T), lock1, autoExecute, bla, i, n);
-                else if (typeof(T) == typeof(SubCommand))
-                    return (T)Activator.CreateInstance(typeof(T), lock2, autoExecute, bla, i, n);
+                if (type == typeof(MainCommand))
+                    return Activator.CreateInstance(type, lock1, autoExecute, bla, i, n);
+                else if (type == typeof(SubCommand))
+                    return Activator.CreateInstance(type, lock2, autoExecute, bla, i, n);
                 else
-                    throw new InvalidCastException($"Unable to resolve {(typeof(T)).Name}");
+                    return base.Resolve(type);
             }
         }
 

CommandLineParser.Tests/Parsing/ResolverFactoryTest.cs

@@ -2,6 +2,7 @@
 
 using MatthiWare.CommandLine.Abstractions.Models;
 using MatthiWare.CommandLine.Abstractions.Parsing;
+using MatthiWare.CommandLine.Core;
 using MatthiWare.CommandLine.Core.Parsing;
 using MatthiWare.CommandLine.Core.Parsing.Resolvers;
 
@@ -25,7 +26,7 @@ public enum Output
         [Fact]
         public void ContainsWork()
         {
-            var factory = new DefaultArgumentResolverFactory();
+            var factory = new DefaultArgumentResolverFactory(new DefaultContainerResolver());
 
             Assert.True(factory.Contains<string>());
             Assert.True(factory.Contains<int>());
@@ -39,7 +40,7 @@ public void ContainsWork()
         [Fact]
         public void CreateEnumResolver()
         {
-            var factory = new DefaultArgumentResolverFactory();
+            var factory = new DefaultArgumentResolverFactory(new DefaultContainerResolver());
 
             var output = factory.CreateResolver<Output>();
             var output2 = factory.CreateResolver(typeof(Output));
@@ -59,7 +60,7 @@ public void RegisterAndGet()
             mockResolver.Setup(_ => _.CanResolve(It.IsAny<ArgumentModel>())).Returns(true);
             mockResolver.Setup(_ => _.Resolve(It.IsAny<ArgumentModel>())).Returns(instance);
 
-            var factory = new DefaultArgumentResolverFactory();
+            var factory = new DefaultArgumentResolverFactory(new DefaultContainerResolver());
 
             factory.Register(mockResolver.Object);
 
@@ -79,7 +80,7 @@ public void RegisterOverrideWorks()
         {
             var mockResolver = new Mock<ArgumentResolver<string>>();
 
-            var factory = new DefaultArgumentResolverFactory();
+            var factory = new DefaultArgumentResolverFactory(new DefaultContainerResolver());
 
             factory.Register(typeof(string), mockResolver.Object.GetType(), true);
             factory.Register<string, StringResolver>(true);
@@ -90,7 +91,7 @@ public void RegisterThrowsException()
         {
             var mockResolver = new Mock<ArgumentResolver<string>>();
 
-            var factory = new DefaultArgumentResolverFactory();
+            var factory = new DefaultArgumentResolverFactory(new DefaultContainerResolver());
 
             Assert.Throws<ArgumentException>(() => factory.Register<string, StringResolver>());
         }
@@ -105,7 +106,7 @@ public void RegisterObjectResolver()
             resolver.Setup(_ => _.CanResolve(It.IsAny<ArgumentModel>())).Returns(true);
             resolver.Setup(_ => _.Resolve(It.IsAny<ArgumentModel>())).Returns(obj);
 
-            var factory = new DefaultArgumentResolverFactory();
+            var factory = new DefaultArgumentResolverFactory(new DefaultContainerResolver());
             var dummyArg = new ArgumentModel();
 
             factory.Register(resolver.Object);

CommandLineParser.sln

@@ -18,6 +18,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{9AE7A2BC-8475-4331-9C61-3B5045A1389A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentValidationsExtensions", "Extensions\FluentValidationsExtensions\FluentValidationsExtensions.csproj", "{5B43A461-C8AC-44C0-94D5-DAEE102A5F41}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5046CC21-D258-4313-8866-E952ABB472E4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentValidationsExtensions.Tests", "Extensions\Tests\FluentValidationsExtensions.Tests\FluentValidationsExtensions.Tests.csproj", "{07BCB8B9-AFA2-485B-A01D-EB11FAFD5061}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -36,10 +44,23 @@ Global
 		{6871A016-97E8-48C5-B797-DD0FA3DD6288}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6871A016-97E8-48C5-B797-DD0FA3DD6288}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6871A016-97E8-48C5-B797-DD0FA3DD6288}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B43A461-C8AC-44C0-94D5-DAEE102A5F41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B43A461-C8AC-44C0-94D5-DAEE102A5F41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B43A461-C8AC-44C0-94D5-DAEE102A5F41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B43A461-C8AC-44C0-94D5-DAEE102A5F41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07BCB8B9-AFA2-485B-A01D-EB11FAFD5061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07BCB8B9-AFA2-485B-A01D-EB11FAFD5061}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07BCB8B9-AFA2-485B-A01D-EB11FAFD5061}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07BCB8B9-AFA2-485B-A01D-EB11FAFD5061}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{5B43A461-C8AC-44C0-94D5-DAEE102A5F41} = {9AE7A2BC-8475-4331-9C61-3B5045A1389A}
+		{5046CC21-D258-4313-8866-E952ABB472E4} = {9AE7A2BC-8475-4331-9C61-3B5045A1389A}
+		{07BCB8B9-AFA2-485B-A01D-EB11FAFD5061} = {5046CC21-D258-4313-8866-E952ABB472E4}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CE28B97B-DDE7-41B6-B779-91914BDBCB80}
 	EndGlobalSection

CommandLineParser/Abstractions/IContainerResolver.cs

@@ -1,7 +1,10 @@
-namespace MatthiWare.CommandLine.Abstractions
+using System;
+
+namespace MatthiWare.CommandLine.Abstractions
 {
     public interface IContainerResolver
     {
         T Resolve<T>();
+        object Resolve(Type type);
     }
 }

CommandLineParser/Abstractions/Validations/IValidationResult.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace MatthiWare.CommandLine.Abstractions.Validations
+{
+    public interface IValidationResult
+    {
+        bool IsValid { get; }
+        Exception Error { get; }
+    }
+}

CommandLineParser/Abstractions/Validations/IValidator.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MatthiWare.CommandLine.Abstractions.Validations
+{
+    public interface IValidator
+    {
+        IValidationResult Validate(object @object);
+    }
+}

CommandLineParser/Abstractions/Validations/IValidator`T.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MatthiWare.CommandLine.Abstractions.Validations
+{
+    public interface IValidator<T> : IValidator
+    {
+        IValidationResult Validate(T @object);
+    }
+}

CommandLineParser/Abstractions/Validations/IValidatorsContainer.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MatthiWare.CommandLine.Abstractions.Validations
+{
+    public interface IValidatorsContainer
+    {
+        void AddValidator<TKey>(IValidator<TKey> validator);
+        void AddValidator(Type key, IValidator validator);
+
+        void AddValidator<TKey, V>() where V : IValidator<TKey>;
+        void AddValidator(Type key, Type validator);
+
+        bool HasValidatorFor<TKey>();
+        bool HasValidatorFor(Type type);
+
+        IReadOnlyCollection<IValidator> GetValidators<TKey>();
+        IReadOnlyCollection<IValidator> GetValidators(Type key);
+    }
+}

CommandLineParser/Abstractions/Validations/ValidationConfigurationBase.cs

@@ -0,0 +1,12 @@
+namespace MatthiWare.CommandLine.Abstractions.Validations
+{
+    public abstract class ValidationConfigurationBase
+    {
+        protected IValidatorsContainer Validators { get; private set; }
+
+        public ValidationConfigurationBase(IValidatorsContainer validators)
+        {
+            Validators = validators;
+        }
+    }
+}

CommandLineParser/CommandLineParser.csproj

@@ -4,18 +4,21 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>MatthiWare.CommandLine</RootNamespace>
     <PackageId>MatthiWare.CommandLineParser</PackageId>
-    <Version>0.2.3</Version>
+    <Version>0.2.4</Version>
     <Authors>Matthias Beerens</Authors>
     <Company>MatthiWare</Company>
     <Product>Command Line Parser</Product>
-    <Description>Command Line Parser for .Net Core</Description>
+    <Description>Command Line Parser for .NET Core written in .NET Standard</Description>
     <PackageProjectUrl>https://github.com/MatthiWare/CommandLineParser.Core</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/MatthiWare/CommandLineParser.Core/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl></PackageLicenseUrl>
     <RepositoryUrl>https://github.com/MatthiWare/CommandLineParser.Core</RepositoryUrl>
-    <PackageTags>Commandline parser</PackageTags>
+    <PackageTags>Commandline parser commandline-parser cli</PackageTags>
     <LangVersion>7.3</LangVersion>
-    <AssemblyVersion>0.2.3.0</AssemblyVersion>
-    <FileVersion>0.2.3.0</FileVersion>
+    <AssemblyVersion>0.2.4.0</AssemblyVersion>
+    <FileVersion>0.2.4.0</FileVersion>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageReleaseNotes>Validation API added, general bugfixes and improvements</PackageReleaseNotes>
+    <Copyright>Copyright Matthias Beerens 2018</Copyright>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -32,4 +35,11 @@
     <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>

CommandLineParser/CommandLineParser.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>MatthiWare.CommandLineParser</id>
-    <version>0.2.3</version>
+    <version>0.2.4</version>
     <title>CommandLineParser.Core</title>
     <authors>Matthias Beerens</authors>
     <owners>Matthiee</owners>
@@ -21,6 +21,7 @@
   <tags>commandline parser commandline-parser</tags>
   </metadata>
   <files>
+    <file src="CommandLineParser.dll" target="lib\netstandard2.0" />
     <file src=".\CommandLineParser.xml" target="lib\netstandard2.0" />
   </files>
 </package>