Updating display/shape services

--HG--
branch : mvc3p1

.hgsubstate

@@ -1 +1 @@
-ef6e8cd4054851538d62655df874721889180b78 Clay
+627628209d0b427eb6446e22da5ac046b2cd77c9 Clay

src/Orchard.Tests/DisplayManagement/DisplayHelperTests.cs

@@ -26,7 +26,7 @@ namespace Orchard.Tests.DisplayManagement {
             displayHelper.Invoke("Pager", ArgsUtility.Positional(1, 2, 3, 4));
 
             shapeFactory.Verify(sf=>sf.Build("Pager", It.IsAny<INamedEnumerable<object>>()));
-            displayManager.Verify(dm => dm.Execute(It.IsAny<Shape>(), viewContext, null));
+            //displayManager.Verify(dm => dm.Execute(It.IsAny<Shape>(), viewContext, null));
         }
         [Test]
         public void DisplayingShapeWithArgumentsDynamically() {
@@ -41,7 +41,7 @@ namespace Orchard.Tests.DisplayManagement {
             display.Pager(1, 2, 3, 4);
 
             shapeFactory.Verify(sf => sf.Build("Pager", It.IsAny<INamedEnumerable<object>>()));
-            displayManager.Verify(dm => dm.Execute(It.IsAny<Shape>(), viewContext, null));
+            //displayManager.Verify(dm => dm.Execute(It.IsAny<Shape>(), viewContext, null));
         }
 
 
@@ -58,7 +58,7 @@ namespace Orchard.Tests.DisplayManagement {
             var outline = new Shape { Attributes = new ShapeAttributes { Type = "Outline" } };
             display(outline);
 
-            displayManager.Verify(dm => dm.Execute(outline, viewContext, null));
+            //displayManager.Verify(dm => dm.Execute(outline, viewContext, null));
         }
     }
 }

src/Orchard.Web/Modules/Orchard.DevTools/Controllers/HomeController.cs

@@ -1,5 +1,8 @@
+using System;
+using System.Dynamic;
 using System.Web.Mvc;
 using Orchard.DevTools.Models;
+using Orchard.DisplayManagement;
 using Orchard.Localization;
 using Orchard.Mvc.ViewModels;
 using Orchard.Themes;
@@ -12,11 +15,14 @@ namespace Orchard.DevTools.Controllers {
     public class HomeController : Controller {
         private readonly INotifier _notifier;
 
-        public HomeController(INotifier notifier) {
+        public HomeController(INotifier notifier, IShapeHelperFactory shapeHelperFactory) {
             _notifier = notifier;
             T = NullLocalizer.Instance;
+            New = shapeHelperFactory.CreateShapeHelper();
         }
 
+        dynamic New { get; set; }
+
         public Localizer T { get; set; }
 
         public ActionResult Index() {
@@ -45,5 +51,26 @@ namespace Orchard.DevTools.Controllers {
         public ActionResult SimpleNoTheme() {
             return View("Simple", new Simple { Title = "This is not themed", Quantity = 5 });
         }
+
+        public ActionResult UsingShapes() {
+            ViewModel.Page = New.Page()
+                .Main(New.Zone(typeof(Array), Name: "Main"))
+                .Messages(New.Zone(typeof(Array), Name: "Main"))
+                .Sidebar(New.Zone(typeof(Array), Name: "Main"));
+
+            ViewModel.Page.Messages.Add(
+                New.Message(Content: T("This is a test"), Severity: "Really bad!!!"));
+
+            var model = New.Explosion(Height: 100, Width: 200);
+
+            return View("UsingShapes", model);
+        }
+
+        public static string Break(dynamic view) {
+            return view.Model.Box.Title;
+        }
+    }
+    public class MyViewModel {
+        public dynamic Box { get; set; }
     }
 }

src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj

@@ -43,6 +43,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\nhprof\HibernatingRhinos.Profiler.Appender.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.ComponentModel.DataAnnotations">
@@ -85,6 +86,7 @@
     <Content Include="ScaffoldingTemplates\DataMigration.txt" />
     <Compile Include="Services\ScaffoldingCommandInterpreter.cs" />
     <Compile Include="Settings\DevToolsSettings.cs" />
+    <Compile Include="Shapes.cs" />
     <Compile Include="ViewModels\CommandsExecuteViewModel.cs" />
     <Compile Include="ViewModels\ContentIndexViewModel.cs" />
     <Compile Include="ViewModels\ContentDetailsViewModel.cs" />
@@ -122,7 +124,9 @@
       <Name>Orchard.Core</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="Views\Home\UsingShapes.cshtml" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/Orchard.Web/Modules/Orchard.DevTools/Shapes.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using Orchard.DisplayManagement;
+
+namespace Orchard.DevTools {
+    public class Shapes : IShapeProvider {
+        public IHtmlString Title(dynamic text) {
+            return new HtmlString("<h2>" + text + "</h2>");
+        }
+
+        public IHtmlString Explosion(int Height, int Width) {
+            return new HtmlString(string.Format("<div>Boom {0}x{1}</div>", Height, Width));
+        }
+
+        public IHtmlString Page(dynamic Display, dynamic Shape) {
+            return Display(Shape.Sidebar, Shape.Messages);
+        }
+
+        public IHtmlString Zone(dynamic Display, dynamic Shape) {
+            var tag = new TagBuilder("div");
+            tag.GenerateId("zone-" + Shape.Name);
+            tag.AddCssClass("zone-" + Shape.Name);
+            tag.AddCssClass("zone");
+            tag.InnerHtml = Smash(DisplayAll(Display, Shape)).ToString();
+            return new HtmlString(tag.ToString());
+        }
+
+        public IHtmlString Message(dynamic Display, object Content, string Severity) {
+            return Display(Severity, ": ", Content);
+        }
+
+        private static IHtmlString Smash(IEnumerable<IHtmlString> contents) {
+            return new HtmlString(contents.Aggregate("", (a, b) => a + b));
+        }
+
+        static IEnumerable<IHtmlString> DisplayAll(dynamic Display, dynamic Shape) {
+            foreach (var item in Shape) {
+                yield return Display(item);
+            }
+        }
+    }
+}

src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/UsingShapes.cshtml

@@ -0,0 +1,8 @@
+<div>
+  
+  @Display.Title(text:"This is everything")
+  @Display(Model)
+
+  @Display(View.Page)
+
+</div>

src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs

@@ -11,6 +11,9 @@ using Orchard.ContentManagement.MetaData.Builders;
 using Orchard.Data.Migration.Interpreters;
 using Orchard.Data.Providers;
 using Orchard.Data.Migration;
+using Orchard.DisplayManagement;
+using Orchard.DisplayManagement.Secondary;
+using Orchard.DisplayManagement.Shapes;
 using Orchard.Environment.Extensions;
 using Orchard.Localization;
 using Orchard.Mvc;
@@ -58,6 +61,11 @@ namespace Orchard.Setup {
             builder.RegisterType<DefaultDataMigrationInterpreter>().As<IDataMigrationInterpreter>().InstancePerLifetimeScope();
             builder.RegisterType<DataMigrationManager>().As<IDataMigrationManager>().InstancePerLifetimeScope();
 
+            // in progress - adding services for display/shape support in setup
+            builder.RegisterType<DisplayHelperFactory>().As<IDisplayHelperFactory>();
+            builder.RegisterType<DefaultDisplayManager>().As<IDisplayManager>();
+            builder.RegisterType<DefaultShapeBuilder>().As<IShapeBuilder>();
+            builder.RegisterType<DefaultShapeTableFactory>().As<IShapeTableFactory>(); 
         }
 
 

src/Orchard.sln

@@ -79,7 +79,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.ArchiveLater", "Orc
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nested", "Nested", "{704716AC-45CC-4421-AD1B-73BA833C6825}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClaySharp", "..\nested\Clay\src\ClaySharp\ClaySharp.csproj", "{76BCD43B-7BA5-4B63-B1E1-861641CA2686}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClaySharp", "..\Clay\src\ClaySharp\ClaySharp.csproj", "{76BCD43B-7BA5-4B63-B1E1-861641CA2686}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClaySharp.Tests", "..\Clay\src\ClaySharp.Tests\ClaySharp.Tests.csproj", "{10369238-A590-48BF-8D3E-E83EB6F0C931}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -437,6 +439,16 @@ Global
 		{76BCD43B-7BA5-4B63-B1E1-861641CA2686}.FxCop|Any CPU.Build.0 = Release|Any CPU
 		{76BCD43B-7BA5-4B63-B1E1-861641CA2686}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76BCD43B-7BA5-4B63-B1E1-861641CA2686}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10369238-A590-48BF-8D3E-E83EB6F0C931}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU
+		{10369238-A590-48BF-8D3E-E83EB6F0C931}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU
+		{10369238-A590-48BF-8D3E-E83EB6F0C931}.Coverage|Any CPU.ActiveCfg = Release|Any CPU
+		{10369238-A590-48BF-8D3E-E83EB6F0C931}.Coverage|Any CPU.Build.0 = Release|Any CPU
+		{10369238-A590-48BF-8D3E-E83EB6F0C931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10369238-A590-48BF-8D3E-E83EB6F0C931}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10369238-A590-48BF-8D3E-E83EB6F0C931}.FxCop|Any CPU.ActiveCfg = Release|Any CPU
+		{10369238-A590-48BF-8D3E-E83EB6F0C931}.FxCop|Any CPU.Build.0 = Release|Any CPU
+		{10369238-A590-48BF-8D3E-E83EB6F0C931}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10369238-A590-48BF-8D3E-E83EB6F0C931}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -474,5 +486,6 @@ Global
 		{0DFA2E10-96C8-4E05-BC10-B710B97ECCDE} = {383DBA32-4A3E-48D1-AAC3-75377A694452}
 		{E65E5633-C0FF-453C-A906-481C14F969D6} = {E75A4CE4-CAA6-41E4-B951-33ACC60DC77C}
 		{76BCD43B-7BA5-4B63-B1E1-861641CA2686} = {704716AC-45CC-4421-AD1B-73BA833C6825}
+		{10369238-A590-48BF-8D3E-E83EB6F0C931} = {704716AC-45CC-4421-AD1B-73BA833C6825}
 	EndGlobalSection
 EndGlobal

src/Orchard/DisplayManagement/DisplayHelper.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Web;
 using System.Web.Mvc;
 using ClaySharp;
 using Orchard.DisplayManagement.Shapes;
@@ -31,12 +32,31 @@ namespace Orchard.DisplayManagement {
                 return ShapeTypeExecute(name, parameters);
             }
 
-            if (parameters.Positional.Count() == 1 && parameters.Positional.All(arg => arg is Shape)) {
-                var shape = (Shape)parameters.Positional.Single();
-                return ShapeExecute(shape);
+            if (parameters.Positional.Count() == 1) {
+                return ShapeExecute(parameters.Positional.Single());
             }
 
-            throw new NotImplementedException("Need to handle multiple shapes, as well as other object types");
+            if (parameters.Positional.Any()) {
+                return new Combined(ShapeExecute(parameters.Positional));
+            }
+
+            // zero args - no display to execute
+            return null;
+        }
+
+        public class Combined : IHtmlString {
+            private readonly IEnumerable<object> _fragments;
+
+            public Combined(IEnumerable<object> fragments) {
+                _fragments = fragments;
+            }
+
+            public string ToHtmlString() {
+                return _fragments.Aggregate("", (a, b) => a + b);
+            }
+            public override string ToString() {
+                return ToHtmlString();
+            }
         }
 
         private object ShapeTypeExecute(string name, INamedEnumerable<object> parameters) {
@@ -44,8 +64,13 @@ namespace Orchard.DisplayManagement {
             return ShapeExecute(shape);
         }
 
-        public object ShapeExecute(Shape shape) {
-            return _displayManager.Execute(shape, ViewContext, ViewDataContainer);
+        public object ShapeExecute(object shape) {
+            var context = new DisplayContext { Display = this, Value = shape, ViewContext = ViewContext };
+            return _displayManager.Execute(context);
+        }
+
+        public IEnumerable<object> ShapeExecute(IEnumerable<object> shapes) {
+            return shapes.Select(ShapeExecute).ToArray();
         }
     }
 }

src/Orchard/DisplayManagement/HelperFactories/IDisplayHelperFactory.cs

@@ -1,7 +1,7 @@
 using System.Web.Mvc;
 
 namespace Orchard.DisplayManagement {
-    public interface IDisplayHelperFactory : ISingletonDependency {
+    public interface IDisplayHelperFactory : IDependency {
         DisplayHelper CreateDisplayHelper(ViewContext viewContext, IViewDataContainer viewDataContainer);
     }
 }

src/Orchard/DisplayManagement/HelperFactories/IShapeHelperFactory.cs

@@ -1,5 +1,5 @@
 namespace Orchard.DisplayManagement {
-    public interface IShapeHelperFactory : ISingletonDependency {
+    public interface IShapeHelperFactory : IDependency {
         ShapeHelper CreateShapeHelper();
     }
 }

src/Orchard/DisplayManagement/IDisplayManager.cs

@@ -1,12 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Web;
 using System.Web.Mvc;
 using ClaySharp;
 using Orchard.DisplayManagement.Shapes;
 
 namespace Orchard.DisplayManagement {
-    public interface IDisplayManager : ISingletonDependency {
-        object Execute(Shape shape, ViewContext viewContext, IViewDataContainer viewDataContainer);
+    public interface IDisplayManager : IDependency {
+        IHtmlString Execute(DisplayContext context);
     }
 }

src/Orchard/DisplayManagement/Secondary/DefaultDisplayManager.cs

@@ -1,5 +1,10 @@
-using System.Web;
+using System;
+using System.Dynamic;
+using System.Linq.Expressions;
+using System.Runtime.CompilerServices;
+using System.Web;
 using System.Web.Mvc;
+using Microsoft.CSharp.RuntimeBinder;
 using Orchard.DisplayManagement.Shapes;
 using Orchard.Localization;
 
@@ -7,6 +12,8 @@ namespace Orchard.DisplayManagement.Secondary {
     public class DefaultDisplayManager : IDisplayManager {
         private readonly IShapeTableFactory _shapeTableFactory;
 
+        private static CallSite<Func<CallSite, object, Shape>> _convertAsShapeCallsite;
+
         public DefaultDisplayManager(IShapeTableFactory shapeTableFactory) {
             _shapeTableFactory = shapeTableFactory;
             T = NullLocalizer.Instance;
@@ -14,19 +21,72 @@ namespace Orchard.DisplayManagement.Secondary {
 
         public Localizer T { get; set; }
 
-        public object Execute(Shape shape, ViewContext viewContext, IViewDataContainer viewDataContainer) {
-            ShapeAttributes shapeAttributes = ((dynamic)shape).Attributes;
+
+        public IHtmlString Execute(DisplayContext context) {
+            if (_convertAsShapeCallsite == null) {
+                _convertAsShapeCallsite = CallSite<Func<CallSite, object, Shape>>.Create(
+                new ForgivingConvertBinder(
+                    (ConvertBinder)Binder.Convert(
+                    CSharpBinderFlags.ConvertExplicit | CSharpBinderFlags.CheckedContext,
+                    typeof(Shape),
+                    null/*typeof(DefaultDisplayManager)*/)));
+            }
+            var shape = _convertAsShapeCallsite.Target(_convertAsShapeCallsite, context.Value);
+
+            // non-shape arguements are returned as a no-op
+            if (shape == null)
+                return CoerceHtmlString(context.Value);
+
+            var shapeAttributes = shape.Attributes;
+            // can't really cope with a shape that has no type information
+            if (shapeAttributes == null || string.IsNullOrEmpty(shapeAttributes.Type))
+                return CoerceHtmlString(context.Value);
+
             var shapeTable = _shapeTableFactory.CreateShapeTable();
             ShapeTable.Entry entry;
             if (shapeTable.Entries.TryGetValue(shapeAttributes.Type, out entry)) {
-                return Process(entry, shape, viewContext, viewDataContainer);
+                return Process(entry, shape, context);
             }
-            throw new OrchardException(T("Shape name not found"));
+            throw new OrchardException(T("Shape type {0} not found", shapeAttributes.Type));
         }
 
-        private object Process(ShapeTable.Entry entry, Shape shape, ViewContext viewContext, IViewDataContainer viewDataContainer) {
-            var displayContext = new DisplayContext { ViewContext = viewContext, Shape = shape };
-            return entry.Target(displayContext);
+        private IHtmlString CoerceHtmlString(object value) {
+            if (value == null)
+                return null;
+
+            var result = value as IHtmlString;
+            if (result != null)
+                return result;
+
+            return new HtmlString(HttpUtility.HtmlEncode(value));
+        }
+
+        private IHtmlString Process(ShapeTable.Entry entry, Shape shape, DisplayContext context) {
+            return CoerceHtmlString(entry.Target(context));
+        }
+
+        class ForgivingConvertBinder : ConvertBinder {
+            private readonly ConvertBinder _innerBinder;
+
+            public ForgivingConvertBinder(ConvertBinder innerBinder)
+                : base(innerBinder.ReturnType, innerBinder.Explicit) {
+                _innerBinder = innerBinder;
+            }
+
+            public override DynamicMetaObject FallbackConvert(DynamicMetaObject target, DynamicMetaObject errorSuggestion) {
+                // adjust the normal csharp convert binder to allow failure to become null.
+                // this causes the same net effect as the "as" keyword, but may be applied to dynamic objects
+                return _innerBinder.FallbackConvert(
+                    target,
+                    errorSuggestion ?? new DynamicMetaObject(Expression.Default(_innerBinder.ReturnType), GetTypeRestriction(target)));
+            }
+
+            static BindingRestrictions GetTypeRestriction(DynamicMetaObject obj) {
+                if ((obj.Value == null) && obj.HasValue) {
+                    return BindingRestrictions.GetInstanceRestriction(obj.Expression, null);
+                }
+                return BindingRestrictions.GetTypeRestriction(obj.Expression, obj.LimitType);
+            }
         }
     }
 }

src/Orchard/DisplayManagement/Shapes/DefaultShapeBuilder.cs

@@ -1,18 +1,50 @@
-using System.Linq;
+using System;
+using System.Linq;
 using ClaySharp;
 
 namespace Orchard.DisplayManagement.Shapes {
     public class DefaultShapeBuilder : IShapeBuilder {
         public Shape Build(string shapeType, INamedEnumerable<object> parameters) {
-            var shape = ClayActivator.CreateInstance<Shape>(new IClayBehavior[]{
-                new ClaySharp.Behaviors.InterfaceProxyBehavior(),
-                new ClaySharp.Behaviors.PropBehavior(),
-                new ClaySharp.Behaviors.NilResultBehavior()});
+
+            var positional = parameters.Positional;
+
+            var baseType = positional.Take(1).OfType<Type>().SingleOrDefault();
+            if (baseType == null) {
+                // default to common base class
+                baseType = typeof(Shape);
+            }
+            else {
+                // consume the first argument
+                positional = positional.Skip(1);
+            }
+            IClayBehavior[] behaviors;
+
+            if (baseType == typeof(Array)) {
+                // array is a hint - not an intended base class
+                baseType = typeof (Shape);
+                behaviors = new IClayBehavior[] {
+                    new ClaySharp.Behaviors.InterfaceProxyBehavior(),
+                    new ClaySharp.Behaviors.PropBehavior(),
+                    new ClaySharp.Behaviors.ArrayBehavior(),
+                    new ClaySharp.Behaviors.NilResultBehavior()
+                };
+            }
+            else {
+                behaviors = new IClayBehavior[] {
+                    new ClaySharp.Behaviors.InterfaceProxyBehavior(),
+                    new ClaySharp.Behaviors.PropBehavior(),
+                    new ClaySharp.Behaviors.NilResultBehavior()
+                };
+            }
+
+            // consideration - types without default constructors could consume positional arguments?
+            var shape = ClayActivator.CreateInstance(baseType, behaviors);
 
             shape.Attributes = new ShapeAttributes { Type = shapeType };
 
-            if (parameters.Positional.Any()) {
-                var initializer = parameters.Positional.Single();
+            // only one non-Type, non-named argument is allowed
+            var initializer = positional.SingleOrDefault();
+            if (initializer != null) {
                 foreach (var prop in initializer.GetType().GetProperties()) {
                     shape[prop.Name] = prop.GetValue(initializer, null);
                 }

src/Orchard/DisplayManagement/Shapes/IShapeBuilder.cs

@@ -1,7 +1,7 @@
 using ClaySharp;
 
 namespace Orchard.DisplayManagement.Shapes {
-    public interface IShapeBuilder {
+    public interface IShapeBuilder : IDependency {
         Shape Build(string shapeType, INamedEnumerable<object> parameters);
     }
 }

src/Orchard/DisplayManagement/Speculation/DefaultShapeTableFactory.cs

@@ -23,12 +23,31 @@ namespace Orchard.DisplayManagement {
                     var provider = shapeProvider;
                     yield return new ShapeTable.Entry {
                         ShapeType = methodInfo.Name,
-                        Target = ctx => info.Invoke(provider, new object[0])
+                        Target = ctx => PerformInvoke(ctx, info, provider)
                     };
                 }
             }
         }
 
+        private object PerformInvoke(DisplayContext displayContext, MethodInfo methodInfo, IShapeProvider shapeProvider) {
+            // oversimplification for the sake of evolving
+            dynamic shape = displayContext.Value;
+            var arguments = methodInfo.GetParameters()
+                .Select(parameter => BindParameter(displayContext, parameter));
+
+            return methodInfo.Invoke(shapeProvider, arguments.ToArray());
+        }
+
+        private object BindParameter(DisplayContext displayContext, ParameterInfo parameter) {
+            if (parameter.Name == "Shape")
+                return displayContext.Value;
+
+            if (parameter.Name == "Display")
+                return displayContext.Display;
+
+            return ((dynamic)(displayContext.Value))[parameter.Name];
+        }
+
         static bool IsAcceptableMethod(MethodInfo methodInfo) {
             if (methodInfo.IsSpecialName)
                 return false;

src/Orchard/DisplayManagement/Speculation/DisplayContext.cs

@@ -8,7 +8,8 @@ using Orchard.DisplayManagement.Shapes;
 
 namespace Orchard.DisplayManagement {
     public class DisplayContext  {
+        public DisplayHelper Display { get; set; }
         public ViewContext ViewContext { get; set; }
-        public Shape Shape { get; set; }
+        public object Value { get; set; }
     }
 }

src/Orchard/DisplayManagement/Speculation/IShapeProvider.cs

@@ -1,3 +1,3 @@
 namespace Orchard.DisplayManagement {
-    public interface IShapeProvider : ISingletonDependency{}
+    public interface IShapeProvider : IDependency{}
 }

src/Orchard/DisplayManagement/Speculation/IShapeTableFactory.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 
 namespace Orchard.DisplayManagement {
-    public interface IShapeTableFactory : ISingletonDependency {
+    public interface IShapeTableFactory : IDependency {
         ShapeTable CreateShapeTable();
     }
 }

src/Orchard/Orchard.Framework.csproj

@@ -77,9 +77,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Castle Windsor 2.0\bin\Castle.DynamicProxy2.dll</HintPath>
     </Reference>
-    <Reference Include="ClaySharp">
-      <HintPath>..\..\lib\clay\ClaySharp.dll</HintPath>
-    </Reference>
     <Reference Include="FluentNHibernate, Version=1.0.0.593, Culture=neutral, PublicKeyToken=8aa435e3cb308880, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\fluentnhibernate\FluentNHibernate.dll</HintPath>
@@ -814,7 +811,12 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\..\Clay\src\ClaySharp\ClaySharp.csproj">
+      <Project>{76BCD43B-7BA5-4B63-B1E1-861641CA2686}</Project>
+      <Name>ClaySharp</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.