Merge pull request #32 from ENikS/master

Fixing 6, 29, 30

Author: ENikS

src/Builder/IBuilderContext.cs

@@ -99,10 +99,15 @@ public interface IBuilderContext
         object CurrentOperation { get; set; }
 
         /// <summary>
-        /// The build context used to resolve a dependency during the build operation represented by this context.
+        /// The child build context.
         /// </summary>
         IBuilderContext ChildContext { get; }
 
+        /// <summary>
+        /// The parent build context.
+        /// </summary>
+        IBuilderContext ParentContext { get; }
+        
         /// <summary>
         /// Add a new set of resolver override objects to the current build operation.
         /// </summary>
@@ -118,16 +123,15 @@ public interface IBuilderContext
         IDependencyResolverPolicy GetOverriddenResolver(Type dependencyType);
 
         /// <summary>
-        /// A convenience method to do a new buildup operation on an existing context. This
-        /// overload allows you to specify extra policies which will be in effect for the duration
-        /// of the build.
+        /// A method to do a new buildup operation on an existing context.
         /// </summary>
-        /// <param name="newBuildKey">Key defining what to build up.</param>
+        /// <param name="type">Type of to build</param>
+        /// <param name="name">Name of the type to build</param>
         /// <param name="childCustomizationBlock">A delegate that takes a <see cref="IBuilderContext"/>. This
         /// is invoked with the new child context before the build up process starts. This gives callers
         /// the opportunity to customize the context for the build process.</param>
-        /// <returns>Created object.</returns>
-        object NewBuildUp(INamedType newBuildKey, Action<IBuilderContext> childCustomizationBlock = null);
+        /// <returns>Resolved object</returns>
+        object NewBuildUp(Type type, string name, Action<IBuilderContext> childCustomizationBlock = null);
     }
 
     /// <summary>
@@ -136,6 +140,24 @@ public interface IBuilderContext
     /// </summary>
     public static class BuilderContextExtensions
     {
+
+        /// <summary>
+        /// A convenience method to do a new buildup operation on an existing context. This
+        /// overload allows you to specify extra policies which will be in effect for the duration
+        /// of the build.
+        /// </summary>
+        /// <param name="newBuildKey">Key defining what to build up.</param>
+        /// <param name="childCustomizationBlock">A delegate that takes a <see cref="IBuilderContext"/>. This
+        /// is invoked with the new child context before the build up process starts. This gives callers
+        /// the opportunity to customize the context for the build process.</param>
+        /// <returns>Created object.</returns>
+        public static object NewBuildUp(this IBuilderContext context, INamedType newBuildKey, Action<IBuilderContext> childCustomizationBlock = null)
+        {
+            return (context ?? throw new ArgumentNullException(nameof(context)))
+                .NewBuildUp(newBuildKey?.Type, newBuildKey?.Name, childCustomizationBlock);
+        }
+
+
         /// <summary>
         /// Start a recursive build up operation to retrieve the default
         /// value for the given <typeparamref name="TResult"/> type.
@@ -145,7 +167,8 @@ public static class BuilderContextExtensions
         /// <returns>Resulting object.</returns>
         public static TResult NewBuildUp<TResult>(this IBuilderContext context)
         {
-            return context.NewBuildUp<TResult>(null);
+            return (TResult)(context ?? throw new ArgumentNullException(nameof(context)))
+                .NewBuildUp(typeof(TResult), null, null);
         }
 
         /// <summary>
@@ -159,7 +182,7 @@ public static TResult NewBuildUp<TResult>(this IBuilderContext context)
         public static TResult NewBuildUp<TResult>(this IBuilderContext context, string name)
         {
             return (TResult)(context ?? throw new ArgumentNullException(nameof(context)))
-                .NewBuildUp(NamedTypeBuildKey.Make<TResult>(name));
+                .NewBuildUp(typeof(TResult), name, null);
         }
 
         /// <summary>

src/IUnityContainer.cs

@@ -123,6 +123,9 @@ public interface IUnityContainer : IDisposable
         /// <returns>The new child container.</returns>
         IUnityContainer CreateChildContainer();
 
+        // TODO: Add summary
+        bool IsRegistered(Type type, string name);
+
         /// <summary>
         /// GetOrDefault a sequence of <see cref="IContainerRegistration"/> that describe the current state
         /// of the container.

src/Utility/UnityContainerExtensions.cs

@@ -788,7 +788,7 @@ public static TConfigurator Configure<TConfigurator>(this IUnityContainer contai
 
         #endregion
 
-        #region Introspection Helpers
+        #region Registration Helpers
 
         /// <summary>
         /// Check if a particular type has been registered with the container with
@@ -803,21 +803,6 @@ public static bool IsRegistered(this IUnityContainer container, Type typeToCheck
                 .IsRegistered(typeToCheck ?? throw new ArgumentNullException(nameof(typeToCheck)), null);
         }
 
-        /// <summary>
-        /// Check if a particular type/name pair has been registered with the container.
-        /// </summary>
-        /// <param name="container">Container to inspect.</param>
-        /// <param name="typeToCheck">Type to check registration for.</param>
-        /// <param name="nameToCheck">Name to check registration for.</param>
-        /// <returns>True if this type/name pair has been registered, false if not.</returns>
-        public static bool IsRegistered(this IUnityContainer container, Type typeToCheck, string nameToCheck)
-        {
-            var registration = from r in (container ?? throw new ArgumentNullException(nameof(container))).Registrations
-                               where r.RegisteredType == (typeToCheck ?? throw new ArgumentNullException(nameof(typeToCheck))) && r.Name == nameToCheck
-                               select r;
-            return registration.FirstOrDefault() != null;
-        }
-
         /// <summary>
         /// Check if a particular type has been registered with the container with the default name.
         /// </summary>
@@ -826,7 +811,7 @@ public static bool IsRegistered(this IUnityContainer container, Type typeToCheck
         /// <returns>True if this type has been registered, false if not.</returns>
         public static bool IsRegistered<T>(this IUnityContainer container)
         {
-            return (container ?? throw new ArgumentNullException(nameof(container))).IsRegistered(typeof(T));
+            return (container ?? throw new ArgumentNullException(nameof(container))).IsRegistered(typeof(T), null);
         }
 
         /// <summary>