Fix for failing Date UnitTest alternative locale.

Supports for alternative combining Address strings based on rules in locale json.

Source/Bogus.Tests/AddressTest.cs

@@ -31,7 +31,7 @@ public void can_get_canadian_zip_code()
         [Test]
         public void can_get_a_city_name()
         {
-            address.City().Should().Be("Bernhard fort");
+            address.City().Should().Be("Bernhardfort");
         }
 
         [Test]

Source/Bogus.Tests/DateTest.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Net;
 using Bogus.DataSets;
 using FluentAssertions;
@@ -31,7 +32,7 @@ public void can_get_date_in_past()
         [Test]
         public void can_get_date_in_past_with_custom_options()
         {
-            var starting = DateTime.Parse("6/15/2000 4:17:41 PM");
+            var starting = DateTime.Parse("6/15/2000 4:17:41 PM", CultureInfo.InvariantCulture);
             date.Past(refDate: starting, yearsToGoBack: 5).Should()
                 .BeOnOrBefore(starting)
                 .And
@@ -52,7 +53,7 @@ public void can_get_date_in_future()
         [Test]
         public void can_get_date_in_future_with_options()
         {
-            var starting = DateTime.Parse("6/15/2000 4:17:41 PM");
+            var starting = DateTime.Parse("6/15/2000 4:17:41 PM", CultureInfo.InvariantCulture);
             date.Future(refDate: starting, yearsToGoForward: 5).Should()
                 .BeOnOrBefore(starting.AddYears(5))
                 .And
@@ -63,8 +64,8 @@ public void can_get_date_in_future_with_options()
         [Test]
         public void can_get_random_time_between_two_dates()
         {
-            var start = DateTime.Parse("6/15/2000 4:17:41 PM");
-            var end = DateTime.Parse("8/15/2000 4:17:41 PM");
+            var start = DateTime.Parse("6/15/2000 4:17:41 PM", CultureInfo.InvariantCulture);
+            var end = DateTime.Parse("8/15/2000 4:17:41 PM", CultureInfo.InvariantCulture);
 
             date.Between(start, end)
                 .Should()

Source/Bogus/DataSet.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text.RegularExpressions;
 using Bogus.Extensions;
 using Newtonsoft.Json.Linq;
 
@@ -86,5 +87,52 @@ public string GetRandomArrayItem(string keyOrSubPath)
         {
             return Random.ArrayElement(GetArray(keyOrSubPath));
         }
+
+
+        /// <summary>
+        /// Retreives a random value from the locale info.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>System.String.</returns>
+        protected string GetRandomValue( string name )
+        {
+            var value = GetRandomArrayItem( name );
+
+            var tokenResult = ParseTokens( value );
+
+            return Random.Replace( tokenResult );
+        }
+
+        /// <summary>
+        /// Recursive parse the tokens in the string .
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>System.String.</returns>
+        private string ParseTokens( string value )
+        {
+            var regex = new Regex( "\\#{(.*?)\\}" );
+            var cityResult = regex.Replace( value,
+                x =>
+                {
+                    JArray result;
+                    var groupValue = x.Groups[1].Value.ToLower().Split( '.' );
+                    if ( groupValue.Length == 1 )
+                    {
+                        result = (JArray) Database.Get( Category, groupValue[0], Locale );
+                    }
+                    else
+                    {
+                        result = (JArray) Database.Get( groupValue[0], groupValue[1], Locale );
+                    }
+
+                    var randomElement = Random.ArrayElement( result );
+                    
+                    //replace values
+                    return ParseTokens( randomElement );
+
+                }
+                );
+            return cityResult;
+        }
     }
 }

Source/Bogus/DataSets/Address.cs

@@ -1,3 +1,7 @@
+using System;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json.Linq;
+
 namespace Bogus.DataSets
 {
     /// <summary>
@@ -8,15 +12,15 @@ public class Address : DataSet
         /// <summary>
         /// The source to pull names from.
         /// </summary>
-        protected Name Name = null;
+        protected Name Name;
 
         /// <summary>
         /// Default constructor
         /// </summary>
         /// <param name="locale"></param>
-        public Address(string locale = "en") : base(locale)
+        public Address( string locale = "en" ) : base( locale )
         {
-            this.Name = new Name(locale);
+            this.Name = new Name( locale );
         }
 
         /// <summary>
@@ -25,12 +29,7 @@ public Address(string locale = "en") : base(locale)
         /// <returns></returns>
         public string ZipCode(string format = null)
         {
-            if( format == null )
-            {
-                format = GetRandomArrayItem("postcode");
-            }
-
-            return Random.Replace(format);
+            return format == null ? GetRandomValue( "postcode" ) : Random.Replace(format);
         }
 
         /// <summary>
@@ -39,36 +38,20 @@ public string ZipCode(string format = null)
         /// <returns></returns>
         public string City()
         {
-            var format = Random.Number(3);
-            if( format == 0 )
-                return string.Format("{0} {1} {2}", CityPrefix(), Name.FirstName(), CitySuffix());
-
-            if( format == 1 )
-                return string.Format("{0} {1}", CityPrefix(), Name.FirstName());
-
-            if( format == 2 )
-                return string.Format("{0} {1}", Name.FirstName(), CitySuffix());
-
-            return string.Format("{0} {1}", Name.LastName(), CitySuffix());
+            return GetRandomValue( "city" );
         }
 
+
+
         /// <summary>
         /// Get a street address.
         /// </summary>
         /// <param name="useFullAddress"></param>
         /// <returns></returns>
         public string StreetAddress(bool useFullAddress = false)
         {
-            var homeNumbers = new string('#', Random.Number(3, 5));
-
-            var houseNumber = Random.Replace(homeNumbers);
-
-            if( useFullAddress )
-            {
-                return string.Format("{0} {1} {2}", houseNumber, StreetName(), SecondaryAddress());
-            }
-
-            return string.Format("{0} {1}", houseNumber, StreetName());
+            var streetAddress = GetRandomValue( "street_address" );
+            return useFullAddress ? $"{streetAddress} {SecondaryAddress()}" : streetAddress;
         }
 
         /// <summary>
@@ -95,7 +78,16 @@ public string CitySuffix()
         /// <returns></returns>
         public string StreetName()
         {
-	        return $"{(Random.Bool() ? Name.FirstName() : Name.LastName())} {StreetSuffix()}".Trim();
+            return GetRandomValue( "street_name" );
+        }
+
+        /// <summary>
+        /// Get the buildingnumber
+        /// </summary>
+        /// <returns></returns>
+        public string BuildingNumber()
+        {
+            return GetRandomValue( "building_number" );
         }
 
         /// <summary>
@@ -113,11 +105,7 @@ public string StreetSuffix()
         /// <returns></returns>
         public string SecondaryAddress()
         {
-            var formats = new[] {"Apt. ###", "Suite ###"};
-
-            var format = Random.ArrayElement(formats);
-
-            return Random.Replace(format);
+            return GetRandomValue( "secondary_address" );
         }
 
         /// <summary>