Merge pull request #25 from pchalamet/develop

Enum support

Author: siywilliams

FluentCommandLineParser.Tests/FluentCommandLineParserTests.cs

@@ -289,47 +289,47 @@ public void Ensure_Negative_Double_Can_Be_Specified_With_Unix_Style()
 
 		#region Enum Option
 
-		//enum TestEnum
-		//{
-		//    Value0 = 0,
-		//    Value1 = 1
-		//}
+        enum TestEnum
+        {
+            Value0 = 0,
+            Value1 = 1
+        }
 
-		//[Test]
-		//public void Ensure_Parser_Calls_The_Callback_With_Expected_Enum_When_Using_Short_option()
-		//{
-		//    const TestEnum expected = TestEnum.Value1;
+        [Test]
+        public void Ensure_Parser_Calls_The_Callback_With_Expected_Enum_When_Using_Short_option()
+        {
+            const TestEnum expected = TestEnum.Value1;
 
-		//    TestEnum actual = TestEnum.Value0;
+            TestEnum actual = TestEnum.Value0;
 
-		//    IFluentCommandLineParser parser = new FluentCommandLineParser();
+            var parser = CreateFluentParser();
 
-		//    parser
-		//        .Setup<TestEnum>("e")
-		//        .Callback(val => actual = val);
+            parser
+                .Setup<TestEnum>('e')
+                .Callback(val => actual = val);
 
-		//    parser.Parse(new[] { "-e", expected.ToString() });
+            parser.Parse(new[] { "-e", expected.ToString().ToLowerInvariant() });
 
-		//    Assert.AreEqual(expected, actual);
-		//}
+            Assert.AreEqual(expected, actual);
+        }
 
-		//[Test]
-		//public void Ensure_Parser_Calls_The_Callback_With_Expected_Enum_When_Using_Long_option()
-		//{
-		//    const TestEnum expected = TestEnum.Value1;
+        [Test]
+        public void Ensure_Parser_Calls_The_Callback_With_Expected_Enum_When_Using_Long_option()
+        {
+            const TestEnum expected = TestEnum.Value1;
 
-		//    TestEnum actual = TestEnum.Value0;
+            TestEnum actual = TestEnum.Value0;
 
-		//    IFluentCommandLineParser parser = new FluentCommandLineParser();
+            var parser = CreateFluentParser();
 
-		//    parser
-		//        .Setup<TestEnum>("e", "enum")
-		//        .Callback(val => actual = val);
+            parser
+                .Setup<TestEnum>("e", "enum")
+                .Callback(val => actual = val);
 
-		//    parser.Parse(new[] { "--enum", expected.ToString() });
+            parser.Parse(new[] { "--enum", expected.ToString().ToLowerInvariant() });
 
-		//    Assert.AreEqual(expected, actual);
-		//}
+            Assert.AreEqual(expected, actual);
+        }
 
 		#endregion Enum Option
 

FluentCommandLineParser/FluentCommandLineParser.csproj

@@ -90,6 +90,7 @@
     <Compile Include="Internals\Parsing\OptionParsers\CommandLineOptionParserFactory.cs" />
     <Compile Include="Internals\Parsing\OptionParsers\DateTimeCommandLineOptionParser.cs" />
     <Compile Include="Internals\Parsing\OptionParsers\DoubleCommandLineOptionParser.cs" />
+    <Compile Include="Internals\Parsing\OptionParsers\EnumCommandLineOptionParser.cs" />
     <Compile Include="Internals\Parsing\OptionParsers\ICommandLineOptionParser.cs" />
     <Compile Include="Internals\Parsing\OptionParsers\Int32CommandLineOptionParser.cs" />
     <Compile Include="Internals\Parsing\OptionParsers\ListCommandLineOptionParser.cs" />

FluentCommandLineParser/Internals/Parsing/OptionParsers/CommandLineOptionParserFactory.cs

@@ -81,7 +81,20 @@ public ICommandLineOptionParser<T> CreateParser<T>()
 		{
 			var type = typeof(T);
 
-			if (!this.Parsers.ContainsKey(type)) throw new UnsupportedTypeException();
+			if (!this.Parsers.ContainsKey(type))
+			{
+				if (! typeof(T).IsEnum)
+				{
+					throw new UnsupportedTypeException();
+				}
+
+				type = typeof(EnumCommandLineOptionParser<T>);
+				if (!this.Parsers.ContainsKey(type))
+				{
+					this.AddOrReplace(new EnumCommandLineOptionParser<T>());
+				}
+				type = typeof(T);
+			}
 
 			return (ICommandLineOptionParser<T>)this.Parsers[type];
 		}

FluentCommandLineParser/Internals/Parsing/OptionParsers/EnumCommandLineOptionParser.cs

@@ -0,0 +1,67 @@
+#region License
+// BoolCommandLineOptionParser.cs
+// Copyright (c) 2013, Simon Williams
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are permitted provide
+// d that the following conditions are met:
+// 
+// Redistributions of source code must retain the above copyright notice, this list of conditions and the
+// following disclaimer.
+// 
+// Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+// the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+// TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+// POSSIBILITY OF SUCH DAMAGE.
+#endregion
+
+using System;
+using System.Linq;
+using Fclp.Internals.Extensions;
+
+namespace Fclp.Internals.Parsing.OptionParsers
+{
+	/// <summary>
+	/// Parser used to convert to <see cref="Enum"/>.
+	/// </summary>
+	/// <remarks>For <see cref="System.Boolean"/> types the value is optional. If no value is provided for the Option then <c>true</c> is returned.</remarks>
+	public class EnumCommandLineOptionParser<T> : ICommandLineOptionParser<T>
+	{
+		/// <summary>
+		/// Parses the specified <see cref="System.String"/> into a <see cref="System.Boolean"/>.
+		/// </summary>
+		/// <param name="parsedOption"></param>
+		/// <returns>
+		/// A <see cref="System.Boolean"/> representing the parsed value.
+		/// The value is optional. If no value is provided then <c>true</c> is returned.
+		/// </returns>
+		public T Parse(ParsedOption parsedOption)
+		{
+			return (T)Enum.Parse(typeof(T), parsedOption.Value, true);
+		}
+
+		/// <summary>
+		/// Determines whether the specified <see cref="System.String"/> can be parsed by this <see cref="ICommandLineOptionParser{T}"/>.
+		/// </summary>
+		/// <param name="parsedOption"></param>
+		/// <returns><c>true</c> if the specified <see cref="System.String"/> can be parsed by this <see cref="ICommandLineOptionParser{T}"/>; otherwise <c>false</c>.</returns>
+		public bool CanParse(ParsedOption parsedOption)
+		{
+			if (parsedOption.Value.IsNullOrWhiteSpace()) return false;
+			if (parsedOption.HasValue == false) return false;
+
+			string value = parsedOption.Value.Trim();
+
+			var items = value.SplitOnWhitespace();
+
+			return items.Count() == 1;
+		}
+	}
+}