Finalized fluent api for Locate

src/Secretary.UnitTests/LocateTests.cs

@@ -1,9 +1,10 @@
+using System;
 using System.Collections.Generic;
 using Xunit;
 
 namespace Secretary.UnitTests
 {
-    public class LocateTests
+    public class LocateTests : IDisposable
     {
         [Fact]
         public void IsInitialized_GivenACollectionOfSecretaries_ShouldReturnTrue()
@@ -20,5 +21,11 @@ public void Usage_WhenUninitialized_ShouldThrowException()
         {
             Assert.Throws<LocatorUnitializedException>(() => Locate.FolderForType(FileType.Image));            
         }
+
+
+        public void Dispose()
+        {
+            Locate.Reset();
+        }
     }
 }

src/Secretary/FileLocationQuery.cs

@@ -2,7 +2,7 @@
 
 namespace Secretary
 {
-    public class FileLocationQuery : LocationQueryBase, IFileLocationQuery
+    public class FileLocationQuery : LocationQueryBase, IFileLocationQuery, IInLocation, IForEntity
     {
         public string FileName { get; private set; }
 
@@ -11,13 +11,13 @@ public FileLocationQuery(string fileName)
             FileName = fileName;
         }
 
-        public FileLocationQuery Of(FileType fileType)
+        public IInLocation Of(FileType fileType)
         {
             FileType = fileType;
             return this;
         }
 
-        public FileLocationQuery In(Location location)
+        public IForEntity In(Location location)
         {
             LocationContext = location;
             return this;

src/Secretary/FolderLocationQuery.cs

@@ -2,14 +2,14 @@
 
 namespace Secretary
 {
-    public class FolderLocationQuery : LocationQueryBase, IFolderLocationQuery
+    public class FolderLocationQuery : LocationQueryBase, IFolderLocationQuery, IForEntity
     {
         public FolderLocationQuery(FileType fileType)
         {
             this.FileType = fileType;
         }
 
-        public FolderLocationQuery In(Location location)
+        public IForEntity In(Location location)
         {
             this.LocationContext = location;
             return this;

src/Secretary/Locate.cs

@@ -27,6 +27,11 @@ public static bool IsInitialized
             get { return (Secretaries != null); }
         }
 
+        public static void Reset()
+        {
+            Secretaries = null;
+        }
+
         private static void GuardAgainstUninitializedUsage()
         {
             if (!IsInitialized)
@@ -38,7 +43,7 @@ private static void GuardAgainstUninitializedUsage()
         /// </summary>
         /// <param name="fileName"></param>
         /// <returns></returns>
-        public static FileLocationQuery File(string fileName)
+        public static IFileLocationQuery File(string fileName)
         {
             GuardAgainstUninitializedUsage();
 
@@ -53,7 +58,7 @@ public static FileLocationQuery File(string fileName)
         /// </summary>
         /// <param name="fileType"></param>
         /// <returns></returns>
-        public static FolderLocationQuery FolderForType(FileType fileType)
+        public static IFolderLocationQuery FolderForType(FileType fileType)
         {
             GuardAgainstUninitializedUsage();
 

src/Secretary/Syntax.cs

@@ -19,16 +19,32 @@ public interface ISpecializedIn : IFluentInterface
         IEnrolledFor SpecializingIn(FileType fileType);  
     }
 
+
+    /// <summary>
+    /// Beginning of a file location query
+    /// </summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
     public interface IFileLocationQuery : IFluentInterface
     {
+        IInLocation Of(FileType fileType);
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public interface IInLocation : IFluentInterface
+    {
+        IForEntity In(Location fileLocation);
+    }
 
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public interface IForEntity : IFluentInterface
+    {
+        string For<TEntity>(TEntity entity);
     }
 
 
     [EditorBrowsable(EditorBrowsableState.Never)]
     public interface IFolderLocationQuery : IFluentInterface
     {
-        string For<TEntity>(TEntity entity);
+        IForEntity In(Location fileLocation);
     }
 }