Lazy load person data

JvanderStad · Feb 25, 2016 · 6695892 · 6695892
1 parent 4990164
commit 6695892
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/Source/Bogus.Tests/PersonTest.cs b/Source/Bogus.Tests/PersonTest.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Sockets;
 using Bogus.Extensions.Brazil;
 using Bogus.Extensions.Canada;
 using Bogus.Extensions.Denmark;

diff --git a/Source/Bogus/Faker.cs b/Source/Bogus/Faker.cs
@@ -9,7 +9,7 @@ namespace Bogus
     /// <summary>
     /// A hub of all the categories merged into a single class to ease fluent syntax API.
     /// </summary>
-    public class Faker
+    public class Faker : ILocaleAware
     {
         /// <summary>
         /// The default mode to use when generating objects. Strict mode ensures that all properties have rules.
@@ -21,6 +21,8 @@ public class Faker
         /// </summary>
         public Faker(string locale = "en")
         {
+            Locale = locale;
+
             this.Address = new Address(locale);
             this.Company = new Company(locale);
             this.Date = new Date {Locale = locale};
@@ -32,7 +34,6 @@ public Faker(string locale = "en")
             this.Name = new Name(locale);
             this.Phone = new PhoneNumbers(locale);
 
-            this.Person = new Person(locale);
             this.Random = new Randomizer();
         }
 
@@ -54,10 +55,12 @@ public string Parse(string str)
                 this.Phone);
         }
 
+
+        private Person _person;
         /// <summary>
         /// A contextually relevant fields of a person.
         /// </summary>
-        public Person Person { get; set; }
+        public Person Person => _person ?? (_person = new Person( Locale ));
 
         /// <summary>
         /// Creates hacker gibberish.
@@ -130,6 +133,20 @@ public T PickRandom<T>(IEnumerable<T> items)
         {
             return this.Random.Enum<T>();
         }
+
+        /// <summary>
+        /// The current locale for the dataset.
+        /// </summary>
+        /// <value>The locale.</value>
+        public string Locale { get; set; }
+
+        /// <summary>
+        /// Resets the data.
+        /// </summary>
+        public void ResetData()
+        {
+            _person = null;
+        }
     }
 
 

diff --git a/Source/Bogus/Faker[T].cs b/Source/Bogus/Faker[T].cs
@@ -4,7 +4,6 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
-
 namespace Bogus
 {
     /// <summary>
@@ -36,14 +35,6 @@ public Faker(string locale = "en", IBinder binder = null)
             TypeProperties = this.binder.GetMembers(typeof(T));
         }
 
-        /// <summary>
-        /// Forcibly makes a new person context.
-        /// </summary>
-        public virtual void MakeNewContext()
-        {
-            this.FakerHub.Person = new Person(this.Locale);
-        }
-
         /// <summary>
         /// Set the binding flags visibility when getting properties. IE: Only public or public+private properties.
         /// </summary>
@@ -184,12 +175,9 @@ public virtual void Populate(T instance)
                     field?.SetValue(instance, valueFactory(FakerHub, instance));
                 }
 
-                if( FinalizeAction != null )
-                {
-                    FinalizeAction(this.FakerHub, instance);
-                }
+                FinalizeAction?.Invoke(this.FakerHub, instance);
 
-                MakeNewContext();
+                FakerHub.ResetData();
             }
         }