diff --git a/lib/claysharp/ClaySharp.dll b/lib/claysharp/ClaySharp.dll deleted file mode 100644 index 51179ddad..000000000 Binary files a/lib/claysharp/ClaySharp.dll and /dev/null differ diff --git a/lib/claysharp/ClaySharp.pdb b/lib/claysharp/ClaySharp.pdb deleted file mode 100644 index 991b7fc80..000000000 Binary files a/lib/claysharp/ClaySharp.pdb and /dev/null differ diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index 3e0a67193..1abcf3f7e 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -59,9 +59,6 @@ False ..\..\lib\autofac\Autofac.dll - - ..\..\lib\claysharp\ClaySharp.dll - False ..\..\lib\nhibernate\FluentNHibernate.dll diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index 7048e937b..eb1f4fa23 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -62,9 +62,6 @@ ..\..\lib\Castle Windsor 2.0\bin\Castle.Core.dll - - ..\..\lib\claysharp\ClaySharp.dll - False ..\..\lib\nhibernate\FluentNHibernate.dll diff --git a/src/Orchard.Tests.Modules/Scripting.Dlr/ScriptingTests.cs b/src/Orchard.Tests.Modules/Scripting.Dlr/ScriptingTests.cs index 7f926a971..dbf09e961 100644 --- a/src/Orchard.Tests.Modules/Scripting.Dlr/ScriptingTests.cs +++ b/src/Orchard.Tests.Modules/Scripting.Dlr/ScriptingTests.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using Autofac; -using ClaySharp; using NUnit.Framework; using Orchard.Scripting.Dlr.Services; using Path = Bleroy.FluentPath.Path; @@ -83,22 +82,6 @@ namespace Orchard.Tests.Modules.Scripting.Dlr { Assert.That(_scriptingManager.ExecuteExpression("f / 4"), Is.EqualTo(8)); } - - [Test] - public void CanDeclareCallbackOnGlobalMethod() { - _scriptingManager.SetVariable("x", new Clay(new ReturnMethodNameLengthBehavior())); - - Assert.That(_scriptingManager.ExecuteExpression("3 + x.foo()"), Is.EqualTo(6)); - } - - - public class ReturnMethodNameLengthBehavior : ClayBehavior { - public override object InvokeMemberMissing(Func proceed, object self, string name, INamedEnumerable args) { - Trace.WriteLine("Returning length of " + name); - return name.Length; - } - } - [Test] public void CanDeclareCallbackOnInstanceEvalWithFile() { var targetPath = _tempFolderName.Combine("CallbackOnInstanceEval.rb"); diff --git a/src/Orchard.Tests/DisplayManagement/ArgsUtility.cs b/src/Orchard.Tests/DisplayManagement/ArgsUtility.cs index 8c0eed77d..25d124717 100644 --- a/src/Orchard.Tests/DisplayManagement/ArgsUtility.cs +++ b/src/Orchard.Tests/DisplayManagement/ArgsUtility.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Web.Routing; -using ClaySharp; -using ClaySharp.Implementation; +using Orchard.DisplayManagement; namespace Orchard.Tests.DisplayManagement { public static class ArgsUtility { diff --git a/src/Orchard.Tests/DisplayManagement/CompositeTests.cs b/src/Orchard.Tests/DisplayManagement/CompositeTests.cs new file mode 100644 index 000000000..5fcba7567 --- /dev/null +++ b/src/Orchard.Tests/DisplayManagement/CompositeTests.cs @@ -0,0 +1,61 @@ +using NUnit.Framework; +using Orchard.DisplayManagement.Shapes; + +namespace Orchard.Tests.DisplayManagement { + [TestFixture] + public class CompositeTests { + + [Test] + public void CompositesShouldNotOverrideExistingMembers() { + var composite = new Animal {Color = "Pink"}; + + Assert.That(composite.Color, Is.EqualTo("Pink")); + } + + [Test] + public void CompositesShouldNotOverrideExistingMembersWhenUsedAsDynamic() { + dynamic composite = new Animal(); + + composite.Color = "Pink"; + Assert.That(composite.Color, Is.EqualTo("Pink")); + } + + [Test] + public void CompositesShouldAccessUnknownProperties() { + dynamic composite = new Animal(); + + composite.Fake = 42; + Assert.That(composite.Fake, Is.EqualTo(42)); + } + + [Test] + public void CompositesShouldAccessUnknownPropertiesByIndex() { + dynamic composite = new Animal(); + + composite["Fake"] = 42; + Assert.That(composite["Fake"], Is.EqualTo(42)); + } + + [Test] + public void CompositesShouldAccessKnownPropertiesByIndex() { + dynamic composite = new Animal(); + + composite["Pink"] = "Pink"; + Assert.That(composite["Pink"], Is.EqualTo("Pink")); + } + + [Test] + public void ChainProperties() { + dynamic foo = new Animal(); + foo.Bar("bar"); + + Assert.That(foo.Bar, Is.EqualTo("bar")); + Assert.That(foo.Bar == null, Is.False); + } + } + + public class Animal : Composite { + public string Kind { get; set; } + public string Color { get; set; } + } +} diff --git a/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs b/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs index 7ee8a5964..f85cbbbfb 100644 --- a/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs +++ b/src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs @@ -37,7 +37,43 @@ namespace Orchard.Tests.DisplayManagement { [Test] public void CreateShapeWithNamedArguments() { var factory = _container.Resolve(); - var foo = factory.Create("Foo", ArgsUtility.Named(new { one = 1, two = "dos" })); + dynamic foo = factory.Create("Foo", ArgsUtility.Named(new { one = 1, two = "dos" })); + Assert.That(foo.one, Is.EqualTo(1)); + Assert.That(foo.two, Is.EqualTo("dos")); } + + [Test] + public void CallSyntax() { + dynamic factory = _container.Resolve(); + var foo = factory.Foo(); + ShapeMetadata metadata = foo.Metadata; + Assert.That(metadata.Type, Is.EqualTo("Foo")); + } + + [Test] + public void CallInitializer() { + dynamic factory = _container.Resolve(); + var bar = new {One = 1, Two = "two"}; + var foo = factory.Foo(bar); + + Assert.That(foo.One, Is.EqualTo(1)); + Assert.That(foo.Two, Is.EqualTo("two")); + } + + [Test] + public void CallInitializerWithBaseType() { + dynamic factory = _container.Resolve(); + var bar = new { One = 1, Two = "two" }; + var foo = factory.Foo(typeof(MyShape), bar); + + Assert.That(foo, Is.InstanceOf()); + Assert.That(foo.One, Is.EqualTo(1)); + Assert.That(foo.Two, Is.EqualTo("two")); + } + + public class MyShape : Shape { + public string Kind { get; set; } + } + } } diff --git a/src/Orchard.Tests/DisplayManagement/ZoneHoldingTests.cs b/src/Orchard.Tests/DisplayManagement/ZoneHoldingTests.cs new file mode 100644 index 000000000..ac3c4bff3 --- /dev/null +++ b/src/Orchard.Tests/DisplayManagement/ZoneHoldingTests.cs @@ -0,0 +1,88 @@ +using System; +using NUnit.Framework; +using Orchard.DisplayManagement.Shapes; +using Orchard.UI.Zones; + +namespace Orchard.Tests.DisplayManagement { + [TestFixture] + public class ZoneHoldingTests { + + [Test] + public void ZonesShouldReturn() { + Func factory = () => new Shape(); + + var foo = new ZoneHolding(factory); + Assert.That(foo.Zones, Is.InstanceOf()); + } + + [Test] + public void MemberShouldCreateAZone() { + Func factory = () => new Shape(); + + dynamic foo = new ZoneHolding(factory); + Assert.That(foo.Header, Is.InstanceOf()); + } + + [Test] + public void IndexShouldCreateAZone() { + Func factory = () => new Shape(); + + dynamic foo = new ZoneHolding(factory); + Assert.That(foo.Zones["Header"], Is.InstanceOf()); + } + + [Test] + public void ZonesMemberShouldCreateAZone() { + Func factory = () => new Shape(); + + dynamic foo = new ZoneHolding(factory); + Assert.That(foo.Zones.Header, Is.InstanceOf()); + } + + [Test] + public void ZonesShouldBeUnique() { + Func factory = () => new Shape(); + + dynamic foo = new ZoneHolding(factory); + var header = foo.Header; + + Assert.That(foo.Zones.Header, Is.EqualTo(header)); + Assert.That(foo.Zones["Header"], Is.EqualTo(header)); + Assert.That(foo.Header, Is.EqualTo(header)); + } + + + [Test] + public void EmptyZonesShouldBeNull() { + Func factory = () => new Shape(); + + dynamic foo = new ZoneHolding(factory); + + Assert.That(foo.Header == 1, Is.False); + Assert.That(foo.Header != 1, Is.True); + + dynamic header = foo.Header; + + Assert.That(header == null, Is.True); + Assert.That(header != null, Is.False); + + Assert.That(header == Nil.Instance, Is.True); + Assert.That(header != Nil.Instance, Is.False); + } + + [Test] + public void NoneEmptyZonesShouldBeNull() { + Func factory = () => new Shape(); + + dynamic foo = new ZoneHolding(factory); + foo.Header.Add("blah"); + + Assert.That(foo.Header == null, Is.False); + Assert.That(foo.Header != null, Is.True); + + Assert.That(foo.Header == Nil.Instance, Is.False); + Assert.That(foo.Header != Nil.Instance, Is.True); + } + + } +} diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 0e2f29486..a2a640d29 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -71,10 +71,6 @@ False ..\..\lib\Castle Windsor 2.0\bin\Castle.DynamicProxy2.dll - - False - ..\..\lib\claysharp\ClaySharp.dll - False ..\..\lib\nhibernate\FluentNHibernate.dll @@ -220,6 +216,8 @@ + + diff --git a/src/Orchard.Tests/UI/ShapeTests.cs b/src/Orchard.Tests/UI/ShapeTests.cs index 202f2b59d..3e5ef2e7d 100644 --- a/src/Orchard.Tests/UI/ShapeTests.cs +++ b/src/Orchard.Tests/UI/ShapeTests.cs @@ -2,107 +2,98 @@ using System.Collections.Generic; using System.Linq; using Autofac; -using ClaySharp; using NUnit.Framework; +using Orchard.Core.Shapes; using Orchard.DisplayManagement; using Orchard.DisplayManagement.Descriptors; using Orchard.DisplayManagement.Implementation; -using Orchard.DisplayManagement.Shapes; -using Orchard.Environment; -using Orchard.Mvc; +using Orchard.Tests.DisplayManagement; using Orchard.UI.Zones; namespace Orchard.Tests.UI { [TestFixture] public class ShapeTests : ContainerTestBase { - private WorkContext _workContext; + dynamic _layout; protected override void Register(ContainerBuilder builder) { - builder.RegisterType().As(); - builder.RegisterType().As(); + var defaultShapeTable = new ShapeTable { + Descriptors = new Dictionary(StringComparer.OrdinalIgnoreCase), + Bindings = new Dictionary(StringComparer.OrdinalIgnoreCase) + }; + builder.Register(ctx => defaultShapeTable); + + builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); - //builder.RegisterType().As(); - builder.RegisterType().As(); - - throw new NotImplementedException("this test fixture needs to move to modules tests now"); + builder.RegisterType().As(); + builder.RegisterType().As(); + builder.RegisterType().As(); + builder.RegisterType().As(); } protected override void Resolve(ILifetimeScope container) { - _workContext = container.Resolve().CreateWorkContextScope().WorkContext; + var shapeFactory = _container.Resolve(); + _layout = new ZoneHolding(() => shapeFactory.Create("Zone")); } - [Test, Ignore("implementation pending")] - public void WorkContextPageIsLayoutShape() { - var layout = _workContext.Layout; - ShapeMetadata pageMetadata = layout.Metadata; - Assert.That(pageMetadata.Type, Is.EqualTo("Layout")); - Assert.That(layout.Metadata.Type, Is.EqualTo("Layout")); - } - - [Test, Ignore("implementation pending")] + [Test] public void PagePropertiesAreNil() { - var layout = _workContext.Layout; - var pageFoo = layout.Foo; + + var pageFoo = _layout.Foo; Assert.That(pageFoo == null); } - [Test, Ignore("implementation pending")] + [Test] public void PageZonesPropertyIsNotNil() { - var layout = _workContext.Layout; - var pageZones = layout.Zones; + var pageZones = _layout.Zones; Assert.That(pageZones != null); Assert.That(pageZones.Foo == null); } - [Test, Ignore("implementation pending")] + [Test] public void AddingToZonePropertyMakesItExist() { - var layout = _workContext.Layout; - Assert.That(layout.Zones.Foo == null); + Assert.That(_layout.Zones.Foo == null); - var pageZonesFoo = layout.Zones.Foo; + var pageZonesFoo = _layout.Zones.Foo; pageZonesFoo.Add("hello"); - Assert.That(layout.Zones.Foo != null); - Assert.That(layout.Foo != null); - Assert.That(layout.Foo.Metadata.Type, Is.EqualTo("Zone")); + Assert.That(_layout.Zones.Foo != null); + Assert.That(_layout.Foo != null); + Assert.That(_layout.Foo.Metadata.Type, Is.EqualTo("Zone")); } - [Test, Ignore("implementation pending")] + [Test] public void AddingToZoneIndexedMakesItExist() { - var layout = _workContext.Layout; - Assert.That(layout.Zones["Foo"] == null); + Assert.That(_layout.Zones["Foo"] == null); - var pageZonesFoo = layout.Zones["Foo"]; + var pageZonesFoo = _layout.Zones["Foo"]; pageZonesFoo.Add("hello"); - Assert.That(layout.Zones["Foo"] != null); - Assert.That(layout["Foo"] != null); - Assert.That(layout["Foo"].Metadata.Type, Is.EqualTo("Zone")); + Assert.That(_layout.Zones["Foo"] != null); + Assert.That(_layout["Foo"] != null); + Assert.That(_layout["Foo"].Metadata.Type, Is.EqualTo("Zone")); } - [Test, Ignore("implementation pending")] + [Test] public void CallingAddOnNilPropertyMakesItBecomeZone() { - var layout = _workContext.Layout; - Assert.That(layout.Foo == null); + Assert.That(_layout.Foo == null); - layout.Foo.Add("hello"); + _layout.Foo.Add("hello"); - Assert.That(layout.Foo != null); - Assert.That(layout.Foo.Metadata.Type, Is.EqualTo("Zone")); + Assert.That(_layout.Foo != null); + Assert.That(_layout.Foo.Metadata.Type, Is.EqualTo("Zone")); } - [Test, Ignore("implementation pending")] + [Test] public void ZoneContentsAreEnumerable() { - var layout = _workContext.Layout; - Assert.That(layout.Foo == null); + Assert.That(_layout.Foo == null); - layout.Foo.Add("hello"); - layout.Foo.Add("world"); + _layout.Foo.Add("hello"); + _layout.Foo.Add("world"); var list = new List(); - foreach (var item in layout.Foo) { + foreach (var item in _layout.Foo) { list.Add(item); } @@ -111,27 +102,38 @@ namespace Orchard.Tests.UI { Assert.That(list.Last(), Is.EqualTo("world")); } + [Test] + public void ZoneContentsCastBeConvertedToEnunerableOfObject() { + Assert.That(_layout.Foo == null); - class NumberIsAlwaysFortyTwo : ShapeFactoryEvents { - public override void Creating(ShapeCreatingContext context) { - context.Behaviors.Add(new Behavior()); - } + _layout.Foo.Add("hello"); + _layout.Foo.Add("world"); - class Behavior : ClayBehavior { - public override object GetMember(Func proceed, object self, string name) { - return name == "Number" ? 42 : proceed(); - } - } + IEnumerable list = _layout.Foo; + + Assert.That(list.Count(), Is.EqualTo(2)); + Assert.That(list.First(), Is.EqualTo("hello")); + Assert.That(list.Last(), Is.EqualTo("world")); + + var first = ((IEnumerable)_layout.Foo).FirstOrDefault(); + Assert.That(first, Is.EqualTo("hello")); } - [Test, Ignore("implementation pending")] - public void NumberIsFortyTwo() { - var layout = _workContext.Layout; - Assert.That(layout.Number, Is.EqualTo(42)); - Assert.That(layout.Foo.Number == null); - layout.Foo.Add("yarg"); - Assert.That(layout.Foo.Number, Is.EqualTo(42)); + [Test] + public void ZoneContentsCastBeConvertedToEnunerableOfDynamics() { + Assert.That(_layout.Foo == null); + + _layout.Foo.Add("hello"); + _layout.Foo.Add("world"); + + IEnumerable list = _layout.Foo; + + Assert.That(list.Count(), Is.EqualTo(2)); + Assert.That(list.First(), Is.EqualTo("hello")); + Assert.That(list.Last(), Is.EqualTo("world")); + + var first = ((IEnumerable) _layout.Foo).FirstOrDefault(); + Assert.That(first, Is.EqualTo("hello")); } } - } diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index a3579ca58..a4b76040a 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -46,11 +46,6 @@ AllRules.ruleset - - False - ..\..\..\lib\claysharp\ClaySharp.dll - True - diff --git a/src/Orchard.Web/Core/Shapes/CoreShapes.cs b/src/Orchard.Web/Core/Shapes/CoreShapes.cs index 6c810015a..20627dc96 100644 --- a/src/Orchard.Web/Core/Shapes/CoreShapes.cs +++ b/src/Orchard.Web/Core/Shapes/CoreShapes.cs @@ -48,7 +48,7 @@ namespace Orchard.Core.Shapes { // and has an automatic zone creating behavior builder.Describe("Layout") .Configure(descriptor => descriptor.Wrappers.Add("Document")) - .OnCreating(creating => creating.Behaviors.Add(new ZoneHoldingBehavior(() => creating.New.Zone(), null))) + .OnCreating(creating => creating.Create = () => new ZoneHolding(() => creating.New.Zone())) .OnCreated(created => { var layout = created.Shape; @@ -68,7 +68,7 @@ namespace Orchard.Core.Shapes { // They have class="zone zone-{name}" // and the template can be specialized with "Zone-{Name}" base file name builder.Describe("Zone") - .OnCreating(creating => creating.BaseType = typeof(Zone)) + .OnCreating(creating => creating.Create = () => new Zone()) .OnDisplaying(displaying => { var zone = displaying.Shape; string zoneName = zone.ZoneName; diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj index 997162bb1..aa7266286 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj @@ -21,6 +21,10 @@ 4.0 + + + + true @@ -41,7 +45,6 @@ 4 - diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/PlacementService.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/PlacementService.cs index e0af18790..ddfaa1c31 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/PlacementService.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/PlacementService.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Web; using System.Web.Routing; -using ClaySharp.Implementation; using Orchard.ContentManagement; using Orchard.ContentManagement.Drivers; using Orchard.ContentManagement.Handlers; @@ -215,8 +214,9 @@ namespace Orchard.ContentTypes.Services { } private dynamic CreateItemShape(string actualShapeType) { - var zoneHoldingBehavior = new ZoneHoldingBehavior((Func)(() => _shapeFactory.Create("ContentZone", Arguments.Empty())), _workContextAccessor.GetContext().Layout); - return _shapeFactory.Create(actualShapeType, Arguments.Empty(), new[] { zoneHoldingBehavior }); + var zoneHolding = new ZoneHolding(() => _shapeFactory.Create("ContentZone", Arguments.Empty())); + zoneHolding.Metadata.Type = actualShapeType; + return zoneHolding; } private void BindPlacement(BuildShapeContext context, string displayType, string stereotype) { diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj b/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj index 513a9a638..e48d7db9e 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj @@ -21,6 +21,10 @@ false + + + + true @@ -42,10 +46,6 @@ AllRules.ruleset - - ..\..\..\..\lib\claysharp\ClaySharp.dll - True - diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js b/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js index a6431a172..a90572c3e 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js @@ -550,7 +550,7 @@ jQuery(function ($) { var text = shapeNode.type; // add the hint to the tree node if available - if (shapeNode.hint != '') { + if (shapeNode.hint && shapeNode.hint != '') { text += ' [' + shapeNode.hint + ']'; } diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ObjectDumper.cs b/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ObjectDumper.cs index 063294a35..7392d3b82 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ObjectDumper.cs +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ObjectDumper.cs @@ -4,7 +4,6 @@ using System.Collections; using System.Linq; using System.Reflection; using System.Xml.Linq; -using ClaySharp; using Orchard.ContentManagement; using Orchard.DisplayManagement; using Orchard.DisplayManagement.Shapes; @@ -195,12 +194,19 @@ namespace Orchard.DesignerTools.Services { } private void DumpShape(IShape shape) { - var members = new Dictionary(); - ((IClayBehaviorProvider) (dynamic) shape).Behavior.GetMembers(() => null, shape, members); + var value = shape as Shape; - foreach (var key in members.Keys.Where(key => !key.StartsWith("_"))) { + if (value == null) { + return; + } + + foreach (DictionaryEntry entry in value.Properties) { // ignore private members (added dynamically by the shape wrapper) - Dump(members[key], key); + if (entry.Key.ToString().StartsWith("_")) { + continue; + } + + Dump(entry.Value, entry.Key.ToString()); } } diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj b/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj index 9e3c10258..2e96b387d 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj +++ b/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj @@ -46,9 +46,6 @@ AllRules.ruleset - - ..\..\..\..\lib\claysharp\ClaySharp.dll - ..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Shapes/EditorShapes.cs b/src/Orchard.Web/Modules/Orchard.Forms/Shapes/EditorShapes.cs index fc9a9c92f..42eebdfd1 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Shapes/EditorShapes.cs +++ b/src/Orchard.Web/Modules/Orchard.Forms/Shapes/EditorShapes.cs @@ -26,8 +26,8 @@ namespace Orchard.Forms.Shapes { builder.Describe("Input").Configure(descriptor => descriptor.Wrappers.Add("InputWrapper")); builder.Describe("SelectList").Configure(descriptor => descriptor.Wrappers.Add("InputWrapper")); builder.Describe("Textarea").Configure(descriptor => descriptor.Wrappers.Add("InputWrapper")); - builder.Describe("Form").OnCreating(ctx => ctx.Behaviors.Add(new PropertiesAreItems())); - builder.Describe("Fieldset").OnCreating(ctx => ctx.Behaviors.Add(new PropertiesAreItems())); + builder.Describe("Form").OnCreating(ctx => ctx.Create = () => new PropertiesAreItems()); + builder.Describe("Fieldset").OnCreating(ctx => ctx.Create = () => new PropertiesAreItems()); } [Shape] diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Shapes/PropertyItemsBehavior.cs b/src/Orchard.Web/Modules/Orchard.Forms/Shapes/PropertyItemsBehavior.cs index 1fa9691c6..4bc96cb48 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Shapes/PropertyItemsBehavior.cs +++ b/src/Orchard.Web/Modules/Orchard.Forms/Shapes/PropertyItemsBehavior.cs @@ -1,26 +1,26 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Orchard.DisplayManagement; -using ClaySharp; +using Orchard.DisplayManagement.Shapes; namespace Orchard.Forms.Shapes { - public class PropertiesAreItems : ClayBehavior { - public override object SetMember(Func proceed, dynamic self, string name, object value) { - Patch(self, name, value); - return proceed(); + public class PropertiesAreItems : Composite { + public override bool TrySetMember(System.Dynamic.SetMemberBinder binder, object value) { + Patch(this, binder.Name, value); + return base.TrySetMember(binder, value); } - public override object SetIndex(Func proceed, dynamic self, IEnumerable keys, object value) { - if (keys.Count() == 1 && keys.All(k => k is string)) - Patch(self, System.Convert.ToString(keys.Single()), value); - return proceed(); + public override bool TrySetIndex(System.Dynamic.SetIndexBinder binder, object[] indexes, object value) { + if (indexes.Count() == 1 && indexes.All(k => k is string)) + Patch(this, System.Convert.ToString(indexes.Single()), value); + return base.TrySetIndex(binder, indexes, value); } - public override object InvokeMember(Func proceed, dynamic self, string name, INamedEnumerable args) { - if (args.Count() == 1 && args.Named.Count() == 0) - Patch(self, name, args.Single()); - return proceed(); + public override bool TryInvokeMember(System.Dynamic.InvokeMemberBinder binder, object[] args, out object result) { + var arguments = Arguments.From(args, binder.CallInfo.ArgumentNames); + if (args.Count() == 1 && !arguments.Named.Any()) + Patch(this, binder.Name, args.Single()); + return base.TryInvokeMember(binder, args, out result); } readonly IDictionary _assigned = new Dictionary(); diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj b/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj index 578960cf7..dabcc5317 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj +++ b/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj @@ -21,6 +21,10 @@ false + + + + true @@ -42,7 +46,6 @@ AllRules.ruleset - diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj index 3ca370a28..f0ba33f90 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj +++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj @@ -50,9 +50,6 @@ False ..\..\..\..\lib\autofac\Autofac.dll - - ..\..\..\..\lib\claysharp\ClaySharp.dll - diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml index bcf5586d4..3ef9783e7 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml @@ -30,7 +30,11 @@ : null; IHtmlString sectionHeaderMarkup; - if (firstOfTheSecond != null && firstLevelMenuItem.LinkToFirstChild && (firstOfTheSecond.RouteValues != null || HasText(firstOfTheSecond.Url))) { + if (firstOfTheSecond != null + && firstLevelMenuItem.LinkToFirstChild + && ( + firstOfTheSecond.RouteValues != null + || HasText(firstOfTheSecond.Url))) { sectionHeaderMarkup = HasText(itemId) ? Html.Link(sectionHeaderText, (string)firstOfTheSecond.Href, new { @class = itemClassName, id = itemId }) : Html.Link(sectionHeaderText, (string)firstOfTheSecond.Href, new { @class = itemClassName }); @@ -72,7 +76,7 @@
    @foreach (var secondLevelMenuItem in secondLevelMenuItems.Where(menuItem => !menuItem.LocalNav)) { string secondLevelTextHint = secondLevelMenuItem.Text.TextHint; - var firstOfTheThird = ((IEnumerable)secondLevelMenuItem).FirstOrDefault(); + var firstOfTheThird = ((IEnumerable)secondLevelMenuItem.Items).FirstOrDefault(); var secondLevelItemClassName = HasText(secondLevelTextHint) ? "subnavicon-" + secondLevelTextHint.HtmlClassify() diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index 4b09f407d..7e1d27dc5 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -10,36 +10,32 @@ - - -
    -
    + + +
    +
    - -
    +
    - - - + + - - + - - - - - + + + + + - - - + - + @@ -66,24 +61,24 @@ - - - - - - - - - - + + + + + + + + + + - - - + + + - + @@ -114,14 +108,11 @@ - - + - - @@ -131,10 +122,9 @@ Information Services 7.0. It is not necessary for previous version of IIS. --> - - + - + @@ -142,18 +132,16 @@ - - - - - - - - + + + + + + - + @@ -162,42 +150,34 @@ - - + - - + - - + - - + - - + - - - + + - - - + + - - + \ No newline at end of file diff --git a/src/Orchard/ContentManagement/ContentItem.cs b/src/Orchard/ContentManagement/ContentItem.cs index c3bd5e0d5..3441ff3e9 100644 --- a/src/Orchard/ContentManagement/ContentItem.cs +++ b/src/Orchard/ContentManagement/ContentItem.cs @@ -2,15 +2,12 @@ using System; using System.Collections.Generic; using System.Dynamic; using System.Linq; -using System.Linq.Expressions; -using ClaySharp; using Orchard.ContentManagement.MetaData.Models; using Orchard.ContentManagement.Records; namespace Orchard.ContentManagement { - public class ContentItem : IContent, IContentBehavior, IDynamicMetaObjectProvider { + public class ContentItem : DynamicObject, IContent { public ContentItem() { - _behavior = new ClayBehaviorCollection(new[] { new ContentItemBehavior(this) }); _parts = new List(); } @@ -45,14 +42,20 @@ namespace Orchard.ContentManagement { _parts.Add(part); } + public override bool TryGetMember(GetMemberBinder binder, out object result) { - private readonly IClayBehavior _behavior; - IClayBehavior IContentBehavior.Behavior { - get { return _behavior; } - } - DynamicMetaObject IDynamicMetaObjectProvider.GetMetaObject(Expression parameter) { - return new ClayMetaObject(this, parameter, ex => Expression.Property(Expression.Convert(ex, typeof(IContentBehavior)), "Behavior")); - } + var found = base.TryGetMember(binder, out result); + if (!found) { + foreach (var part in Parts) { + if (part.PartDefinition.Name == binder.Name) { + result = part; + return true; + } + } + return false; + } + return true; + } } } \ No newline at end of file diff --git a/src/Orchard/ContentManagement/ContentItemBehavior.cs b/src/Orchard/ContentManagement/ContentItemBehavior.cs deleted file mode 100644 index d5d91d7ad..000000000 --- a/src/Orchard/ContentManagement/ContentItemBehavior.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using ClaySharp; - -namespace Orchard.ContentManagement { - public class ContentItemBehavior : ClayBehavior { - private readonly IContent _content; - - public ContentItemBehavior(IContent content) { - _content = content; - } - - public override object GetMemberMissing(Func proceed, object self, string name) { - var contentItem = _content.ContentItem; - foreach (var part in contentItem.Parts) { - if (part.PartDefinition.Name == name) - return part; - } - return base.GetMemberMissing(proceed, self, name); - } - } -} diff --git a/src/Orchard/ContentManagement/ContentPart.cs b/src/Orchard/ContentManagement/ContentPart.cs index 6c7c54e4a..25baa7bc5 100644 --- a/src/Orchard/ContentManagement/ContentPart.cs +++ b/src/Orchard/ContentManagement/ContentPart.cs @@ -2,19 +2,16 @@ using System; using System.Collections.Generic; using System.Dynamic; using System.Linq; -using System.Linq.Expressions; using System.Web.Mvc; -using ClaySharp; using Orchard.ContentManagement.MetaData.Models; using Orchard.ContentManagement.Utilities; using Orchard.UI; namespace Orchard.ContentManagement { - public class ContentPart : IContent, IContentBehavior, IDynamicMetaObjectProvider { + public class ContentPart : DynamicObject, IContent { private readonly IList _fields; public ContentPart() { - _behavior = new ClayBehaviorCollection(new[] { new ContentPartBehavior(this) }); _fields = new List(); } @@ -29,14 +26,6 @@ namespace Orchard.ContentManagement { } } - private readonly IClayBehavior _behavior; - IClayBehavior IContentBehavior.Behavior { - get { return _behavior; } - } - DynamicMetaObject IDynamicMetaObjectProvider.GetMetaObject(Expression parameter) { - return new ClayMetaObject(this, parameter, ex => Expression.Property(Expression.Convert(ex, typeof(IContentBehavior)), "Behavior")); - } - /// /// The ContentItem's identifier. /// @@ -65,6 +54,28 @@ namespace Orchard.ContentManagement { _fields.Add(field); } + public override bool TryGetMember(GetMemberBinder binder, out object result) { + + var found = base.TryGetMember(binder, out result); + if (!found) { + foreach (var part in ContentItem.Parts) { + if (part.PartDefinition.Name == binder.Name) { + result = part; + return true; + } + } + + foreach (var field in Fields) { + if (field.PartFieldDefinition.Name == binder.Name) { + result = field; + return true; + } + } + return false; + } + + return true; + } } diff --git a/src/Orchard/ContentManagement/ContentPartBehavior.cs b/src/Orchard/ContentManagement/ContentPartBehavior.cs deleted file mode 100644 index ece924a64..000000000 --- a/src/Orchard/ContentManagement/ContentPartBehavior.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; - -namespace Orchard.ContentManagement { - public class ContentPartBehavior : ContentItemBehavior { - private readonly ContentPart _contentPart; - - public ContentPartBehavior(ContentPart contentPart) - : base(contentPart) { - _contentPart = contentPart; - } - - public override object GetMemberMissing(Func proceed, object self, string name) { - foreach (var field in _contentPart.Fields) { - if (field.PartFieldDefinition.Name == name) - return field; - } - return base.GetMemberMissing(proceed, self, name); - } - } -} \ No newline at end of file diff --git a/src/Orchard/ContentManagement/DefaultContentDisplay.cs b/src/Orchard/ContentManagement/DefaultContentDisplay.cs index 5eb7b1d3a..2c9211c85 100644 --- a/src/Orchard/ContentManagement/DefaultContentDisplay.cs +++ b/src/Orchard/ContentManagement/DefaultContentDisplay.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Web; using System.Web.Routing; -using ClaySharp.Implementation; using Orchard.ContentManagement.Handlers; using Orchard.DisplayManagement; using Orchard.DisplayManagement.Descriptors; @@ -110,8 +109,7 @@ namespace Orchard.ContentManagement { } private dynamic CreateItemShape(string actualShapeType) { - var zoneHoldingBehavior = new ZoneHoldingBehavior((Func)(() => _shapeFactory.Create("ContentZone", Arguments.Empty())), _workContextAccessor.GetContext().Layout); - return _shapeFactory.Create(actualShapeType, Arguments.Empty(), new[] { zoneHoldingBehavior }); + return _shapeFactory.Create(actualShapeType, Arguments.Empty(), () => new ZoneHolding(() => _shapeFactory.Create("ContentZone", Arguments.Empty()))); } private void BindPlacement(BuildShapeContext context, string displayType, string stereotype) { diff --git a/src/Orchard/ContentManagement/IContentBehavior.cs b/src/Orchard/ContentManagement/IContentBehavior.cs deleted file mode 100644 index 6d01fe4c8..000000000 --- a/src/Orchard/ContentManagement/IContentBehavior.cs +++ /dev/null @@ -1,7 +0,0 @@ -using ClaySharp; - -namespace Orchard.ContentManagement { - public interface IContentBehavior { - IClayBehavior Behavior { get; } - } -} \ No newline at end of file diff --git a/src/Orchard/DisplayManagement/Arguments.cs b/src/Orchard/DisplayManagement/Arguments.cs new file mode 100644 index 000000000..3a24e5651 --- /dev/null +++ b/src/Orchard/DisplayManagement/Arguments.cs @@ -0,0 +1,152 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; + +namespace Orchard.DisplayManagement { + public static class Arguments { + public static INamedEnumerable FromT(IEnumerable arguments, IEnumerable names) { + return new NamedEnumerable(arguments, names); + } + + public static INamedEnumerable From(IEnumerable arguments, IEnumerable names) { + return new NamedEnumerable(arguments, names); + } + + class NamedEnumerable : INamedEnumerable { + readonly IEnumerable _arguments; + readonly IEnumerable _names; + + public NamedEnumerable(IEnumerable arguments, IEnumerable names) { + if (arguments == null) { + throw new ArgumentNullException("arguments"); + } + if (names == null) { + throw new ArgumentNullException("names"); + } + if (arguments.Count() < names.Count()) { + throw new ArgumentException("arguments.Count() < names.Count()"); + } + + _arguments = arguments; + _names = names; + } + + IEnumerator IEnumerable.GetEnumerator() { + return _arguments.GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() { + return _arguments.GetEnumerator(); + } + + IEnumerable INamedEnumerable.Positional { + get { return _arguments.Take(_arguments.Count() - _names.Count()); } + } + + IDictionary INamedEnumerable.Named { + get { return new Named(_arguments, _names); } + } + + class Named : IDictionary { + private readonly IEnumerable _arguments; + private readonly IEnumerable _names; + + private ICollection _argumentsCollection; + private ICollection _namesCollection; + + public Named(IEnumerable arguments, IEnumerable names) { + _arguments = arguments.Skip(arguments.Count() - names.Count()); + _names = names; + } + + IEnumerable> MakeEnumerable() { + return _arguments.Zip(_names, (arg, name) => new KeyValuePair(name, arg)); + } + + IEnumerator> IEnumerable>.GetEnumerator() { + return MakeEnumerable().GetEnumerator(); + } + + IEnumerator IEnumerable.GetEnumerator() { + return MakeEnumerable().GetEnumerator(); + } + + void ICollection>.Add(KeyValuePair item) { + throw new NotImplementedException(); + } + + void ICollection>.Clear() { + throw new NotImplementedException(); + } + + bool ICollection>.Contains(KeyValuePair item) { + return MakeEnumerable().Contains(item); + } + + void ICollection>.CopyTo(KeyValuePair[] array, int arrayIndex) { + throw new NotImplementedException(); + } + + bool ICollection>.Remove(KeyValuePair item) { + throw new NotImplementedException(); + } + + int ICollection>.Count { + get { return _names.Count(); } + } + + bool ICollection>.IsReadOnly { + get { return true; } + } + + bool IDictionary.ContainsKey(string key) { + return _names.Contains(key); + } + + void IDictionary.Add(string key, T value) { + throw new NotImplementedException(); + } + + bool IDictionary.Remove(string key) { + throw new NotImplementedException(); + } + + bool IDictionary.TryGetValue(string key, out T value) { + var pair = MakeEnumerable().FirstOrDefault(kv => kv.Key == key); + + // pair is a value type. in case of key-miss, + // will default to key=(string)null,value=(object)null + + value = pair.Value; + return pair.Key != null; + } + + //TBD + T IDictionary.this[string key] { + get { + return MakeEnumerable() + .Where(kv => kv.Key == key) + .Select(kv => kv.Value) + .FirstOrDefault(); + } + set { throw new NotImplementedException(); } + } + + ICollection IDictionary.Keys { + get { + return _namesCollection = _namesCollection ?? _names as ICollection ?? _names.ToArray(); + } + } + + ICollection IDictionary.Values { + get { return _argumentsCollection = _argumentsCollection ?? _arguments as ICollection ?? _arguments.ToArray(); } + } + } + } + + public static INamedEnumerable Empty() { + return From(Enumerable.Empty(), Enumerable.Empty()); + } + } +} diff --git a/src/Orchard/DisplayManagement/INamedEnumerable.cs b/src/Orchard/DisplayManagement/INamedEnumerable.cs new file mode 100644 index 000000000..4daadcf4a --- /dev/null +++ b/src/Orchard/DisplayManagement/INamedEnumerable.cs @@ -0,0 +1,8 @@ +using System.Collections.Generic; + +namespace Orchard.DisplayManagement { + public interface INamedEnumerable : IEnumerable { + IEnumerable Positional { get; } + IDictionary Named { get; } + } +} diff --git a/src/Orchard/DisplayManagement/IShapeFactory.cs b/src/Orchard/DisplayManagement/IShapeFactory.cs index d0bd47aab..e92b43ce3 100644 --- a/src/Orchard/DisplayManagement/IShapeFactory.cs +++ b/src/Orchard/DisplayManagement/IShapeFactory.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; -using ClaySharp; -using ClaySharp.Implementation; +using System; namespace Orchard.DisplayManagement { /// @@ -9,7 +7,7 @@ namespace Orchard.DisplayManagement { /// public interface IShapeFactory : IDependency { IShape Create(string shapeType, INamedEnumerable parameters); - IShape Create(string shapeType, INamedEnumerable parameters, IEnumerable behaviors); + IShape Create(string shapeType, INamedEnumerable parameters, Func createShape); } public static class ShapeFactoryExtensions { diff --git a/src/Orchard/DisplayManagement/Implementation/DefaultShapeFactory.cs b/src/Orchard/DisplayManagement/Implementation/DefaultShapeFactory.cs index 2ba84fa50..2d2b18cc7 100644 --- a/src/Orchard/DisplayManagement/Implementation/DefaultShapeFactory.cs +++ b/src/Orchard/DisplayManagement/Implementation/DefaultShapeFactory.cs @@ -1,35 +1,33 @@ using System; using System.Collections.Generic; using System.Linq; -using ClaySharp; using Orchard.DisplayManagement.Descriptors; using Orchard.DisplayManagement.Shapes; namespace Orchard.DisplayManagement.Implementation { - public class DefaultShapeFactory : Clay, IShapeFactory { + public class DefaultShapeFactory : Composite, IShapeFactory { private readonly IEnumerable> _events; private readonly Lazy _shapeTableLocator; public DefaultShapeFactory( IEnumerable> events, - Lazy shapeTableLocator) : base(new ShapeFactoryBehavior()) + Lazy shapeTableLocator) { _events = events; _shapeTableLocator = shapeTableLocator; } - - class ShapeFactoryBehavior : ClayBehavior { - public override object InvokeMember(Func proceed, object target, string name, INamedEnumerable args) { - return ((DefaultShapeFactory)target).Create(name, args); - } + + public override bool TryInvokeMember(System.Dynamic.InvokeMemberBinder binder, object[] args, out object result) { + result = Create(binder.Name, Arguments.From(args, binder.CallInfo.ArgumentNames)); + return true; } public IShape Create(string shapeType, INamedEnumerable parameters) { - return Create(shapeType, parameters, Enumerable.Empty()); + return Create(shapeType, parameters, () => new Shape()); } - public IShape Create(string shapeType, INamedEnumerable parameters, IEnumerable behaviors) { + public IShape Create(string shapeType, INamedEnumerable parameters, Func createShape) { var defaultShapeTable = _shapeTableLocator.Value.Lookup(null); ShapeDescriptor shapeDescriptor; defaultShapeTable.Descriptors.TryGetValue(shapeType, out shapeDescriptor); @@ -40,42 +38,20 @@ namespace Orchard.DisplayManagement.Implementation { ShapeType = shapeType, OnCreated = new List>() }; - var positional = parameters.Positional; - creatingContext.BaseType = positional.Take(1).OfType().SingleOrDefault(); - if (creatingContext.BaseType == null) { + IEnumerable positional = parameters.Positional.ToList(); + var baseType = positional.FirstOrDefault() as Type; + + if (baseType == null) { // default to common base class - creatingContext.BaseType = typeof(Shape); + creatingContext.Create = createShape ?? (() => new Shape()); } else { // consume the first argument positional = positional.Skip(1); - } - - if (creatingContext.BaseType == typeof(Array)) { - // array is a hint - not an intended base class - creatingContext.BaseType = typeof(Shape); - creatingContext.Behaviors = new List { - new ClaySharp.Behaviors.InterfaceProxyBehavior(), - new ClaySharp.Behaviors.PropBehavior(), - new ClaySharp.Behaviors.ArrayBehavior(), - new ClaySharp.Behaviors.NilResultBehavior(), - }; - } - else { - creatingContext.Behaviors = new List { - new ClaySharp.Behaviors.InterfaceProxyBehavior(), - new ClaySharp.Behaviors.PropBehavior(), - new ClaySharp.Behaviors.NilResultBehavior(), - new Shape.ShapeBehavior(), - }; + creatingContext.Create = () => Activator.CreateInstance(baseType); } - if (behaviors != null && behaviors.Any()) { - // include behaviors passed in by caller, if any - creatingContext.Behaviors = creatingContext.Behaviors.Concat(behaviors).ToList(); - } - // "creating" events may add behaviors and alter base type) foreach (var ev in _events) { ev.Value.Creating(creatingContext); @@ -90,10 +66,15 @@ namespace Orchard.DisplayManagement.Implementation { var createdContext = new ShapeCreatedContext { New = creatingContext.New, ShapeType = creatingContext.ShapeType, - Shape = ClayActivator.CreateInstance(creatingContext.BaseType, creatingContext.Behaviors) + Shape = creatingContext.Create() }; - var shapeMetadata = new ShapeMetadata { Type = shapeType }; - createdContext.Shape.Metadata = shapeMetadata; + + if (!(createdContext.Shape is IShape)) { + throw new InvalidOperationException("Invalid base type for shape: " + createdContext.Shape.GetType().ToString()); + } + + ShapeMetadata shapeMetadata = createdContext.Shape.Metadata; + createdContext.Shape.Metadata.Type = shapeType; if (shapeDescriptor != null) shapeMetadata.Wrappers = shapeMetadata.Wrappers.Concat(shapeDescriptor.Wrappers).ToList(); diff --git a/src/Orchard/DisplayManagement/Implementation/DisplayHelper.cs b/src/Orchard/DisplayManagement/Implementation/DisplayHelper.cs index ffbdbea70..a7ae1c1dc 100644 --- a/src/Orchard/DisplayManagement/Implementation/DisplayHelper.cs +++ b/src/Orchard/DisplayManagement/Implementation/DisplayHelper.cs @@ -1,17 +1,12 @@ using System.Collections.Generic; +using System.Dynamic; using System.Linq; using System.Web; using System.Web.Mvc; -using ClaySharp; namespace Orchard.DisplayManagement.Implementation { - /// - /// Refactor: I this doesn't really need to exist, does it? - /// It can all be an aspect of a display helper behavior implementation... - /// Or should this remain a CLR type for clarity? - /// - public class DisplayHelper { + public class DisplayHelper : DynamicObject { private readonly IDisplayManager _displayManager; private readonly IShapeFactory _shapeFactory; @@ -29,6 +24,16 @@ namespace Orchard.DisplayManagement.Implementation { public ViewContext ViewContext { get; set; } public IViewDataContainer ViewDataContainer { get; set; } + public override bool TryInvoke(InvokeBinder binder, object[] args, out object result) { + result = Invoke(null, Arguments.From(args, binder.CallInfo.ArgumentNames)); + return true; + } + + public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result) { + result = Invoke(binder.Name, Arguments.From(args, binder.CallInfo.ArgumentNames)); + return true; + } + public object Invoke(string name, INamedEnumerable parameters) { if (!string.IsNullOrEmpty(name)) { return ShapeTypeExecute(name, parameters); @@ -67,6 +72,10 @@ namespace Orchard.DisplayManagement.Implementation { } public object ShapeExecute(object shape) { + if (shape == null) { + return new HtmlString(string.Empty); + } + var context = new DisplayContext { Display = this, Value = shape, ViewContext = ViewContext, ViewDataContainer = ViewDataContainer }; return _displayManager.Execute(context); } diff --git a/src/Orchard/DisplayManagement/Implementation/DisplayHelperFactory.cs b/src/Orchard/DisplayManagement/Implementation/DisplayHelperFactory.cs index 4107114e4..495b3424b 100644 --- a/src/Orchard/DisplayManagement/Implementation/DisplayHelperFactory.cs +++ b/src/Orchard/DisplayManagement/Implementation/DisplayHelperFactory.cs @@ -1,10 +1,7 @@ -using System; -using System.Web.Mvc; -using ClaySharp; +using System.Web.Mvc; namespace Orchard.DisplayManagement.Implementation { public class DisplayHelperFactory : IDisplayHelperFactory { - static private readonly DisplayHelperBehavior[] _behaviors = new[] { new DisplayHelperBehavior() }; private readonly IDisplayManager _displayManager; private readonly IShapeFactory _shapeFactory; @@ -14,20 +11,11 @@ namespace Orchard.DisplayManagement.Implementation { } public dynamic CreateHelper(ViewContext viewContext, IViewDataContainer viewDataContainer) { - return ClayActivator.CreateInstance( - _behaviors, + return new DisplayHelper( _displayManager, _shapeFactory, viewContext, viewDataContainer); } - - class DisplayHelperBehavior : ClayBehavior { - public override object InvokeMember(Func proceed, object target, string name, INamedEnumerable args) { - return ((DisplayHelper)target).Invoke(name, args); - } - - - } } } \ No newline at end of file diff --git a/src/Orchard/DisplayManagement/Implementation/IShapeFactoryEvents.cs b/src/Orchard/DisplayManagement/Implementation/IShapeFactoryEvents.cs index 6601363f0..cc30a0dd5 100644 --- a/src/Orchard/DisplayManagement/Implementation/IShapeFactoryEvents.cs +++ b/src/Orchard/DisplayManagement/Implementation/IShapeFactoryEvents.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using ClaySharp; namespace Orchard.DisplayManagement.Implementation { public interface IShapeFactoryEvents : IDependency { @@ -12,8 +11,7 @@ namespace Orchard.DisplayManagement.Implementation { public IShapeFactory ShapeFactory { get; set; } public dynamic New { get; set; } public string ShapeType { get; set; } - public Type BaseType { get; set; } - public IList Behaviors { get; set; } + public Func Create { get; set; } public IList> OnCreated { get; set; } } diff --git a/src/Orchard/DisplayManagement/Shapes/Composite.cs b/src/Orchard/DisplayManagement/Shapes/Composite.cs new file mode 100644 index 000000000..a25f3761a --- /dev/null +++ b/src/Orchard/DisplayManagement/Shapes/Composite.cs @@ -0,0 +1,137 @@ +using System.Collections; +using System.Collections.Specialized; +using System.Dynamic; +using System.Linq; +using System.Linq.Expressions; + +namespace Orchard.DisplayManagement.Shapes { + public class Composite : DynamicObject { + private readonly IDictionary _props = new HybridDictionary(); + + public override bool TryGetMember(GetMemberBinder binder, out object result) { + return TryGetMemberImpl(binder.Name, out result); + } + + protected bool TryGetMemberImpl(string name, out object result) { + if (_props.Contains(name)) { + result = _props[name]; + return true; + } + + result = null; + return true; + } + + public override bool TrySetMember(SetMemberBinder binder, object value) { + return TrySetMemberImpl(binder.Name, value); + } + + protected bool TrySetMemberImpl(string name, object value) { + _props[name] = value; + return true; + } + + public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result) { + if (!args.Any()) { + return TryGetMemberImpl(binder.Name, out result); + } + + // method call with one argument will assign the property + if (args.Count() == 1) { + result = this; + return TrySetMemberImpl(binder.Name, args.Single()); + } + + if (!base.TryInvokeMember(binder, args, out result)) { + if (binder.Name == "ToString") { + result = string.Empty; + return true; + } + + return false; + } + + return true; + } + + public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result) { + if (indexes.Count() != 1) { + return base.TryGetIndex(binder, indexes, out result); + } + + var index = indexes.Single(); + + if (_props.Contains(index)) { + result = _props[index]; + return true; + } + + // try to access an existing member + var strinIndex = index as string; + + if (strinIndex != null && TryGetMemberImpl(strinIndex, out result)) { + return true; + } + + return base.TryGetIndex(binder, indexes, out result); + } + + public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object value) { + if (indexes.Count() != 1) { + return base.TrySetIndex(binder, indexes, value); + } + + var index = indexes.Single(); + + // try to access an existing member + var strinIndex = index as string; + + if (strinIndex != null && TrySetMemberImpl(strinIndex, value)) { + return true; + } + + _props[indexes.Single()] = value; + return true; + } + + public IDictionary Properties { + get { return _props; } + } + } + + public class Nil : DynamicObject { + static readonly object Singleton = new Nil(); + public static object Instance { get { return Singleton; } } + + private Nil() { + } + + public override bool TryGetMember(GetMemberBinder binder, out object result) { + result = Instance; + return true; + } + + public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result) { + result = Instance; + return true; + } + + public override bool TryBinaryOperation(BinaryOperationBinder binder, object arg, out object result) { + switch (binder.Operation) { + case ExpressionType.Equal: + result = ReferenceEquals(arg, Nil.Instance) || arg == null; + return true; + case ExpressionType.NotEqual: + result = !ReferenceEquals(arg, Nil.Instance) && arg != null; + return true; + } + + return base.TryBinaryOperation(binder, arg, out result); + } + + public override bool TryConvert(ConvertBinder binder, out object result) { + result = null; + return true; + } + } +} diff --git a/src/Orchard/DisplayManagement/Shapes/Shape.cs b/src/Orchard/DisplayManagement/Shapes/Shape.cs index be5ca6575..2362bd80e 100644 --- a/src/Orchard/DisplayManagement/Shapes/Shape.cs +++ b/src/Orchard/DisplayManagement/Shapes/Shape.cs @@ -1,28 +1,31 @@ using System; +using System.Diagnostics; +using System.Dynamic; using System.Linq; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; using System.Web.Mvc; -using ClaySharp; -using ClaySharp.Implementation; namespace Orchard.DisplayManagement.Shapes { [DebuggerTypeProxy(typeof(ShapeDebugView))] - public class Shape : IShape, IEnumerable { + public class Shape : Composite, IShape, IEnumerable { private const string DefaultPosition = "5"; private readonly IList _items = new List(); private readonly IList _classes = new List(); private readonly IDictionary _attributes = new Dictionary(); - public virtual ShapeMetadata Metadata { get; set; } + public ShapeMetadata Metadata { get; set; } public virtual string Id { get; set; } public virtual IList Classes { get { return _classes; } } public virtual IDictionary Attributes { get { return _attributes; } } public virtual IEnumerable Items { get { return _items; } } + public Shape() { + Metadata = new ShapeMetadata(); + } + public virtual Shape Add(object item, string position = null) { // pszmyd: Ignoring null shapes if (item == null) { @@ -31,12 +34,12 @@ namespace Orchard.DisplayManagement.Shapes { try { // todo: (sebros) this is a temporary implementation to prevent common known scenarios throwing exceptions. The final solution would need to filter based on the fact that it is a Shape instance - if ( item is MvcHtmlString || - item is String ) { + if (item is MvcHtmlString || + item is String) { // need to implement positioned wrapper for non-shape objects } else if (item is IShape) { - ((dynamic) item).Metadata.Position = position; + ((dynamic)item).Metadata.Position = position; } } catch { @@ -53,126 +56,144 @@ namespace Orchard.DisplayManagement.Shapes { return this; } + IEnumerator IEnumerable.GetEnumerator() { + return _items.GetEnumerator(); + } + public virtual IEnumerator GetEnumerator() { return _items.GetEnumerator(); } - public class ShapeBehavior : ClayBehavior { - public override object SetIndex(Func proceed, dynamic self, IEnumerable keys, object value) { - if (keys.Count() == 1) { - var name = keys.Single().ToString(); - if (name.Equals("Id")) { - // need to mutate the actual type - var s = self as Shape; - if (s != null) { - s.Id = System.Convert.ToString(value); - } - return value; - } - if (name.Equals("Classes")) { - var args = Arguments.From(new[] { value }, Enumerable.Empty()); - MergeClasses(args, self.Classes); - return value; - } - if (name.Equals("Attributes")) { - var args = Arguments.From(new[] { value }, Enumerable.Empty()); - MergeAttributes(args, self.Attributes); - return value; - } - if (name.Equals("Items")) { - var args = Arguments.From(new[] { value }, Enumerable.Empty()); - MergeItems(args, self); - return value; - } - } - return proceed(); + public override bool TryConvert(ConvertBinder binder, out object result) { + result = Items; + + if (binder.ReturnType == typeof(IEnumerable) + || binder.ReturnType == typeof(IEnumerable)) { + return true; } - public override object InvokeMember(Func proceed, dynamic self, string name, INamedEnumerable args) { + return false; + } + + //public class ShapeBehavior : ClayBehavior { + public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object value) { + if (indexes.Count() == 1) { + var name = indexes.Single().ToString(); if (name.Equals("Id")) { // need to mutate the actual type - var s = self as Shape; - if (s != null) { - s.Id = System.Convert.ToString(args.FirstOrDefault()); - } - return self; + Id = Convert.ToString(value); + return true; } - if (name.Equals("Classes") && !args.Named.Any()) { - MergeClasses(args, self.Classes); - return self; + if (name.Equals("Classes")) { + var args = Arguments.From(new[] { value }, Enumerable.Empty()); + MergeClasses(args, Classes); + return true; } - if (name.Equals("Attributes") && args.Positional.Count() <= 1) { - MergeAttributes(args, self.Attributes); - return self; + if (name.Equals("Attributes")) { + var args = Arguments.From(new[] { value }, Enumerable.Empty()); + MergeAttributes(args, Attributes); + return true; } if (name.Equals("Items")) { - MergeItems(args, self); - return self; - } - return proceed(); - } - - private static void MergeAttributes(INamedEnumerable args, IDictionary attributes) { - var arg = args.Positional.SingleOrDefault(); - if (arg != null) { - if (arg is IDictionary) { - var dictionary = arg as IDictionary; - foreach (var key in dictionary.Keys) { - attributes[System.Convert.ToString(key)] = System.Convert.ToString(dictionary[key]); - } - } - else { - foreach (var prop in arg.GetType().GetProperties()) { - attributes[TranslateIdentifier(prop.Name)] = System.Convert.ToString(prop.GetValue(arg, null)); - } - } - } - foreach (var named in args.Named) { - attributes[named.Key] = System.Convert.ToString(named.Value); + var args = Arguments.From(new[] { value }, Enumerable.Empty()); + MergeItems(args, this); + return true; } } - private static string TranslateIdentifier(string name) { - // Allows for certain characters in an identifier to represent different - // characters in an HTML attribute (mimics MVC behavior): - // data_foo ==> data-foo - // @keyword ==> keyword - return name.Replace("_", "-").Replace("@", ""); + return base.TrySetIndex(binder, indexes, value); + + } + + public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result) { + var name = binder.Name; + var arguments = Arguments.From(args, binder.CallInfo.ArgumentNames); + if (name.Equals("Id")) { + // need to mutate the actual type + Id = Convert.ToString(args.FirstOrDefault()); + result = this; + return true; + } + if (name.Equals("Classes") && !arguments.Named.Any()) { + MergeClasses(arguments, Classes); + result = this; + return true; + } + if (name.Equals("Attributes") && arguments.Positional.Count() <= 1) { + MergeAttributes(arguments, Attributes); + result = this; + return true; + } + if (name.Equals("Items")) { + MergeItems(arguments, this); + result = this; + return true; } - private static void MergeClasses(INamedEnumerable args, IList classes) { - foreach (var arg in args) { - // look for string first, because the "string" type is also an IEnumerable of char - if (arg is string) { - classes.Add(arg as string); + return base.TryInvokeMember(binder, args, out result); + } + + private static void MergeAttributes(INamedEnumerable args, IDictionary attributes) { + var arg = args.Positional.SingleOrDefault(); + if (arg != null) { + if (arg is IDictionary) { + var dictionary = arg as IDictionary; + foreach (var key in dictionary.Keys) { + attributes[Convert.ToString(key)] = Convert.ToString(dictionary[key]); } - else if (arg is IEnumerable) { - foreach (var item in arg as IEnumerable) { - classes.Add(System.Convert.ToString(item)); - } - } - else { - classes.Add(System.Convert.ToString(arg)); + } + else { + foreach (var prop in arg.GetType().GetProperties()) { + attributes[TranslateIdentifier(prop.Name)] = Convert.ToString(prop.GetValue(arg, null)); } } } + foreach (var named in args.Named) { + attributes[named.Key] = Convert.ToString(named.Value); + } + } - private static void MergeItems(INamedEnumerable args, dynamic shape) { - foreach (var arg in args) { - // look for string first, because the "string" type is also an IEnumerable of char - if (arg is string) { - shape.Add(arg as string); - } - else if (arg is IEnumerable) { - foreach (var item in arg as IEnumerable) { - shape.Add(item); - } - } - else { - shape.Add(System.Convert.ToString(arg)); + private static string TranslateIdentifier(string name) { + // Allows for certain characters in an identifier to represent different + // characters in an HTML attribute (mimics MVC behavior): + // data_foo ==> data-foo + // @keyword ==> keyword + return name.Replace("_", "-").Replace("@", ""); + } + + private static void MergeClasses(INamedEnumerable args, IList classes) { + foreach (var arg in args) { + // look for string first, because the "string" type is also an IEnumerable of char + if (arg is string) { + classes.Add(arg as string); + } + else if (arg is IEnumerable) { + foreach (var item in arg as IEnumerable) { + classes.Add(Convert.ToString(item)); } } + else { + classes.Add(Convert.ToString(arg)); + } } } + + private static void MergeItems(INamedEnumerable args, dynamic shape) { + foreach (var arg in args) { + // look for string first, because the "string" type is also an IEnumerable of char + if (arg is string) { + shape.Add(arg as string); + } + else if (arg is IEnumerable) { + foreach (var item in arg as IEnumerable) { + shape.Add(item); + } + } + else { + shape.Add(Convert.ToString(arg)); + } + } + } + } } diff --git a/src/Orchard/DisplayManagement/Shapes/ShapeDebugView.cs b/src/Orchard/DisplayManagement/Shapes/ShapeDebugView.cs index 99912ad41..75bcf370c 100644 --- a/src/Orchard/DisplayManagement/Shapes/ShapeDebugView.cs +++ b/src/Orchard/DisplayManagement/Shapes/ShapeDebugView.cs @@ -1,7 +1,7 @@ -using System.Collections.Generic; +using System.Collections; +using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using ClaySharp; namespace Orchard.DisplayManagement.Shapes { public class ShapeDebugView { @@ -19,12 +19,12 @@ namespace Orchard.DisplayManagement.Shapes { public IEnumerable Items { get { return _shape.Items; } } [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)] - public KeyValuePairs[] ClayProperties { + public KeyValuePairs[] Properties { get { - var members = new Dictionary(); - ((IClayBehaviorProvider)_shape).Behavior.GetMembers(() => null, _shape, members); - - return members.Keys.Select(key => new KeyValuePairs(key, members[key])).ToArray(); + return _shape.Properties + .Cast() + .Select(entry => new KeyValuePairs(entry.Key, entry.Value)) + .ToArray(); } } @@ -32,20 +32,11 @@ namespace Orchard.DisplayManagement.Shapes { public class KeyValuePairs { public KeyValuePairs(object key, object value) { - try { - var dynProxyGetTarget = value.GetType().GetMethod("DynProxyGetTarget"); - if (dynProxyGetTarget != null) { - _value = dynProxyGetTarget.Invoke(value, null); - _shapeType = ((IShape)_value).Metadata.Type; - } - else { - _value = value; - } - } - catch { - _value = value; + if (_value is IShape) { + _shapeType = ((IShape)_value).Metadata.Type; } + _value = value; _key = key; } diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index abf1f8dec..561c2f243 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -71,11 +71,6 @@ False ..\..\lib\Castle Windsor 2.0\bin\Castle.DynamicProxy2.dll - - False - ..\..\lib\claysharp\ClaySharp.dll - True - False ..\..\lib\nhibernate\FluentNHibernate.dll @@ -157,8 +152,6 @@ - - @@ -172,12 +165,11 @@ - - + @@ -204,6 +196,8 @@ + + diff --git a/src/Orchard/UI/Zones/LayoutWorkContext.cs b/src/Orchard/UI/Zones/LayoutWorkContext.cs index 82b83530b..c5fb4a644 100644 --- a/src/Orchard/UI/Zones/LayoutWorkContext.cs +++ b/src/Orchard/UI/Zones/LayoutWorkContext.cs @@ -1,5 +1,4 @@ using System; -using ClaySharp.Implementation; using Orchard.DisplayManagement; namespace Orchard.UI.Zones { diff --git a/src/Orchard/UI/Zones/ZoneHoldingBehavior.cs b/src/Orchard/UI/Zones/ZoneHoldingBehavior.cs index 90ad13eef..0da38e11f 100644 --- a/src/Orchard/UI/Zones/ZoneHoldingBehavior.cs +++ b/src/Orchard/UI/Zones/ZoneHoldingBehavior.cs @@ -1,7 +1,7 @@ using System; using System.Linq; -using ClaySharp; -using ClaySharp.Behaviors; +using System.Linq.Expressions; +using Orchard.DisplayManagement.Shapes; namespace Orchard.UI.Zones { /// @@ -17,102 +17,179 @@ namespace Orchard.UI.Zones { /// Foo.Alpha :same /// /// - public class ZoneHoldingBehavior : ClayBehavior { + public class ZoneHolding : Shape { private readonly Func _zoneFactory; - private readonly dynamic _layoutShape; - public ZoneHoldingBehavior(Func zoneFactory, dynamic layoutShape) { + public ZoneHolding(Func zoneFactory) { _zoneFactory = zoneFactory; - _layoutShape = layoutShape; } - public override object GetMember(Func proceed, object self, string name) { - if (name == "Zones") { - // provide a robot for zone manipulation on parent object - return ClayActivator.CreateInstance(new IClayBehavior[] { - new InterfaceProxyBehavior(), - new ZonesBehavior(_zoneFactory, self, _layoutShape) - }); + private Zones _zones; + public Zones Zones { + get { + if (_zones == null) { + return _zones = new Zones(_zoneFactory, this); + } + + return _zones; } + } - var result = proceed(); - if (((dynamic)result) == null) { + public override bool TryGetMember(System.Dynamic.GetMemberBinder binder, out object result) { + var name = binder.Name; + if (!base.TryGetMember(binder, out result) || ((dynamic)result) == null) { // substitute nil results with a robot that turns adds a zone on // the parent when .Add is invoked - return ClayActivator.CreateInstance(new IClayBehavior[] { - new InterfaceProxyBehavior(), - new NilBehavior(), - new ZoneOnDemandBehavior(_zoneFactory, self, name) - }); + result = new ZoneOnDemand(_zoneFactory, this, name); + TrySetMemberImpl(name, result); } - return result; + + return true; } - public class ZonesBehavior : ClayBehavior { - private readonly Func _zoneFactory; - private object _parent; - private readonly dynamic _layoutShape; + } - public ZonesBehavior(Func zoneFactory, object parent, dynamic layoutShape) { - _zoneFactory = zoneFactory; - _parent = parent; - _layoutShape = layoutShape; + /// + /// InterfaceProxyBehavior() + /// ZonesBehavior(_zoneFactory, self, _layoutShape) => Create ZoneOnDemand if member access + /// + public class Zones : Composite { + private readonly Func _zoneFactory; + private readonly object _parent; + + public Zones(Func zoneFactory, object parent) { + _zoneFactory = zoneFactory; + _parent = parent; + } + + public override bool TryGetMember(System.Dynamic.GetMemberBinder binder, out object result) { + return TryGetMemberImpl(binder.Name, out result); + } + + private bool TryGetMemberImpl(string name, out object result) { + + var parentMember = ((dynamic)_parent)[name]; + if (parentMember == null) { + result = new ZoneOnDemand(_zoneFactory, _parent, name); + return true; } - public override object GetMember(Func proceed, object self, string name) { - var parentMember = ((dynamic)_parent)[name]; - if (parentMember == null) { - return ClayActivator.CreateInstance(new IClayBehavior[] { - new InterfaceProxyBehavior(), - new NilBehavior(), - new ZoneOnDemandBehavior(_zoneFactory, _parent, name) - }); - } - return parentMember; - } - public override object GetIndex(Func proceed, object self, System.Collections.Generic.IEnumerable keys) { - if (keys.Count() == 1) { - var key = System.Convert.ToString(keys.Single()); + result = parentMember; + return true; + } - return GetMember(proceed, null, key); - } - return proceed(); + + public override bool TryGetIndex(System.Dynamic.GetIndexBinder binder, object[] indexes, out object result) { + + if (indexes.Count() == 1) { + var key = Convert.ToString(indexes.Single()); + + return TryGetMemberImpl(key, out result); + } + + return base.TryGetIndex(binder, indexes, out result); + } + } + + /// + /// InterfaceProxyBehavior() + /// NilBehavior() => return Nil on GetMember and GetIndex in all cases + /// ZoneOnDemandBehavior(_zoneFactory, _parent, name) => when a zone (Shape) is + /// created, replace itself with the zone so that Layout.ZoneName is no more equal to Nil + /// + public class ZoneOnDemand : Shape { + + private readonly Func _zoneFactory; + private readonly object _parent; + private readonly string _potentialZoneName; + + public ZoneOnDemand(Func zoneFactory, object parent, string potentialZoneName) { + _zoneFactory = zoneFactory; + _parent = parent; + _potentialZoneName = potentialZoneName; + } + + public override bool TryGetMember(System.Dynamic.GetMemberBinder binder, out object result) { + // NilBehavior + result = Nil.Instance; + return true; + } + + public override bool TryGetIndex(System.Dynamic.GetIndexBinder binder, object[] indexes, out object result) { + // NilBehavior + result = Nil.Instance; + return true; + } + + public override bool TryInvokeMember(System.Dynamic.InvokeMemberBinder binder, object[] args, out object result) { + var name = binder.Name; + + // NilBehavior + if (!args.Any() && name != "ToString") { + result = Nil.Instance; + return true; + } + + return base.TryInvokeMember(binder, args, out result); + } + + public override string ToString() { + return String.Empty; + } + + public override bool TryConvert(System.Dynamic.ConvertBinder binder, out object result) { + result = null; + return true; + } + + public static bool operator ==(ZoneOnDemand expr, object arg) { + // if ZoneOnDemand is compared to null it must return true + return arg == null || ReferenceEquals(arg, Nil.Instance); + } + + public static bool operator !=(ZoneOnDemand expr, object arg) { + // if ZoneOnDemand is compared to null it must return true + return arg != null && !ReferenceEquals(arg, Nil.Instance); + } + + public override bool Equals(object obj) { + if (ReferenceEquals(null, obj)) { + return true; + } + + if (ReferenceEquals(this, obj)) { + return true; + } + + return false; + } + + public override int GetHashCode() { + unchecked { + int hashCode = (_parent != null ? _parent.GetHashCode() : 0); + hashCode = (hashCode * 397) ^ (_potentialZoneName != null ? _potentialZoneName.GetHashCode() : 0); + return hashCode; } } - public class ZoneOnDemandBehavior : ClayBehavior { - private readonly Func _zoneFactory; - private readonly object _parent; - private readonly string _potentialZoneName; - - public ZoneOnDemandBehavior(Func zoneFactory, object parent, string potentialZoneName) { - _zoneFactory = zoneFactory; - _parent = parent; - _potentialZoneName = potentialZoneName; - } - - public override object InvokeMember(Func proceed, object self, string name, INamedEnumerable args) { - var argsCount = args.Count(); - if (name == "Add" && (argsCount == 1 || argsCount == 2)) { - // pszmyd: Ignore null shapes - if (args.First() == null) - return _parent; - - dynamic parent = _parent; - - dynamic zone = _zoneFactory(); - zone.Parent = _parent; - zone.ZoneName = _potentialZoneName; - parent[_potentialZoneName] = zone; - - if (argsCount == 1) - return zone.Add(args.Single()); - - return zone.Add(args.First(), (string)args.Last()); + public override Shape Add(object item, string position = null) { + if (item == null) { + return (Shape)_parent; } - return proceed(); - } + + dynamic parent = _parent; + + dynamic zone = _zoneFactory(); + zone.Parent = _parent; + zone.ZoneName = _potentialZoneName; + parent[_potentialZoneName] = zone; + + if (position == null) { + return zone.Add(item); + } + + return zone.Add(item, position); } } } \ No newline at end of file diff --git a/src/Orchard/WorkContext.cs b/src/Orchard/WorkContext.cs index 28910debe..3af200397 100644 --- a/src/Orchard/WorkContext.cs +++ b/src/Orchard/WorkContext.cs @@ -41,7 +41,7 @@ namespace Orchard { /// The Layout shape corresponding to the work context /// public dynamic Layout { - get { return GetState("Layout"); } + get { return GetState("Layout"); } set { SetState("Layout", value); } }