Default collection formatter not throwing exception

release_notes.md

@@ -1,5 +1,7 @@
 ###In Development
 
+ - [#392](https://github.com/MehdiK/Humanizer/issues/392): Default implementation for collection formatter using regular style instead of an exception. Default separator is ampercent.
+
 [Commits](https://github.com/MehdiK/Humanizer/compare/v1.34.0...master)
 
 ###v1.34.0 - 2015-03-04

src/Humanizer.Tests/Localisation/DefaultFormatterTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.Threading;
 using Humanizer.Localisation;
 using Humanizer.Localisation.Formatters;
 using Xunit;
@@ -20,5 +21,25 @@ public void TimeSpanHumanizeThrowsExceptionForTimeUnitsLargerThanWeek(TimeUnit t
         {
             Assert.Throws<ArgumentOutOfRangeException>(() => new DefaultFormatter(CultureInfo.InvariantCulture.Name).TimeSpanHumanize(timeUnit, unit));
         }
+
+        [Fact]
+        public void Issue_392_A_collection_formatter_for_the_current_culture_has_not_been_implemented_yet()
+        {
+            var originalCulture = Thread.CurrentThread.CurrentCulture;
+            var originalUiCulture = Thread.CurrentThread.CurrentUICulture;
+
+            Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture("es");
+            Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture("es");
+
+            // start: code from issue report
+            var a = new[] { DateTime.UtcNow, DateTime.UtcNow.AddDays(10) };
+            var b = a.Humanize(); // THROWS!
+            // end: code from issue report
+
+            Assert.Equal(a[0] + " & " + a[1], b);
+
+            Thread.CurrentThread.CurrentCulture = originalCulture;
+            Thread.CurrentThread.CurrentUICulture = originalUiCulture;
+        }
     }
 }

src/Humanizer/Configuration/CollectionFormatterRegistry.cs

@@ -5,16 +5,16 @@ namespace Humanizer.Configuration
     internal class CollectionFormatterRegistry : LocaliserRegistry<ICollectionFormatter>
     {
         public CollectionFormatterRegistry()
-            : base(new DefaultCollectionFormatter())
+            : base(new DefaultCollectionFormatter("&"))
         {
             Register("en", new OxfordStyleCollectionFormatter("and"));
-            Register("it", new RegularStyleCollectionFormatter("e"));
-            Register("de", new RegularStyleCollectionFormatter("und"));
-            Register("dk", new RegularStyleCollectionFormatter("og"));
-            Register("nl", new RegularStyleCollectionFormatter("en"));
-            Register("pt", new RegularStyleCollectionFormatter("e"));
-            Register("nn", new RegularStyleCollectionFormatter("og"));
-            Register("nb", new RegularStyleCollectionFormatter("og"));
+            Register("it", new DefaultCollectionFormatter("e"));
+            Register("de", new DefaultCollectionFormatter("und"));
+            Register("dk", new DefaultCollectionFormatter("og"));
+            Register("nl", new DefaultCollectionFormatter("en"));
+            Register("pt", new DefaultCollectionFormatter("e"));
+            Register("nn", new DefaultCollectionFormatter("og"));
+            Register("nb", new DefaultCollectionFormatter("og"));
         }
     }
 }

src/Humanizer/Humanizer.csproj

@@ -53,7 +53,6 @@
     <Compile Include="CollectionHumanizeExtensions.cs" />
     <Compile Include="Configuration\CollectionFormatterRegistry.cs" />
     <Compile Include="Localisation\CollectionFormatters\DefaultCollectionFormatter.cs" />
-    <Compile Include="Localisation\CollectionFormatters\RegularStyleCollectionFormatter.cs" />
     <Compile Include="Localisation\CollectionFormatters\ICollectionFormatter.cs" />
     <Compile Include="Localisation\CollectionFormatters\OxfordStyleCollectionFormatter.cs" />
     <Compile Include="Localisation\Formatters\SerbianFormatter.cs" />

src/Humanizer/Localisation/CollectionFormatters/DefaultCollectionFormatter.cs

@@ -1,12 +1,18 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Humanizer.Localisation.CollectionFormatters
 {
     class DefaultCollectionFormatter : ICollectionFormatter
     {
         protected String DefaultSeparator = "";
 
+        public DefaultCollectionFormatter(string defaultSeparator)
+        {
+            DefaultSeparator = defaultSeparator;
+        }
+
         public virtual string Humanize<T>(IEnumerable<T> collection)
         {
             return Humanize(collection, o => o.ToString(), DefaultSeparator);
@@ -24,7 +30,26 @@ public virtual string Humanize<T>(IEnumerable<T> collection, String separator)
 
         public virtual string Humanize<T>(IEnumerable<T> collection, Func<T, String> objectFormatter, String separator)
         {
-            throw new NotImplementedException("A collection formatter for the current culture has not been implemented yet.");
+            if (collection == null)
+                throw new ArgumentException("collection");
+
+            T[] itemsArray = collection as T[] ?? collection.ToArray();
+
+            int count = itemsArray.Length;
+
+            if (count == 0)
+                return "";
+
+            if (count == 1)
+                return objectFormatter(itemsArray[0]);
+
+            IEnumerable<T> itemsBeforeLast = itemsArray.Take(count - 1);
+            T lastItem = itemsArray.Skip(count - 1).First();
+
+            return String.Format("{0} {1} {2}",
+                String.Join(", ", itemsBeforeLast.Select(objectFormatter)),
+                separator,
+                objectFormatter(lastItem));
         }
     }
 }

src/Humanizer/Localisation/CollectionFormatters/OxfordStyleCollectionFormatter.cs

@@ -7,8 +7,8 @@ namespace Humanizer.Localisation.CollectionFormatters
     internal class OxfordStyleCollectionFormatter : DefaultCollectionFormatter
     {
         public OxfordStyleCollectionFormatter(string defaultSeparator)
+            : base(defaultSeparator ?? "and")
         {
-            DefaultSeparator = defaultSeparator ?? "and";
         }
 
         public override string Humanize<T>(IEnumerable<T> collection, Func<T, string> objectFormatter, String separator)