Thread: [Structuremap-commits] SF.net SVN: structuremap: [24] trunk/Source/StructureMap

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 24
          http://structuremap.svn.sourceforge.net/structuremap/?rev=24&view=rev
Author:   jeremydmiller
Date:     2007-02-25 11:29:51 -0800 (Sun, 25 Feb 2007)

Log Message:
-----------
Working on the Fluent Interface configuration for adding instances

Modified Paths:
--------------
    trunk/Source/StructureMap/Configuration/DSL/CreatePluginFamilyExpression.cs
    trunk/Source/StructureMap/Configuration/DSL/DefaultExpression.cs
    trunk/Source/StructureMap/Configuration/DSL/IExpression.cs
    trunk/Source/StructureMap/Configuration/DSL/Registry.cs
    trunk/Source/StructureMap/Configuration/DSL/ScanAssembliesExpression.cs
    trunk/Source/StructureMap/Graph/Plugin.cs
    trunk/Source/StructureMap/Graph/PluginCollection.cs
    trunk/Source/StructureMap/Graph/PluginGraph.cs
    trunk/Source/StructureMap/InstanceFactory.cs
    trunk/Source/StructureMap/InstanceManager.cs
    trunk/Source/StructureMap/InstanceMemento.cs
    trunk/Source/StructureMap/MemoryInstanceMemento.cs
    trunk/Source/StructureMap/StructureMap.csproj
    trunk/Source/StructureMap/StructureMapException.resx
    trunk/Source/StructureMap.Testing/Configuration/DSL/CreatePluginFamilyTester.cs
    trunk/Source/StructureMap.Testing/Configuration/DSL/RegistryTester.cs
    trunk/Source/StructureMap.Testing/Container/FullStackFacadeTester.cs
    trunk/Source/StructureMap.Testing/Container/PluginGraphBuilderTester.cs
    trunk/Source/StructureMap.Testing/Graph/AssemblyGraphTester.cs
    trunk/Source/StructureMap.Testing/Graph/PluginFamilyTester.cs
    trunk/Source/StructureMap.Testing/Graph/PluginGraphTester.cs
    trunk/Source/StructureMap.Testing/Graph/PluginTester.cs
    trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj
    trunk/Source/StructureMap.Testing.Widget/IWidget.cs
    trunk/Source/StructureMap.Testing.Widget/Rule.cs

Added Paths:
-----------
    trunk/Source/StructureMap/Configuration/DSL/ChildInstanceExpression.cs
    trunk/Source/StructureMap/Configuration/DSL/InstanceExpression.cs
    trunk/Source/StructureMap/Configuration/DSL/ProfileExpression.cs
    trunk/Source/StructureMap/Configuration/DSL/PropertyExpression.cs
    trunk/Source/StructureMap/Configuration/DSL/PrototypeExpression.cs
    trunk/Source/StructureMap/IInstanceCreator.cs
    trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs
    trunk/Source/StructureMap.Testing/Configuration/DSL/CreateProfileTester.cs
    trunk/Source/StructureMap.Testing/Configuration/DSL/InstanceExpressionTester.cs
    trunk/Source/StructureMap.Testing/StructureMap.Testing.dll.config

Added: trunk/Source/StructureMap/Configuration/DSL/ChildInstanceExpression.cs
===================================================================

--- trunk/Source/StructureMap/Configuration/DSL/ChildInstanceExpression.cs	                        (rev 0)
+++ trunk/Source/StructureMap/Configuration/DSL/ChildInstanceExpression.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using StructureMap.Graph;
+
+namespace StructureMap.Configuration.DSL
+{
+    public class ChildInstanceExpression : IExpression
+    {
+        private readonly InstanceExpression _instance;
+        private readonly MemoryInstanceMemento _memento;
+        private readonly string _propertyName;
+        private Plugin _plugin;
+        private Type _childType;
+        private List<IExpression> _children = new List<IExpression>();
+
+
+        public ChildInstanceExpression(InstanceExpression instance, MemoryInstanceMemento memento, string propertyName)
+        {
+            _instance = instance;
+            _memento = memento;
+            _propertyName = propertyName;
+        }
+
+
+
+        public InstanceExpression IsNamedInstance(string instanceKey)
+        {
+            MemoryInstanceMemento child = MemoryInstanceMemento.CreateReferencedInstanceMemento(instanceKey);
+            _memento.AddChild(_propertyName, child);
+
+            return _instance;
+        }
+
+        // TODO -- negative case if the concrete type cannot be an implicit instance
+        public InstanceExpression IsConcreteType<T>()
+        {
+            _plugin = Plugin.CreateImplicitPlugin(typeof(T));
+            MemoryInstanceMemento child = MemoryInstanceMemento.CreateReferencedInstanceMemento(_plugin.ConcreteKey);
+            _memento.AddChild(_propertyName, child);
+
+            return _instance;
+        }
+
+
+        void IExpression.Configure(PluginGraph graph)
+        {
+            if (_plugin == null || _childType == null)
+            {
+                return;
+            }
+
+            PluginFamily family = graph.LocateOrCreateFamilyForType(_childType);
+            family.Plugins.FindOrCreate(_plugin.PluggedType);
+        }
+
+
+        IExpression[] IExpression.ChildExpressions
+        {
+            get { return _children.ToArray(); }
+        }
+
+        internal Type ChildType
+        {
+            set { _childType = value; }
+        }
+
+        public InstanceExpression Is(InstanceExpression child)
+        {
+            _children.Add(child);
+            MemoryInstanceMemento childMemento = MemoryInstanceMemento.CreateReferencedInstanceMemento(child.InstanceKey);
+            _memento.AddChild(_propertyName, childMemento);
+
+            return _instance;
+        }
+    }
+}

Modified: trunk/Source/StructureMap/Configuration/DSL/CreatePluginFamilyExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/CreatePluginFamilyExpression.cs	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/Configuration/DSL/CreatePluginFamilyExpression.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -39,6 +39,11 @@
             graph.Assemblies.Add(assembly);
         }
 
+        IExpression[] IExpression.ChildExpressions
+        {
+            get { return new IExpression[0]; }
+        }
+
         public CreatePluginFamilyExpression WithDefaultConcreteType<T>()
         {
             Plugin plugin = addPlugin<T>();
@@ -87,5 +92,10 @@
             _scope = scope;
             return this;
         }
+
+        public void AndTheDefaultIs(InstanceExpression expression)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

Modified: trunk/Source/StructureMap/Configuration/DSL/DefaultExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/DefaultExpression.cs	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/Configuration/DSL/DefaultExpression.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -17,5 +17,10 @@
         {
             _configure(graph);
         }
+
+        IExpression[] IExpression.ChildExpressions
+        {
+            get { return new IExpression[0]; }
+        }
     }
 }

Modified: trunk/Source/StructureMap/Configuration/DSL/IExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/IExpression.cs	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/Configuration/DSL/IExpression.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -8,5 +8,6 @@
     public interface IExpression
     {
         void Configure(PluginGraph graph);
+        IExpression[] ChildExpressions { get;}
     }
 }

Added: trunk/Source/StructureMap/Configuration/DSL/InstanceExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/InstanceExpression.cs	                        (rev 0)
+++ trunk/Source/StructureMap/Configuration/DSL/InstanceExpression.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Configuration;
+using System.Reflection;
+using StructureMap.Graph;
+
+namespace StructureMap.Configuration.DSL
+{
+    public class InstanceExpression : IExpression
+    {
+        private readonly Type _pluginType;
+        private Type _pluggedType;
+        private string _propertyName;
+        private MemoryInstanceMemento _memento;
+        private List<IExpression> _children = new List<IExpression>();
+        
+
+
+        public InstanceExpression(Type pluginType)
+        {
+            _pluginType = pluginType;
+            _memento = new MemoryInstanceMemento();
+            _memento.InstanceKey = Guid.NewGuid().ToString();
+        }
+
+        void IExpression.Configure(PluginGraph graph)
+        {
+            if (_pluggedType == null && string.IsNullOrEmpty(_memento.ConcreteKey))
+            {
+                throw new StructureMapException(301, _memento.InstanceKey, TypePath.GetAssemblyQualifiedName(_pluginType));
+            }
+
+            PluginFamily family = graph.LocateOrCreateFamilyForType(_pluginType);
+            Plugin plugin = _pluggedType == null
+                                ? family.Plugins[_memento.ConcreteKey]
+                                : family.Plugins.FindOrCreate(_pluggedType);
+
+            _memento.ConcreteKey = plugin.ConcreteKey;
+
+            
+            
+            family.Source.AddExternalMemento(_memento);
+        }
+
+
+        public IExpression[] ChildExpressions
+        {
+            get { return _children.ToArray(); }
+        }
+
+
+        public InstanceExpression WithName(string instanceKey)
+        {
+            _memento.InstanceKey = instanceKey;
+            return this;
+        }
+
+
+        public string InstanceKey
+        {
+            get { return _memento.InstanceKey; }
+            set { _memento.InstanceKey = value; }
+        }
+
+        internal Type PluginType
+        {
+            get { return _pluginType; }
+        }
+
+        public InstanceExpression UsingConcreteType<T>()
+        {
+            _pluggedType = typeof (T);
+            return this;
+        }
+
+        public PropertyExpression WithProperty(string propertyName)
+        {
+            return new PropertyExpression(this, _memento, propertyName);
+        }
+
+
+
+
+        public void UsePrototype(ICloneable cloneable)
+        {
+            
+        }
+
+
+
+        public InstanceExpression UsingConcreteTypeNamed(string concreteKey)
+        {
+            _memento.ConcreteKey = concreteKey;
+            return this;
+        }
+
+        public ChildInstanceExpression Child(string propertyName)
+        {
+            ChildInstanceExpression child = new ChildInstanceExpression(this,_memento, propertyName);
+            _children.Add(child);
+
+            return child;
+        }
+
+        public ChildInstanceExpression Child<T>()
+        {
+            // TODO -- what if the property can't be found
+            string propertyName = findPropertyName<T>();
+            ChildInstanceExpression child = Child(propertyName);
+            child.ChildType = typeof (T);
+            return child;
+        }
+
+        private string findPropertyName<T>()
+        {
+            Plugin plugin = Plugin.CreateImplicitPlugin(_pluggedType);
+            return plugin.FindFirstConstructorArgumentOfType<T>();
+        }
+
+
+        
+    }
+}

Added: trunk/Source/StructureMap/Configuration/DSL/ProfileExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/ProfileExpression.cs	                        (rev 0)
+++ trunk/Source/StructureMap/Configuration/DSL/ProfileExpression.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -0,0 +1,18 @@
+using System;
+using StructureMap.Graph;
+
+namespace StructureMap.Configuration.DSL
+{
+    public class ProfileExpression : IExpression
+    {
+        public void Configure(PluginGraph graph)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IExpression[] ChildExpressions
+        {
+            get { throw new NotImplementedException(); }
+        }
+    }
+}

Added: trunk/Source/StructureMap/Configuration/DSL/PropertyExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/PropertyExpression.cs	                        (rev 0)
+++ trunk/Source/StructureMap/Configuration/DSL/PropertyExpression.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Text;
+
+namespace StructureMap.Configuration.DSL
+{
+    public class PropertyExpression
+    {
+        private readonly InstanceExpression _instance;
+        private readonly MemoryInstanceMemento _memento;
+        private readonly string _propertyName;
+
+        public PropertyExpression(InstanceExpression instance, MemoryInstanceMemento memento, string propertyName)
+        {
+            _instance = instance;
+            _memento = memento;
+            _propertyName = propertyName;
+        }
+
+        public InstanceExpression EqualTo(object propertyValue)
+        {
+            _memento.SetProperty(_propertyName, propertyValue.ToString());
+            return _instance;
+        }
+
+        public InstanceExpression EqualToAppSetting(string appSettingKey)
+        {
+            string propertyValue = ConfigurationManager.AppSettings[appSettingKey];
+            _memento.SetProperty(_propertyName, propertyValue);
+            return _instance;
+        }
+    }
+}

Added: trunk/Source/StructureMap/Configuration/DSL/PrototypeExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/PrototypeExpression.cs	                        (rev 0)
+++ trunk/Source/StructureMap/Configuration/DSL/PrototypeExpression.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using StructureMap.Graph;
+
+namespace StructureMap.Configuration.DSL
+{
+    public class PrototypeExpression : IExpression
+    {
+        public void Configure(PluginGraph graph)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IExpression[] ChildExpressions
+        {
+            get { return new IExpression[0]; }
+        }
+
+        public void WithName(string instanceKey)
+        {
+            
+        }
+    }
+}

Modified: trunk/Source/StructureMap/Configuration/DSL/Registry.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Registry.cs	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/Configuration/DSL/Registry.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -7,7 +7,7 @@
     public class Registry : IDisposable
     {
         private List<IExpression> _expressions = new List<IExpression>();
-        private readonly PluginGraph _graph;
+        private PluginGraph _graph;
 
         public Registry(PluginGraph graph)
         {
@@ -16,7 +16,17 @@
 
         public Registry()
         {
+            _graph = new PluginGraph();
+        }
 
+
+
+        /// <summary>
+        /// Implement this method to 
+        /// </summary>
+        protected virtual void configure()
+        {
+            // no-op;
         }
 
         protected void addExpression(IExpression expression)
@@ -24,17 +34,26 @@
             _expressions.Add(expression);
         }
 
-        public void Configure(PluginGraph graph)
+        private void configurePluginGraph(PluginGraph graph)
         {
             foreach (IExpression expression in _expressions)
             {
-                expression.Configure(graph);
+                configureExpression(expression, graph);
             }
         }
 
+        private static void configureExpression(IExpression expression, PluginGraph graph)
+        {
+            expression.Configure(graph);
+            foreach (IExpression childExpression in expression.ChildExpressions)
+            {
+                configureExpression(childExpression, graph);
+            }
+        }
+
         public void Dispose()
         {
-            Configure(_graph);
+            configurePluginGraph(_graph);
         }
 
         public ScanAssembliesExpression ScanAssemblies()
@@ -56,8 +75,25 @@
         public InstanceManager BuildInstanceManager()
         {
             PluginGraph graph = new PluginGraph();
-            Configure(graph);
+            configurePluginGraph(graph);
             return new InstanceManager(graph);
         }
+
+        public InstanceExpression AddInstanceOf<T>()
+        {
+            InstanceExpression expression = new InstanceExpression(typeof(T));
+            addExpression(expression);
+            return expression;
+        }
+
+        public static InstanceExpression Instance<T>()
+        {
+            return new InstanceExpression(typeof(T));
+        }
+
+        public PrototypeExpression AddInstanceOf<T>(T prototype)
+        {
+            return new PrototypeExpression();
+        }
     }
 }

Modified: trunk/Source/StructureMap/Configuration/DSL/ScanAssembliesExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/ScanAssembliesExpression.cs	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/Configuration/DSL/ScanAssembliesExpression.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -20,6 +20,11 @@
             }
         }
 
+        public IExpression[] ChildExpressions
+        {
+            get { return new IExpression[0]; }
+        }
+
         public ScanAssembliesExpression IncludeTheCallingAssembly()
         {
             Assembly callingAssembly = findTheCallingAssembly();

Modified: trunk/Source/StructureMap/Graph/Plugin.cs
===================================================================
--- trunk/Source/StructureMap/Graph/Plugin.cs	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/Graph/Plugin.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -398,5 +398,19 @@
         {
             return (_pluggedType != null ? _pluggedType.GetHashCode() : 0) + 29*(_concreteKey != null ? _concreteKey.GetHashCode() : 0);
         }
+
+        public string FindFirstConstructorArgumentOfType<T>()
+        {
+            ConstructorInfo ctor = this.GetConstructor();
+            foreach (ParameterInfo info in ctor.GetParameters())
+            {
+                if (info.ParameterType.Equals(typeof(T)))
+                {
+                    return info.Name;
+                }
+            }
+
+            throw new StructureMapException(302, typeof (T).FullName, _pluggedType.FullName);
+        }
     }
 }
\ No newline at end of file

Modified: trunk/Source/StructureMap/Graph/PluginCollection.cs
===================================================================
--- trunk/Source/StructureMap/Graph/PluginCollection.cs	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/Graph/PluginCollection.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -153,5 +153,13 @@
                 }
             }
         }
+
+        public Plugin FindOrCreate(Type pluggedType)
+        {
+            Plugin plugin = Plugin.CreateImplicitPlugin(pluggedType);
+            Add(plugin);
+
+            return plugin;
+        }
     }
 }
\ No newline at end of file

Modified: trunk/Source/StructureMap/Graph/PluginGraph.cs
===================================================================
--- trunk/Source/StructureMap/Graph/PluginGraph.cs	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/Graph/PluginGraph.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -143,13 +143,24 @@
         public TypePath LocateOrCreateFamilyForType(string fullName)
         {
             Type pluginType = findTypeByFullName(fullName);
+            buildFamilyIfMissing(pluginType);
+
+            return new TypePath(pluginType);
+        }
+
+        private void buildFamilyIfMissing(Type pluginType)
+        {
             if (!_pluginFamilies.Contains(pluginType))
             {
                 PluginFamily family = _pluginFamilies.Add(pluginType, string.Empty);
                 attachImplicitPlugins(family);
             }
+        }
 
-            return new TypePath(pluginType);
+        public PluginFamily LocateOrCreateFamilyForType(Type pluginType)
+        {
+            buildFamilyIfMissing(pluginType);
+            return this.PluginFamilies[pluginType];
         }
 
         private Type findTypeByFullName(string fullName)
@@ -170,5 +181,7 @@
         {
             _defaultManager.ReadDefaultsFromPluginGraph(this);
         }
+
+        
     }
 }
\ No newline at end of file

Added: trunk/Source/StructureMap/IInstanceCreator.cs
===================================================================
--- trunk/Source/StructureMap/IInstanceCreator.cs	                        (rev 0)
+++ trunk/Source/StructureMap/IInstanceCreator.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -0,0 +1,7 @@
+namespace StructureMap
+{
+    public interface IInstanceCreator
+    {
+        object BuildInstance(InstanceMemento memento);
+    }
+}

Modified: trunk/Source/StructureMap/InstanceFactory.cs
===================================================================
--- trunk/Source/StructureMap/InstanceFactory.cs	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/InstanceFactory.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -12,7 +12,7 @@
     /// <summary>
     /// Default implementation of IInstanceFactory
     /// </summary>
-    public class InstanceFactory : IInstanceFactory
+    public class InstanceFactory : IInstanceFactory, IInstanceCreator
     {
         private Type _pluginType;
         private string _assemblyName;
@@ -204,11 +204,13 @@
         {
             // Let the MementoSource fill in Templates, resolve references, etc.
             InstanceMemento resolvedMemento = _source.ResolveMemento(memento);
-            return buildFromInstanceBuilder(resolvedMemento);
+
+
+            return resolvedMemento.Build(this);
         }
 
 
-        private object buildFromInstanceBuilder(InstanceMemento memento)
+        public object BuildInstance(InstanceMemento memento)
         {
             if (!_instanceBuilders.Contains(memento.ConcreteKey))
             {

Modified: trunk/Source/StructureMap/InstanceManager.cs
===================================================================
--- trunk/Source/StructureMap/InstanceManager.cs	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/InstanceManager.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -156,16 +156,9 @@
             return instanceFactory.GetInstance(instanceKey);
         }
 
-        /// <summary>
-        /// Creates the named instance of the PluginTypeName
-        /// </summary>
-        /// <param name="pluginTypeName">Fully qualified name of the CLR Type to create</param>
-        /// <param name="instanceKey"></param>
-        /// <returns></returns>
-        public object CreateInstance(string pluginTypeName, string instanceKey)
+        public T CreateInstance<T>(string instanceKey)
         {
-            IInstanceFactory instanceFactory = this[pluginTypeName];
-            return instanceFactory.GetInstance(instanceKey);
+            return (T) CreateInstance(typeof (T), instanceKey);
         }
 
         /// <summary>
@@ -179,6 +172,11 @@
             return instanceFactory.GetInstance();
         }
 
+        public T CreateInstance<T>()
+        {
+            return (T)CreateInstance(typeof(T));
+        }
+
         /// <summary>
         /// Creates a new object instance of the requested type
         /// </summary>
@@ -203,6 +201,8 @@
             return instanceFactory.GetInstance(instanceMemento);
         }
 
+
+
         /// <summary>
         /// Creates a new instance of the requested type using the InstanceMemento.  Mostly used from other
         /// classes to link children members
@@ -331,6 +331,11 @@
             return factory.GetInstance();
         }
 
+        public T FillDependencies<T>()
+        {
+            return (T) FillDependencies(typeof (T));
+        }
+
         private InstanceFactory getFilledTypeFactory(Type type)
         {
             if (!_filledTypeFactories.Contains(type))

Modified: trunk/Source/StructureMap/InstanceMemento.cs
===================================================================
--- trunk/Source/StructureMap/InstanceMemento.cs	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/InstanceMemento.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -41,6 +41,7 @@
 
                 return _concreteKey;
             }
+            set { _concreteKey = value; }
         }
 
         protected abstract string innerConcreteKey { get; }
@@ -260,5 +261,10 @@
                 return Plugin.CreateImplicitPlugin(pluggedType);
             }
         }
+
+        public virtual object Build(IInstanceCreator creator)
+        {
+            return creator.BuildInstance(this);
+        }
     }
 }
\ No newline at end of file

Modified: trunk/Source/StructureMap/MemoryInstanceMemento.cs
===================================================================
--- trunk/Source/StructureMap/MemoryInstanceMemento.cs	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/MemoryInstanceMemento.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -75,7 +75,7 @@
         }
 
 
-        private MemoryInstanceMemento()
+        public MemoryInstanceMemento()
         {
         }
 
@@ -114,7 +114,13 @@
             _children.Add(name, Memento);
         }
 
+        public void ReferenceChild(string name, string instanceKey)
+        {
+            InstanceMemento child = MemoryInstanceMemento.CreateReferencedInstanceMemento(instanceKey);
+            AddChild(name, child);
+        }
 
+
         /// <summary>
         /// Links an array of InstanceMemento's to a named array property
         /// </summary>

Modified: trunk/Source/StructureMap/StructureMap.csproj
===================================================================
--- trunk/Source/StructureMap/StructureMap.csproj	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/StructureMap.csproj	2007-02-25 19:29:51 UTC (rev 24)
@@ -103,6 +103,7 @@
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.configuration" />
     <Reference Include="System.Data">
       <Name>System.Data</Name>
     </Reference>
@@ -212,9 +213,14 @@
     <Compile Include="Configuration\DiagnosticGraphBuilder.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Configuration\DSL\ChildInstanceExpression.cs" />
     <Compile Include="Configuration\DSL\CreatePluginFamilyExpression.cs" />
     <Compile Include="Configuration\DSL\DefaultExpression.cs" />
     <Compile Include="Configuration\DSL\IExpression.cs" />
+    <Compile Include="Configuration\DSL\InstanceExpression.cs" />
+    <Compile Include="Configuration\DSL\ProfileExpression.cs" />
+    <Compile Include="Configuration\DSL\PropertyExpression.cs" />
+    <Compile Include="Configuration\DSL\PrototypeExpression.cs" />
     <Compile Include="Configuration\DSL\Registry.cs" />
     <Compile Include="Configuration\DSL\ScanAssembliesExpression.cs" />
     <Compile Include="Configuration\FamilyParser.cs">
@@ -435,6 +441,7 @@
     <Compile Include="Graph\TypePath.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="IInstanceCreator.cs" />
     <Compile Include="IInstanceFactory.cs">
       <SubType>Code</SubType>
     </Compile>

Modified: trunk/Source/StructureMap/StructureMapException.resx
===================================================================
--- trunk/Source/StructureMap/StructureMapException.resx	2007-02-20 23:09:00 UTC (rev 23)
+++ trunk/Source/StructureMap/StructureMapException.resx	2007-02-25 19:29:51 UTC (rev 24)
@@ -231,4 +231,10 @@
   <data name="300" xml:space="preserve">
     <value>The implied PluginType {0} cannot be found in any of the configured assemblies </value>
   </data>
+  <data name="301" xml:space="preserve">
+    <value>No concrete type or concrete key is specified for instance {0} for PluginType {1}</value>
+  </data>
+  <data name="302" xml:space="preserve">
+    <value>There is no argument of type {0} for concrete type {1}</value>
+  </data>
 </root>
\ No newline at end of file

Added: trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs	                        (rev 0)
+++ trunk/Source/StructureMap.Testing/Configuration/DSL/AddInstanceTester.cs	2007-02-25 19:29:51 UTC (rev 24)
@@ -0,0 +1,234 @@
+using System;
+using System.Configuration;
+using NUnit.Framework;
+using StructureMap.Configuration.DSL;
+using StructureMap.Graph;
+using StructureMap.Testing.Widget;
+using IList=System.Collections.IList;
+
+namespace StructureMap.Testing.Configuration.DSL
+{
+    [TestFixture]
+    public class AddInstanceTester
+    {
+        private InstanceManager manager;
+        private PluginGraph pluginGraph;
+
+        [SetUp]
+        public void SetUp()
+        {
+            pluginGraph = new PluginGraph();
+            Registry registry = new Registry(pluginGraph);
+
+            // Add an instance with properties
+            registry.AddInstanceOf<IWidget>()
+                .WithName("DarkGreen")
+                .UsingConcreteType<ColorWidget>()
+                .WithProperty("Color").EqualTo("DarkGreen");
+
+            // Add an instance by specifying the ConcreteKey
+            registry.AddInstanceOf<IWidget>()
+                .WithName("Purple")
+                .UsingConcreteTypeNamed("Color")
+                .WithProperty("Color").EqualTo("Purple");
+
+            // Pull a property from the App config
+            registry.AddInstanceOf<IWidget>()
+                .WithName("AppSetting")
+                .UsingConcreteType<ColorWidget>()
+                .WithProperty("Color").EqualToAppSetting("Color");
+
+
+
+
+            registry.AddInstanceOf<IWidget>().UsingConcreteType<AWidget>();
+
+
+            
+
+
+            /*
+            
+
+
+                                                // Build an instance for IWidget, then setup StructureMap to return cloned instances of the 
+                                                // "Prototype" (GoF pattern) whenever s...
 
[truncated message content]

Thread: [Structuremap-commits] SF.net SVN: structuremap: [24] trunk/Source/StructureMap

structuremap-commits