diff --git a/src/Umbraco.Core/Dynamics/DynamicGrouping.cs b/src/Umbraco.Core/Dynamics/DynamicGrouping.cs index 6a0dca0609..11c2b1df65 100644 --- a/src/Umbraco.Core/Dynamics/DynamicGrouping.cs +++ b/src/Umbraco.Core/Dynamics/DynamicGrouping.cs @@ -13,7 +13,7 @@ namespace Umbraco.Core.Dynamics return this; } - public DynamicGrouping(DynamicDocumentList list, string groupBy) + public DynamicGrouping(DynamicPublishedContentList list, string groupBy) { Inner = list @@ -21,7 +21,7 @@ namespace Umbraco.Core.Dynamics .Select(node => { string predicate = groupBy; - var internalList = new DynamicDocumentList(new DynamicPublishedContent[] { node }); + var internalList = new DynamicPublishedContentList(new DynamicPublishedContent[] { node }); var query = (IQueryable)internalList.Select(predicate, new object[] { }); var key = query.FirstOrDefault(); return new diff --git a/src/Umbraco.Core/Dynamics/DynamicPublishedContent.cs b/src/Umbraco.Core/Dynamics/DynamicPublishedContent.cs index efc97dba7a..a747163293 100644 --- a/src/Umbraco.Core/Dynamics/DynamicPublishedContent.cs +++ b/src/Umbraco.Core/Dynamics/DynamicPublishedContent.cs @@ -20,10 +20,10 @@ namespace Umbraco.Core.Dynamics public class DynamicPublishedContent : DynamicObject, IPublishedContent { private readonly IPublishedContent _publishedContent; - private DynamicDocumentList _cachedChildren; + private DynamicPublishedContentList _cachedChildren; private readonly ConcurrentDictionary _cachedMemberOutput = new ConcurrentDictionary(); - internal DynamicDocumentList OwnerList { get; set; } + internal DynamicPublishedContentList OwnerList { get; set; } #region Constructors @@ -56,60 +56,60 @@ namespace Umbraco.Core.Dynamics #region Traversal public DynamicPublishedContent Up() { - return DynamicDocumentWalker.Up(this); + return DynamicPublishedContentWalker.Up(this); } public DynamicPublishedContent Up(int number) { - return DynamicDocumentWalker.Up(this, number); + return DynamicPublishedContentWalker.Up(this, number); } public DynamicPublishedContent Up(string nodeTypeAlias) { - return DynamicDocumentWalker.Up(this, nodeTypeAlias); + return DynamicPublishedContentWalker.Up(this, nodeTypeAlias); } public DynamicPublishedContent Down() { - return DynamicDocumentWalker.Down(this); + return DynamicPublishedContentWalker.Down(this); } public DynamicPublishedContent Down(int number) { - return DynamicDocumentWalker.Down(this, number); + return DynamicPublishedContentWalker.Down(this, number); } public DynamicPublishedContent Down(string nodeTypeAlias) { - return DynamicDocumentWalker.Down(this, nodeTypeAlias); + return DynamicPublishedContentWalker.Down(this, nodeTypeAlias); } public DynamicPublishedContent Next() { - return DynamicDocumentWalker.Next(this); + return DynamicPublishedContentWalker.Next(this); } public DynamicPublishedContent Next(int number) { - return DynamicDocumentWalker.Next(this, number); + return DynamicPublishedContentWalker.Next(this, number); } public DynamicPublishedContent Next(string nodeTypeAlias) { - return DynamicDocumentWalker.Next(this, nodeTypeAlias); + return DynamicPublishedContentWalker.Next(this, nodeTypeAlias); } public DynamicPublishedContent Previous() { - return DynamicDocumentWalker.Previous(this); + return DynamicPublishedContentWalker.Previous(this); } public DynamicPublishedContent Previous(int number) { - return DynamicDocumentWalker.Previous(this, number); + return DynamicPublishedContentWalker.Previous(this, number); } public DynamicPublishedContent Previous(string nodeTypeAlias) { - return DynamicDocumentWalker.Previous(this, nodeTypeAlias); + return DynamicPublishedContentWalker.Previous(this, nodeTypeAlias); } public DynamicPublishedContent Sibling(int number) { - return DynamicDocumentWalker.Sibling(this, number); + return DynamicPublishedContentWalker.Sibling(this, number); } public DynamicPublishedContent Sibling(string nodeTypeAlias) { - return DynamicDocumentWalker.Sibling(this, nodeTypeAlias); + return DynamicPublishedContentWalker.Sibling(this, nodeTypeAlias); } #endregion @@ -237,11 +237,11 @@ namespace Umbraco.Core.Dynamics } if (result is IEnumerable) { - result = new DynamicDocumentList((IEnumerable)result); + result = new DynamicPublishedContentList((IEnumerable)result); } if (result is IEnumerable) { - result = new DynamicDocumentList((IEnumerable)result); + result = new DynamicPublishedContentList((IEnumerable)result); } } return result; @@ -289,7 +289,7 @@ namespace Umbraco.Core.Dynamics if (filteredTypeChildren.Any()) { return new Attempt(true, - new DynamicDocumentList(filteredTypeChildren.Select(x => new DynamicPublishedContent(x)))); + new DynamicPublishedContentList(filteredTypeChildren.Select(x => new DynamicPublishedContent(x)))); } return Attempt.False; } @@ -342,7 +342,7 @@ namespace Umbraco.Core.Dynamics } //get the data type id for the current property - var dataType = DynamicDocumentDataSourceResolver.Current.DataSource.GetDataType(userProperty.DocumentTypeAlias, userProperty.Alias); + var dataType = DynamicPublishedContentDataSourceResolver.Current.DataSource.GetDataType(userProperty.DocumentTypeAlias, userProperty.Alias); //convert the string value to a known type var converted = ConvertPropertyValue(result, dataType, userProperty.DocumentTypeAlias, userProperty.Alias); @@ -680,13 +680,13 @@ namespace Umbraco.Core.Dynamics { return AncestorOrSelf(node => node.DocumentTypeAlias == nodeTypeAlias); } - public DynamicPublishedContent AncestorOrSelf(Func func) + public DynamicPublishedContent AncestorOrSelf(Func func) { var node = this; while (node != null) { if (func(node)) return node; - DynamicPublishedContent parent = node.Parent; + var parent = node.Parent; if (parent != null) { if (this != parent) @@ -705,15 +705,15 @@ namespace Umbraco.Core.Dynamics } return node; } - public DynamicDocumentList AncestorsOrSelf(Func func) + public DynamicPublishedContentList AncestorsOrSelf(Func func) { - var ancestorList = new List(); + var ancestorList = new List(); var node = this; ancestorList.Add(node); while (node != null) { if (node.Level == 1) break; - DynamicPublishedContent parent = node.Parent; + var parent = node.Parent; if (parent != null) { if (this != parent) @@ -735,50 +735,50 @@ namespace Umbraco.Core.Dynamics } } ancestorList.Reverse(); - return new DynamicDocumentList(ancestorList); + return new DynamicPublishedContentList(ancestorList); } - public DynamicDocumentList AncestorsOrSelf() + public DynamicPublishedContentList AncestorsOrSelf() { return AncestorsOrSelf(n => true); } - public DynamicDocumentList AncestorsOrSelf(string nodeTypeAlias) + public DynamicPublishedContentList AncestorsOrSelf(string nodeTypeAlias) { return AncestorsOrSelf(n => n.DocumentTypeAlias == nodeTypeAlias); } - public DynamicDocumentList AncestorsOrSelf(int level) + public DynamicPublishedContentList AncestorsOrSelf(int level) { return AncestorsOrSelf(n => n.Level <= level); } - public DynamicDocumentList Descendants(string nodeTypeAlias) + public DynamicPublishedContentList Descendants(string nodeTypeAlias) { return Descendants(p => p.DocumentTypeAlias == nodeTypeAlias); } - public DynamicDocumentList Descendants(int level) + public DynamicPublishedContentList Descendants(int level) { return Descendants(p => p.Level >= level); } - public DynamicDocumentList Descendants() + public DynamicPublishedContentList Descendants() { return Descendants(n => true); } - internal DynamicDocumentList Descendants(Func func) + internal DynamicPublishedContentList Descendants(Func func) { var flattenedNodes = this._publishedContent.Children.Map(func, (IPublishedContent n) => n.Children); - return new DynamicDocumentList(flattenedNodes.ToList().ConvertAll(dynamicBackingItem => new DynamicPublishedContent(dynamicBackingItem))); + return new DynamicPublishedContentList(flattenedNodes.ToList().ConvertAll(dynamicBackingItem => new DynamicPublishedContent(dynamicBackingItem))); } - public DynamicDocumentList DescendantsOrSelf(int level) + public DynamicPublishedContentList DescendantsOrSelf(int level) { return DescendantsOrSelf(p => p.Level >= level); } - public DynamicDocumentList DescendantsOrSelf(string nodeTypeAlias) + public DynamicPublishedContentList DescendantsOrSelf(string nodeTypeAlias) { return DescendantsOrSelf(p => p.DocumentTypeAlias == nodeTypeAlias); } - public DynamicDocumentList DescendantsOrSelf() + public DynamicPublishedContentList DescendantsOrSelf() { return DescendantsOrSelf(p => true); } - internal DynamicDocumentList DescendantsOrSelf(Func func) + internal DynamicPublishedContentList DescendantsOrSelf(Func func) { if (this._publishedContent != null) { @@ -788,30 +788,30 @@ namespace Umbraco.Core.Dynamics thisNode.Add(this._publishedContent); } var flattenedNodes = this._publishedContent.Children.Map(func, (IPublishedContent n) => n.Children); - return new DynamicDocumentList(thisNode.Concat(flattenedNodes).ToList().ConvertAll(dynamicBackingItem => new DynamicPublishedContent(dynamicBackingItem))); + return new DynamicPublishedContentList(thisNode.Concat(flattenedNodes).ToList().ConvertAll(dynamicBackingItem => new DynamicPublishedContent(dynamicBackingItem))); } - return new DynamicDocumentList(Enumerable.Empty()); + return new DynamicPublishedContentList(Enumerable.Empty()); } - public DynamicDocumentList Ancestors(int level) + public DynamicPublishedContentList Ancestors(int level) { return Ancestors(n => n.Level <= level); } - public DynamicDocumentList Ancestors(string nodeTypeAlias) + public DynamicPublishedContentList Ancestors(string nodeTypeAlias) { return Ancestors(n => n.DocumentTypeAlias == nodeTypeAlias); } - public DynamicDocumentList Ancestors() + public DynamicPublishedContentList Ancestors() { return Ancestors(n => true); } - public DynamicDocumentList Ancestors(Func func) + public DynamicPublishedContentList Ancestors(Func func) { - var ancestorList = new List(); + var ancestorList = new List(); var node = this; while (node != null) { if (node.Level == 1) break; - DynamicPublishedContent parent = node.Parent; + var parent = node.Parent; if (parent != null) { if (this != parent) @@ -833,7 +833,7 @@ namespace Umbraco.Core.Dynamics } } ancestorList.Reverse(); - return new DynamicDocumentList(ancestorList); + return new DynamicPublishedContentList(ancestorList); } public DynamicPublishedContent Parent { @@ -956,11 +956,11 @@ namespace Umbraco.Core.Dynamics //testing, think this must be a special case for the root node ? if (!children.Any() && _publishedContent.Id == 0) { - _cachedChildren = new DynamicDocumentList(new List { new DynamicPublishedContent(this._publishedContent) }); + _cachedChildren = new DynamicPublishedContentList(new List { new DynamicPublishedContent(this._publishedContent) }); } else { - _cachedChildren = new DynamicDocumentList(_publishedContent.Children.Select(x => new DynamicPublishedContent(x))); + _cachedChildren = new DynamicPublishedContentList(_publishedContent.Children.Select(x => new DynamicPublishedContent(x))); } } return _cachedChildren; @@ -1042,7 +1042,7 @@ namespace Umbraco.Core.Dynamics { //var list = this.Parent.Children.Select(n => new DynamicNode(n)); var list = this.Parent.Children; - this.OwnerList = new DynamicDocumentList(list); + this.OwnerList = new DynamicPublishedContentList(list); } if (this.OwnerList != null) { @@ -1357,15 +1357,15 @@ namespace Umbraco.Core.Dynamics var descendants = this.DescendantsOrSelf(); return IsHelper(n => descendants.Items.Find(descendant => descendant.Id == other.Id) != null, valueIfTrue, valueIfFalse); } - public bool IsHelper(Func test) + private bool IsHelper(Func test) { return test(this); } - public HtmlString IsHelper(Func test, string valueIfTrue) + private HtmlString IsHelper(Func test, string valueIfTrue) { return IsHelper(test, valueIfTrue, string.Empty); } - public HtmlString IsHelper(Func test, string valueIfTrue, string valueIfFalse) + private HtmlString IsHelper(Func test, string valueIfTrue, string valueIfFalse) { return test(this) ? new HtmlString(valueIfTrue) : new HtmlString(valueIfFalse); } @@ -1388,7 +1388,7 @@ namespace Umbraco.Core.Dynamics public bool Where(string predicate) { //Totally gonna cheat here - var dynamicDocumentList = new DynamicDocumentList(); + var dynamicDocumentList = new DynamicPublishedContentList(); dynamicDocumentList.Add(this); var filtered = dynamicDocumentList.Where(predicate); if (Queryable.Count(filtered) == 1) diff --git a/src/Umbraco.Core/Dynamics/DynamicDocumentDataSourceResolver.cs b/src/Umbraco.Core/Dynamics/DynamicPublishedContentDataSourceResolver.cs similarity index 60% rename from src/Umbraco.Core/Dynamics/DynamicDocumentDataSourceResolver.cs rename to src/Umbraco.Core/Dynamics/DynamicPublishedContentDataSourceResolver.cs index 654af1e4c0..79aa4a5ed8 100644 --- a/src/Umbraco.Core/Dynamics/DynamicDocumentDataSourceResolver.cs +++ b/src/Umbraco.Core/Dynamics/DynamicPublishedContentDataSourceResolver.cs @@ -7,11 +7,11 @@ namespace Umbraco.Core.Dynamics /// and currently the business logic part of Umbraco is still in the legacy project and we don't want to move that to the core so in the /// meantime until the new APIs are made, we need to have this data source in place with a resolver which is set in the web project. /// - internal class DynamicDocumentDataSourceResolver : SingleObjectResolverBase + internal class DynamicPublishedContentDataSourceResolver : SingleObjectResolverBase { - public IDynamicDocumentDataSource DataSource { get; private set; } + public IDynamicPublishedContentDataSource DataSource { get; private set; } - public DynamicDocumentDataSourceResolver(IDynamicDocumentDataSource dataSource) + public DynamicPublishedContentDataSourceResolver(IDynamicPublishedContentDataSource dataSource) { DataSource = dataSource; } diff --git a/src/Umbraco.Core/Dynamics/DynamicDocumentIdEqualityComparer.cs b/src/Umbraco.Core/Dynamics/DynamicPublishedContentIdEqualityComparer.cs similarity index 86% rename from src/Umbraco.Core/Dynamics/DynamicDocumentIdEqualityComparer.cs rename to src/Umbraco.Core/Dynamics/DynamicPublishedContentIdEqualityComparer.cs index 62243570a1..54cea8d0cf 100644 --- a/src/Umbraco.Core/Dynamics/DynamicDocumentIdEqualityComparer.cs +++ b/src/Umbraco.Core/Dynamics/DynamicPublishedContentIdEqualityComparer.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace Umbraco.Core.Dynamics { - internal class DynamicDocumentIdEqualityComparer : EqualityComparer + internal class DynamicPublishedContentIdEqualityComparer : EqualityComparer { public override bool Equals(DynamicPublishedContent x, DynamicPublishedContent y) diff --git a/src/Umbraco.Core/Dynamics/DynamicDocumentList.cs b/src/Umbraco.Core/Dynamics/DynamicPublishedContentList.cs similarity index 86% rename from src/Umbraco.Core/Dynamics/DynamicDocumentList.cs rename to src/Umbraco.Core/Dynamics/DynamicPublishedContentList.cs index 0a491a1a16..35658b46af 100644 --- a/src/Umbraco.Core/Dynamics/DynamicDocumentList.cs +++ b/src/Umbraco.Core/Dynamics/DynamicPublishedContentList.cs @@ -9,22 +9,22 @@ using System.Reflection; namespace Umbraco.Core.Dynamics { - public class DynamicDocumentList : DynamicObject, IEnumerable + public class DynamicPublishedContentList : DynamicObject, IEnumerable { internal List Items { get; set; } - public DynamicDocumentList() + public DynamicPublishedContentList() { Items = new List(); } - public DynamicDocumentList(IEnumerable items) + public DynamicPublishedContentList(IEnumerable items) { List list = items.ToList(); list.ForEach(node => node.OwnerList = this); Items = list; } - public DynamicDocumentList(IEnumerable items) + public DynamicPublishedContentList(IEnumerable items) { List list = items.Select(x => new DynamicPublishedContent(x)).ToList(); list.ForEach(node => node.OwnerList = this); @@ -61,24 +61,24 @@ namespace Umbraco.Core.Dynamics var values = args.Skip(1).ToArray(); //TODO: We are pre-resolving the where into a ToList() here which will have performance impacts if there where clauses // are nested! We should somehow support an QueryableDocumentList! - result = new DynamicDocumentList(this.Where(predicate, values).ToList()); + result = new DynamicPublishedContentList(this.Where(predicate, values).ToList()); return true; } if (name == "OrderBy") { //TODO: We are pre-resolving the where into a ToList() here which will have performance impacts if there where clauses // are nested! We should somehow support an QueryableDocumentList! - result = new DynamicDocumentList(this.OrderBy(args.First().ToString()).ToList()); + result = new DynamicPublishedContentList(this.OrderBy(args.First().ToString()).ToList()); return true; } if (name == "Take") { - result = new DynamicDocumentList(this.Take((int)args.First())); + result = new DynamicPublishedContentList(this.Take((int)args.First())); return true; } if (name == "Skip") { - result = new DynamicDocumentList(this.Skip((int)args.First())); + result = new DynamicPublishedContentList(this.Skip((int)args.First())); return true; } if (name == "InGroupsOf") @@ -117,12 +117,12 @@ namespace Umbraco.Core.Dynamics { if ((args.First() as IEnumerable) != null) { - result = new DynamicDocumentList(this.Items.Union(args.First() as IEnumerable)); + result = new DynamicPublishedContentList(this.Items.Union(args.First() as IEnumerable)); return true; } - if ((args.First() as DynamicDocumentList) != null) + if ((args.First() as DynamicPublishedContentList) != null) { - result = new DynamicDocumentList(this.Items.Union((args.First() as DynamicDocumentList).Items)); + result = new DynamicPublishedContentList(this.Items.Union((args.First() as DynamicPublishedContentList).Items)); return true; } } @@ -130,12 +130,12 @@ namespace Umbraco.Core.Dynamics { if ((args.First() as IEnumerable) != null) { - result = new DynamicDocumentList(this.Items.Except(args.First() as IEnumerable, new DynamicDocumentIdEqualityComparer())); + result = new DynamicPublishedContentList(this.Items.Except(args.First() as IEnumerable, new DynamicPublishedContentIdEqualityComparer())); return true; } - if ((args.First() as DynamicDocumentList) != null) + if ((args.First() as DynamicPublishedContentList) != null) { - result = new DynamicDocumentList(this.Items.Except((args.First() as DynamicDocumentList).Items, new DynamicDocumentIdEqualityComparer())); + result = new DynamicPublishedContentList(this.Items.Except((args.First() as DynamicPublishedContentList).Items, new DynamicPublishedContentIdEqualityComparer())); return true; } } @@ -143,18 +143,18 @@ namespace Umbraco.Core.Dynamics { if ((args.First() as IEnumerable) != null) { - result = new DynamicDocumentList(this.Items.Intersect(args.First() as IEnumerable, new DynamicDocumentIdEqualityComparer())); + result = new DynamicPublishedContentList(this.Items.Intersect(args.First() as IEnumerable, new DynamicPublishedContentIdEqualityComparer())); return true; } - if ((args.First() as DynamicDocumentList) != null) + if ((args.First() as DynamicPublishedContentList) != null) { - result = new DynamicDocumentList(this.Items.Intersect((args.First() as DynamicDocumentList).Items, new DynamicDocumentIdEqualityComparer())); + result = new DynamicPublishedContentList(this.Items.Intersect((args.First() as DynamicPublishedContentList).Items, new DynamicPublishedContentIdEqualityComparer())); return true; } } if (name == "Distinct") { - result = new DynamicDocumentList(this.Items.Distinct(new DynamicDocumentIdEqualityComparer())); + result = new DynamicPublishedContentList(this.Items.Distinct(new DynamicPublishedContentIdEqualityComparer())); return true; } if (name == "Pluck" || name == "Select") @@ -369,7 +369,7 @@ namespace Umbraco.Core.Dynamics var methodTypesToFind = new[] { typeof(IEnumerable), - typeof(DynamicDocumentList) + typeof(DynamicPublishedContentList) }; //find known extension methods that match the first type in the list @@ -383,7 +383,7 @@ namespace Umbraco.Core.Dynamics if (toExecute != null) { - if (toExecute.GetParameters().First().ParameterType == typeof(DynamicDocumentList)) + if (toExecute.GetParameters().First().ParameterType == typeof(DynamicPublishedContentList)) { var genericArgs = (new[] { this }).Concat(args); result = toExecute.Invoke(null, genericArgs.ToArray()); @@ -412,11 +412,11 @@ namespace Umbraco.Core.Dynamics } if (result is IEnumerable) { - result = new DynamicDocumentList((IEnumerable)result); + result = new DynamicPublishedContentList((IEnumerable)result); } if (result is IEnumerable) { - result = new DynamicDocumentList((IEnumerable)result); + result = new DynamicPublishedContentList((IEnumerable)result); } } return result; diff --git a/src/Umbraco.Core/Dynamics/DynamicDocumentListOrdering.cs b/src/Umbraco.Core/Dynamics/DynamicPublishedContentListOrdering.cs similarity index 97% rename from src/Umbraco.Core/Dynamics/DynamicDocumentListOrdering.cs rename to src/Umbraco.Core/Dynamics/DynamicPublishedContentListOrdering.cs index 39d987f509..c56a3b271b 100644 --- a/src/Umbraco.Core/Dynamics/DynamicDocumentListOrdering.cs +++ b/src/Umbraco.Core/Dynamics/DynamicPublishedContentListOrdering.cs @@ -5,7 +5,7 @@ using System.Linq.Expressions; namespace Umbraco.Core.Dynamics { - internal static class DynamicDocumentListOrdering + internal static class DynamicPublishedContentListOrdering { private static TOut Reduce(Func func, DynamicPublishedContent publishedContent) diff --git a/src/Umbraco.Core/Dynamics/DynamicDocumentWalker.cs b/src/Umbraco.Core/Dynamics/DynamicPublishedContentWalker.cs similarity index 89% rename from src/Umbraco.Core/Dynamics/DynamicDocumentWalker.cs rename to src/Umbraco.Core/Dynamics/DynamicPublishedContentWalker.cs index 0fa83c4c63..26c3a8dee8 100644 --- a/src/Umbraco.Core/Dynamics/DynamicDocumentWalker.cs +++ b/src/Umbraco.Core/Dynamics/DynamicPublishedContentWalker.cs @@ -4,7 +4,7 @@ using System.Linq; namespace Umbraco.Core.Dynamics { - internal static class DynamicDocumentWalker + internal static class DynamicPublishedContentWalker { public static DynamicPublishedContent Up(this DynamicPublishedContent context) { @@ -41,7 +41,7 @@ namespace Umbraco.Core.Dynamics } public static DynamicPublishedContent Down(this DynamicPublishedContent context, int number) { - var children = new DynamicDocumentList(context.Children); + var children = new DynamicPublishedContentList(context.Children); if (number == 0) { return children.Items.First(); @@ -52,7 +52,7 @@ namespace Umbraco.Core.Dynamics while (number-- >= 0) { working = children.Items.First(); - children = new DynamicDocumentList(working.Children); + children = new DynamicPublishedContentList(working.Children); } return working; } @@ -62,7 +62,7 @@ namespace Umbraco.Core.Dynamics if (string.IsNullOrEmpty(nodeTypeAlias)) { - var children = new DynamicDocumentList(context.Children); + var children = new DynamicPublishedContentList(context.Children); return children.Items.First(); } else @@ -80,7 +80,7 @@ namespace Umbraco.Core.Dynamics { //var list = context.Parent.Children.Select(n => new DynamicNode(n)); var list = context.Parent.Children; - context.OwnerList = new DynamicDocumentList(list); + context.OwnerList = new DynamicPublishedContentList(list); } if (context.OwnerList != null) { @@ -106,7 +106,7 @@ namespace Umbraco.Core.Dynamics { //var list = context.Parent.Children.Select(n => new DynamicNode(n)); var list = context.Parent.Children; - context.OwnerList = new DynamicDocumentList(list); + context.OwnerList = new DynamicPublishedContentList(list); } if (context.OwnerList != null) { @@ -132,7 +132,7 @@ namespace Umbraco.Core.Dynamics { //var list = context.Parent.Children.Select(n => new DynamicNode(n)); var list = context.Parent.Children; - context.OwnerList = new DynamicDocumentList(list); + context.OwnerList = new DynamicPublishedContentList(list); } if (context.OwnerList != null) { @@ -172,7 +172,7 @@ namespace Umbraco.Core.Dynamics { //var list = context.Parent.Children.Select(n => new DynamicNode(n)); var list = context.Parent.Children; - context.OwnerList = new DynamicDocumentList(list); + context.OwnerList = new DynamicPublishedContentList(list); } if (context.OwnerList != null) { @@ -207,7 +207,7 @@ namespace Umbraco.Core.Dynamics { //var list = context.Parent.Children.Select(n => new DynamicNode(n)); var list = context.Parent.Children; - context.OwnerList = new DynamicDocumentList(list); + context.OwnerList = new DynamicPublishedContentList(list); } if (context.OwnerList != null) { @@ -233,7 +233,7 @@ namespace Umbraco.Core.Dynamics { //var list = context.Parent.Children.Select(n => new DynamicNode(n)); var list = context.Parent.Children; - context.OwnerList = new DynamicDocumentList(list); + context.OwnerList = new DynamicPublishedContentList(list); } if (context.OwnerList != null) { diff --git a/src/Umbraco.Core/Dynamics/DynamicQueryable.cs b/src/Umbraco.Core/Dynamics/DynamicQueryable.cs index 1f82b55d2b..0f31abacff 100644 --- a/src/Umbraco.Core/Dynamics/DynamicQueryable.cs +++ b/src/Umbraco.Core/Dynamics/DynamicQueryable.cs @@ -214,7 +214,7 @@ namespace Umbraco.Core.Dynamics //reroute each stacked Expression.Call into our own methods that know how to deal //with DynamicNode queryExpr = Expression.Call( - typeof(DynamicDocumentListOrdering), + typeof(DynamicPublishedContentListOrdering), o.Ascending ? methodAsc : methodDesc, null, queryExpr, diff --git a/src/Umbraco.Core/Dynamics/ExtensionMethods.cs b/src/Umbraco.Core/Dynamics/ExtensionMethods.cs index 69e1d877da..69689bf204 100644 --- a/src/Umbraco.Core/Dynamics/ExtensionMethods.cs +++ b/src/Umbraco.Core/Dynamics/ExtensionMethods.cs @@ -32,7 +32,7 @@ namespace Umbraco.Core.Dynamics } - public static DynamicDocumentList Random(this DynamicDocumentList all, int min, int max) + public static DynamicPublishedContentList Random(this DynamicPublishedContentList all, int min, int max) { //get a random number generator Random r = new Random(); @@ -41,13 +41,13 @@ namespace Umbraco.Core.Dynamics //Call the other method return Random(all, Number); } - public static DynamicDocumentList Random(this DynamicDocumentList all, int max) + public static DynamicPublishedContentList Random(this DynamicPublishedContentList all, int max) { //Randomly order the items in the set by a Guid, Take the correct number, and return this wrapped in a new DynamicNodeList - return new DynamicDocumentList(all.Items.OrderBy(x => Guid.NewGuid()).Take(max)); + return new DynamicPublishedContentList(all.Items.OrderBy(x => Guid.NewGuid()).Take(max)); } - public static DynamicPublishedContent Random(this DynamicDocumentList all) + public static DynamicPublishedContent Random(this DynamicPublishedContentList all) { return all.Items.OrderBy(x => Guid.NewGuid()).First(); } diff --git a/src/Umbraco.Core/Dynamics/Grouping.cs b/src/Umbraco.Core/Dynamics/Grouping.cs index ff7d83549f..d1122a6395 100644 --- a/src/Umbraco.Core/Dynamics/Grouping.cs +++ b/src/Umbraco.Core/Dynamics/Grouping.cs @@ -13,7 +13,7 @@ namespace Umbraco.Core.Dynamics public IEnumerator GetEnumerator() { - var temp = new DynamicDocumentList(Elements.Cast()); + var temp = new DynamicPublishedContentList(Elements.Cast()); return (IEnumerator)temp.GetEnumerator(); } IEnumerator IEnumerable.GetEnumerator() @@ -21,7 +21,7 @@ namespace Umbraco.Core.Dynamics return (IEnumerator)GetEnumerator(); } - public DynamicDocumentList OrderBy(string ordering) + public DynamicPublishedContentList OrderBy(string ordering) { bool descending = false; if (ordering.IndexOf(" descending", StringComparison.CurrentCultureIgnoreCase) >= 0) @@ -37,7 +37,7 @@ namespace Umbraco.Core.Dynamics if (!descending) { - return new DynamicDocumentList(Elements.OrderBy(item => + return new DynamicPublishedContentList(Elements.OrderBy(item => { object key = null; (item as DynamicObject).TryGetMember(new DynamicQueryableGetMemberBinder(ordering, false), out key); @@ -46,7 +46,7 @@ namespace Umbraco.Core.Dynamics } else { - return new DynamicDocumentList(Elements.OrderByDescending(item => + return new DynamicPublishedContentList(Elements.OrderByDescending(item => { object key = null; (item as DynamicObject).TryGetMember(new DynamicQueryableGetMemberBinder(ordering, false), out key); diff --git a/src/Umbraco.Core/Dynamics/IDynamicDocumentDataSource.cs b/src/Umbraco.Core/Dynamics/IDynamicPublishedContentDataSource.cs similarity index 89% rename from src/Umbraco.Core/Dynamics/IDynamicDocumentDataSource.cs rename to src/Umbraco.Core/Dynamics/IDynamicPublishedContentDataSource.cs index c84e1565ac..50f7eba1c2 100644 --- a/src/Umbraco.Core/Dynamics/IDynamicDocumentDataSource.cs +++ b/src/Umbraco.Core/Dynamics/IDynamicPublishedContentDataSource.cs @@ -8,7 +8,7 @@ namespace Umbraco.Core.Dynamics /// and currently the business logic part of Umbraco is still in the legacy project and we don't want to move that to the core so in the /// meantime until the new APIs are made, we need to have this data source in place with a resolver which is set in the web project. /// - internal interface IDynamicDocumentDataSource + internal interface IDynamicPublishedContentDataSource { Guid GetDataType(string docTypeAlias, string propertyAlias); diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index c19c511dd0..beedce14c7 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -69,11 +69,11 @@ - - - - - + + + + + @@ -95,7 +95,7 @@ - + diff --git a/src/Umbraco.Tests/DynamicDocument/DocumentTests.cs b/src/Umbraco.Tests/DynamicDocument/DocumentTests.cs index edf68d6b71..54c8f473ed 100644 --- a/src/Umbraco.Tests/DynamicDocument/DocumentTests.cs +++ b/src/Umbraco.Tests/DynamicDocument/DocumentTests.cs @@ -21,7 +21,7 @@ namespace Umbraco.Tests.DynamicDocument { base.Initialize(); //need to specify a different callback for testing - Umbraco.Web.DocumentExtensions.GetPropertyAliasesAndNames = s => + Umbraco.Web.PublishedContentExtensions.GetPropertyAliasesAndNames = s => { var userFields = new Dictionary() { @@ -64,7 +64,7 @@ namespace Umbraco.Tests.DynamicDocument public override void TearDown() { base.TearDown(); - Umbraco.Web.DocumentExtensions.GetPropertyAliasesAndNames = null; + Umbraco.Web.PublishedContentExtensions.GetPropertyAliasesAndNames = null; UmbracoContext.Current = null; } diff --git a/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTestsBase.cs b/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTestsBase.cs index c1d3deb4b7..8722117bc1 100644 --- a/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTestsBase.cs +++ b/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTestsBase.cs @@ -17,14 +17,14 @@ namespace Umbraco.Tests.DynamicDocument { base.Initialize(); - DynamicDocumentDataSourceResolver.Current = new DynamicDocumentDataSourceResolver( - new TestDynamicDocumentDataSource()); + DynamicPublishedContentDataSourceResolver.Current = new DynamicPublishedContentDataSourceResolver( + new TestDynamicPublishedContentDataSource()); } public override void TearDown() { base.TearDown(); - DynamicDocumentDataSourceResolver.Reset(); + DynamicPublishedContentDataSourceResolver.Reset(); } protected override bool RequiresDbSetup @@ -32,7 +32,7 @@ namespace Umbraco.Tests.DynamicDocument get { return false; } } - private class TestDynamicDocumentDataSource : IDynamicDocumentDataSource + private class TestDynamicPublishedContentDataSource : IDynamicPublishedContentDataSource { public Guid GetDataType(string docTypeAlias, string propertyAlias) { diff --git a/src/Umbraco.Tests/DynamicDocument/DynamicDocumentCustomExtensionMethods.cs b/src/Umbraco.Tests/DynamicDocument/DynamicPublishedContentCustomExtensionMethods.cs similarity index 84% rename from src/Umbraco.Tests/DynamicDocument/DynamicDocumentCustomExtensionMethods.cs rename to src/Umbraco.Tests/DynamicDocument/DynamicPublishedContentCustomExtensionMethods.cs index a1d55025dd..115497b366 100644 --- a/src/Umbraco.Tests/DynamicDocument/DynamicDocumentCustomExtensionMethods.cs +++ b/src/Umbraco.Tests/DynamicDocument/DynamicPublishedContentCustomExtensionMethods.cs @@ -3,7 +3,7 @@ using Umbraco.Core.Dynamics; namespace Umbraco.Tests.DynamicDocument { - public static class DynamicDocumentCustomExtensionMethods + public static class DynamicPublishedContentCustomExtensionMethods { public static string DynamicDocumentNoParameters(this Core.Dynamics.DynamicPublishedContent doc) @@ -21,7 +21,7 @@ namespace Umbraco.Tests.DynamicDocument return custom + i + b; } - public static string DynamicDocumentListMultiParam(this DynamicDocumentList doc, string custom, int i, bool b) + public static string DynamicDocumentListMultiParam(this DynamicPublishedContentList doc, string custom, int i, bool b) { return custom + i + b; } diff --git a/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTests.cs b/src/Umbraco.Tests/DynamicDocument/DynamicPublishedContentTests.cs similarity index 92% rename from src/Umbraco.Tests/DynamicDocument/DynamicDocumentTests.cs rename to src/Umbraco.Tests/DynamicDocument/DynamicPublishedContentTests.cs index 176b7a3b9d..837920d1c0 100644 --- a/src/Umbraco.Tests/DynamicDocument/DynamicDocumentTests.cs +++ b/src/Umbraco.Tests/DynamicDocument/DynamicPublishedContentTests.cs @@ -14,7 +14,7 @@ using umbraco.cms.businesslogic.web; namespace Umbraco.Tests.DynamicDocument { [TestFixture] - public class DynamicDocumentTests : DynamicDocumentTestsBase + public class DynamicPublishedContentTests : DynamicDocumentTestsBase { public override void Initialize() { diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index a55a13e47c..4d1b329bb3 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -63,8 +63,8 @@ - - + + diff --git a/src/Umbraco.Web/DefaultDynamicDocumentDataSource.cs b/src/Umbraco.Web/DefaultDynamicPublishedContentDataSource.cs similarity index 86% rename from src/Umbraco.Web/DefaultDynamicDocumentDataSource.cs rename to src/Umbraco.Web/DefaultDynamicPublishedContentDataSource.cs index 12e2e2e2ec..61300cac77 100644 --- a/src/Umbraco.Web/DefaultDynamicDocumentDataSource.cs +++ b/src/Umbraco.Web/DefaultDynamicPublishedContentDataSource.cs @@ -11,7 +11,7 @@ namespace Umbraco.Web /// and currently the business logic part of Umbraco is still in the legacy project and we don't want to move that to the core so in the /// meantime until the new APIs are made, we need to have this data source in place with a resolver which is set in the web project. /// - internal class DefaultDynamicDocumentDataSource : IDynamicDocumentDataSource + internal class DefaultDynamicPublishedContentDataSource : IDynamicPublishedContentDataSource { public Guid GetDataType(string docTypeAlias, string propertyAlias) { diff --git a/src/Umbraco.Web/DynamicDocumentSearchExtensions.cs b/src/Umbraco.Web/DynamicPublishedContentSearchExtensions.cs similarity index 70% rename from src/Umbraco.Web/DynamicDocumentSearchExtensions.cs rename to src/Umbraco.Web/DynamicPublishedContentSearchExtensions.cs index 5babdca24b..169a666e37 100644 --- a/src/Umbraco.Web/DynamicDocumentSearchExtensions.cs +++ b/src/Umbraco.Web/DynamicPublishedContentSearchExtensions.cs @@ -6,9 +6,9 @@ namespace Umbraco.Web /// /// DynamicPublishedContent extension methods for searching using Examine /// - public static class DynamicDocumentSearchExtensions + public static class DynamicPublishedContentSearchExtensions { - public static DynamicDocumentList Search(this DynamicPublishedContent d, string term, bool useWildCards = true, string searchProvider = null) + public static DynamicPublishedContentList Search(this DynamicPublishedContent d, string term, bool useWildCards = true, string searchProvider = null) { var searcher = Examine.ExamineManager.Instance.DefaultSearchProvider; if (!string.IsNullOrEmpty(searchProvider)) @@ -24,12 +24,12 @@ namespace Umbraco.Web return d.Search(crit, searcher); } - public static DynamicDocumentList SearchDescendants(this DynamicPublishedContent d, string term, bool useWildCards = true, string searchProvider = null) + public static DynamicPublishedContentList SearchDescendants(this DynamicPublishedContent d, string term, bool useWildCards = true, string searchProvider = null) { return d.Search(term, useWildCards, searchProvider); } - public static DynamicDocumentList SearchChildren(this DynamicPublishedContent d, string term, bool useWildCards = true, string searchProvider = null) + public static DynamicPublishedContentList SearchChildren(this DynamicPublishedContent d, string term, bool useWildCards = true, string searchProvider = null) { var searcher = Examine.ExamineManager.Instance.DefaultSearchProvider; if (!string.IsNullOrEmpty(searchProvider)) @@ -45,7 +45,7 @@ namespace Umbraco.Web return d.Search(crit, searcher); } - public static DynamicDocumentList Search(this DynamicPublishedContent d, Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null) + public static DynamicPublishedContentList Search(this DynamicPublishedContent d, Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null) { var s = Examine.ExamineManager.Instance.DefaultSearchProvider; if (searchProvider != null) diff --git a/src/Umbraco.Web/ExamineExtensions.cs b/src/Umbraco.Web/ExamineExtensions.cs index 243230e03a..8898b491ff 100644 --- a/src/Umbraco.Web/ExamineExtensions.cs +++ b/src/Umbraco.Web/ExamineExtensions.cs @@ -12,7 +12,7 @@ namespace Umbraco.Web /// internal static class ExamineExtensions { - internal static DynamicDocumentList ConvertSearchResultToDynamicDocument( + internal static DynamicPublishedContentList ConvertSearchResultToDynamicDocument( this IEnumerable results, IPublishedStore store) { @@ -20,7 +20,7 @@ namespace Umbraco.Web // however thsi is currently not the case: // http://examine.codeplex.com/workitem/10350 - var list = new DynamicDocumentList(); + var list = new DynamicPublishedContentList(); var xd = new XmlDocument(); foreach (var result in results.OrderByDescending(x => x.Score)) diff --git a/src/Umbraco.Web/DocumentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs similarity index 96% rename from src/Umbraco.Web/DocumentExtensions.cs rename to src/Umbraco.Web/PublishedContentExtensions.cs index a2e783e1ec..bf05cde8a0 100644 --- a/src/Umbraco.Web/DocumentExtensions.cs +++ b/src/Umbraco.Web/PublishedContentExtensions.cs @@ -16,7 +16,7 @@ namespace Umbraco.Web /// These methods exist in the web project as we need access to web based classes like NiceUrl provider /// which is why they cannot exist in the Core project. /// - public static class DocumentExtensions + public static class PublishedContentExtensions { /// diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 1c6acc0197..cc3faaf33b 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -250,12 +250,12 @@ - + - - + + ASPXCodeBehind diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index 8d4e5abdb1..348f954d93 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -463,7 +463,7 @@ namespace Umbraco.Web var nodes = ids.Select(eachId => DocumentById(eachId, store)) .Where(x => !TypeHelper.IsTypeAssignableFrom(x)) .Cast(); - return new DynamicDocumentList(nodes); + return new DynamicPublishedContentList(nodes); } private dynamic DocumentByIds(IPublishedStore store, params string[] ids) @@ -471,7 +471,7 @@ namespace Umbraco.Web var nodes = ids.Select(eachId => DocumentById(eachId, store)) .Where(x => !TypeHelper.IsTypeAssignableFrom(x)) .Cast(); - return new DynamicDocumentList(nodes); + return new DynamicPublishedContentList(nodes); } #endregion diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs index 50654ba39c..a58b362f4b 100644 --- a/src/Umbraco.Web/WebBootManager.cs +++ b/src/Umbraco.Web/WebBootManager.cs @@ -228,7 +228,7 @@ namespace Umbraco.Web //This exists only because the new business logic classes aren't created yet and we want Dynamics in the Core project, //see the note in the DynamicNodeDataSourceResolver.cs class - DynamicDocumentDataSourceResolver.Current = new DynamicDocumentDataSourceResolver(new DefaultDynamicDocumentDataSource()); + DynamicPublishedContentDataSourceResolver.Current = new DynamicPublishedContentDataSourceResolver(new DefaultDynamicPublishedContentDataSource()); } } diff --git a/src/umbraco.MacroEngines/RazorDynamicNode/DynamicNode.cs b/src/umbraco.MacroEngines/RazorDynamicNode/DynamicNode.cs index 0b8446739c..52fb4f53df 100644 --- a/src/umbraco.MacroEngines/RazorDynamicNode/DynamicNode.cs +++ b/src/umbraco.MacroEngines/RazorDynamicNode/DynamicNode.cs @@ -544,7 +544,7 @@ namespace umbraco.MacroEngines //contextAlias is the node which the property data was returned from //Guid dataType = ContentType.GetDataType(data.ContextAlias, data.Alias); //SD: replaced with our temporary resolver so that we can unit test this properly, this is what DynamicPublishedContent uses until we create our new data access layer. - var dataType = DynamicDocumentDataSourceResolver.Current.DataSource.GetDataType(data.ContextAlias, data.Alias); + var dataType = DynamicPublishedContentDataSourceResolver.Current.DataSource.GetDataType(data.ContextAlias, data.Alias); var staticMapping = UmbracoSettings.RazorDataTypeModelStaticMapping.FirstOrDefault(mapping => { diff --git a/src/umbraco.MacroEngines/RazorDynamicNode/DynamicDocumentExtensions.cs b/src/umbraco.MacroEngines/RazorDynamicNode/DynamicPublishedContentExtensions.cs similarity index 94% rename from src/umbraco.MacroEngines/RazorDynamicNode/DynamicDocumentExtensions.cs rename to src/umbraco.MacroEngines/RazorDynamicNode/DynamicPublishedContentExtensions.cs index f53758e677..1221331f08 100644 --- a/src/umbraco.MacroEngines/RazorDynamicNode/DynamicDocumentExtensions.cs +++ b/src/umbraco.MacroEngines/RazorDynamicNode/DynamicPublishedContentExtensions.cs @@ -12,7 +12,7 @@ namespace umbraco.MacroEngines.Library /// /// Extension methods for converting DynamicPublishedContent to INode /// - internal static class DynamicDocumentExtensions + internal static class DynamicPublishedContentExtensions { internal static IProperty ConvertToNodeProperty(this IDocumentProperty prop) diff --git a/src/umbraco.MacroEngines/RazorDynamicNode/RazorLibraryCore.cs b/src/umbraco.MacroEngines/RazorDynamicNode/RazorLibraryCore.cs index 7239330fb9..0a01b47cb1 100644 --- a/src/umbraco.MacroEngines/RazorDynamicNode/RazorLibraryCore.cs +++ b/src/umbraco.MacroEngines/RazorDynamicNode/RazorLibraryCore.cs @@ -144,7 +144,7 @@ namespace umbraco.MacroEngines.Library public dynamic Search(string term, bool useWildCards = true, string searchProvider = null) { //wraps the functionality in UmbracoHelper but still returns the legacy DynamicNodeList - var nodes = ((DynamicDocumentList)_umbracoHelper.Search(term, useWildCards, searchProvider)) + var nodes = ((DynamicPublishedContentList)_umbracoHelper.Search(term, useWildCards, searchProvider)) .Select(x => x.ConvertToNode()); return new DynamicNodeList(nodes); } @@ -152,7 +152,7 @@ namespace umbraco.MacroEngines.Library public dynamic Search(Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null) { //wraps the functionality in UmbracoHelper but still returns the legacy DynamicNodeList - var nodes = ((DynamicDocumentList) _umbracoHelper.Search(criteria, searchProvider)) + var nodes = ((DynamicPublishedContentList) _umbracoHelper.Search(criteria, searchProvider)) .Select(x => x.ConvertToNode()); return new DynamicNodeList(nodes); } diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj index 38b25e1993..f8b48e64ca 100644 --- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj +++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj @@ -86,7 +86,7 @@ - +