From d4d4272b1be392588b93afe2bc56d42e6453e939 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Wed, 24 Oct 2012 09:59:23 +0500
Subject: [PATCH] Moved RenderModel to Models namespace. Created new base
 UmbracoViewPage to use for umbraco partial views, etc... and renamed
 RenderViewPage to UmbracoTemplatePage which now inherits from
 UmbracoViewPage. Added NiceUrl and NiceUrlWithDomain as extension methods to
 IPublishedContent.

---
 .../Routing/RenderRouteHandlerTests.cs        |  1 +
 .../{Mvc => Models}/RenderModel.cs            |  5 +--
 src/Umbraco.Web/Mvc/RenderModelBinder.cs      |  1 +
 src/Umbraco.Web/Mvc/RenderMvcController.cs    |  1 +
 src/Umbraco.Web/Mvc/RenderRouteHandler.cs     |  1 +
 src/Umbraco.Web/Mvc/RenderViewEngine.cs       |  1 +
 src/Umbraco.Web/Mvc/UmbracoTemplatePage.cs    | 37 +++++++++++++++++++
 .../{RenderViewPage.cs => UmbracoViewPage.cs} | 26 +++----------
 src/Umbraco.Web/PublishedContentExtensions.cs | 22 +++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  5 ++-
 src/Umbraco.Web/WebBootManager.cs             |  1 +
 11 files changed, 74 insertions(+), 27 deletions(-)
 rename src/Umbraco.Web/{Mvc => Models}/RenderModel.cs (82%)
 create mode 100644 src/Umbraco.Web/Mvc/UmbracoTemplatePage.cs
 rename src/Umbraco.Web/Mvc/{RenderViewPage.cs => UmbracoViewPage.cs} (58%)

diff --git a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
index 3a8b055374..7ce816644c 100644
--- a/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
+++ b/src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
@@ -5,6 +5,7 @@ using Umbraco.Core;
 using Umbraco.Tests.Stubs;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;
+using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.Routing;
 using umbraco.BusinessLogic;
diff --git a/src/Umbraco.Web/Mvc/RenderModel.cs b/src/Umbraco.Web/Models/RenderModel.cs
similarity index 82%
rename from src/Umbraco.Web/Mvc/RenderModel.cs
rename to src/Umbraco.Web/Models/RenderModel.cs
index 215a160a9e..aa06c747f3 100644
--- a/src/Umbraco.Web/Mvc/RenderModel.cs
+++ b/src/Umbraco.Web/Models/RenderModel.cs
@@ -1,10 +1,7 @@
 using System.Globalization;
-using System.Xml;
 using Umbraco.Core.Models;
-using umbraco;
-using umbraco.interfaces;
 
-namespace Umbraco.Web.Mvc
+namespace Umbraco.Web.Models
 {
 	/// <summary>
 	/// Represents the model for the current rendering page in Umbraco
diff --git a/src/Umbraco.Web/Mvc/RenderModelBinder.cs b/src/Umbraco.Web/Mvc/RenderModelBinder.cs
index f66a53ea15..f8b1df7520 100644
--- a/src/Umbraco.Web/Mvc/RenderModelBinder.cs
+++ b/src/Umbraco.Web/Mvc/RenderModelBinder.cs
@@ -1,4 +1,5 @@
 using System.Web.Mvc;
+using Umbraco.Web.Models;
 
 namespace Umbraco.Web.Mvc
 {
diff --git a/src/Umbraco.Web/Mvc/RenderMvcController.cs b/src/Umbraco.Web/Mvc/RenderMvcController.cs
index addbaf3a84..08469ef9ff 100644
--- a/src/Umbraco.Web/Mvc/RenderMvcController.cs
+++ b/src/Umbraco.Web/Mvc/RenderMvcController.cs
@@ -2,6 +2,7 @@ using System;
 using System.IO;
 using System.Web.Mvc;
 using Umbraco.Core.Logging;
+using Umbraco.Web.Models;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.Mvc
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index ab2573d131..fc623fe905 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -7,6 +7,7 @@ using System.Web.Routing;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Web.Models;
 using Umbraco.Web.Routing;
 using umbraco.cms.businesslogic.template;
 
diff --git a/src/Umbraco.Web/Mvc/RenderViewEngine.cs b/src/Umbraco.Web/Mvc/RenderViewEngine.cs
index 4052505b9a..8236c6af56 100644
--- a/src/Umbraco.Web/Mvc/RenderViewEngine.cs
+++ b/src/Umbraco.Web/Mvc/RenderViewEngine.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Web.Mvc;
 using Umbraco.Core;
 using Umbraco.Core.IO;
+using Umbraco.Web.Models;
 
 namespace Umbraco.Web.Mvc
 {
diff --git a/src/Umbraco.Web/Mvc/UmbracoTemplatePage.cs b/src/Umbraco.Web/Mvc/UmbracoTemplatePage.cs
new file mode 100644
index 0000000000..1b390ca1e3
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/UmbracoTemplatePage.cs
@@ -0,0 +1,37 @@
+using Umbraco.Core.Dictionary;
+using Umbraco.Core.Dynamics;
+using Umbraco.Core.Models;
+using Umbraco.Web.Models;
+
+namespace Umbraco.Web.Mvc
+{
+	/// <summary>
+	/// The View that front-end templates inherit from
+	/// </summary>
+	public abstract class UmbracoTemplatePage : UmbracoViewPage<RenderModel>
+	{
+		protected UmbracoTemplatePage()
+		{
+
+		}
+
+		protected override void InitializePage()
+		{
+			base.InitializePage();
+			//set the model to the current node if it is not set, this is generally not the case
+			if (Model != null)
+			{
+				////this.ViewData.Model = Model;
+				//var backingItem = new DynamicBackingItem(Model.CurrentNode);
+				var dynamicNode = new DynamicPublishedContent(Model.Content);
+				CurrentPage = dynamicNode.AsDynamic();
+			}
+		}
+
+		/// <summary>
+		/// Returns the a DynamicPublishedContent object
+		/// </summary>
+		public dynamic CurrentPage { get; private set; }		
+
+	}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/RenderViewPage.cs b/src/Umbraco.Web/Mvc/UmbracoViewPage.cs
similarity index 58%
rename from src/Umbraco.Web/Mvc/RenderViewPage.cs
rename to src/Umbraco.Web/Mvc/UmbracoViewPage.cs
index 8d3b450b75..0f707b9051 100644
--- a/src/Umbraco.Web/Mvc/RenderViewPage.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoViewPage.cs
@@ -1,33 +1,22 @@
 using System.Web.Mvc;
 using Umbraco.Core;
-using Umbraco.Core.Dictionary;
-using Umbraco.Core.Dynamics;
-using Umbraco.Core.Models;
-using Umbraco.Web.Models;
 using Umbraco.Web.Routing;
 
 namespace Umbraco.Web.Mvc
 {
 	/// <summary>
-	/// The View that front-end templates inherit from
+	/// The View that umbraco front-end views inherit from
 	/// </summary>
-	public abstract class RenderViewPage : WebViewPage<RenderModel>
+	public abstract class UmbracoViewPage<T> : WebViewPage<T>
 	{
-		protected RenderViewPage()
+		protected UmbracoViewPage()
 		{
 
 		}
 
 		protected override void InitializePage()
 		{
-			//set the model to the current node if it is not set, this is generally not the case
-			if (Model != null)
-			{
-				////this.ViewData.Model = Model;
-				//var backingItem = new DynamicBackingItem(Model.CurrentNode);
-				var dynamicNode = new DynamicPublishedContent(Model.Content);
-				CurrentPage = dynamicNode.AsDynamic();
-			}
+			base.InitializePage();
 			PublishedContentRequest = (PublishedContentRequest)ViewContext.RouteData.DataTokens.GetRequiredObject("umbraco-doc-request");
 			UmbracoContext = (UmbracoContext)ViewContext.RouteData.DataTokens.GetRequiredObject("umbraco-context");
 			ApplicationContext = UmbracoContext.Application;
@@ -46,12 +35,7 @@ namespace Umbraco.Web.Mvc
 		/// <summary>
 		/// Returns the current PublishedContentRequest
 		/// </summary>
-		internal PublishedContentRequest PublishedContentRequest { get; private set; }
-
-		/// <summary>
-		/// Returns the a DynamicPublishedContent object
-		/// </summary>
-		public dynamic CurrentPage { get; private set; }		
+		internal PublishedContentRequest PublishedContentRequest { get; private set; }		
 
 		private UmbracoHelper _helper;
 
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index 6680bbeedc..c7820e8766 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -23,6 +23,28 @@ namespace Umbraco.Web
 	/// </remarks>
 	public static class PublishedContentExtensions
 	{
+		/// <summary>
+		/// Gets the NiceUrl for the content item
+		/// </summary>
+		/// <param name="doc"></param>
+		/// <returns></returns>
+		public static string NiceUrl(this IPublishedContent doc)
+		{
+			var umbHelper = new UmbracoHelper(UmbracoContext.Current);
+			return umbHelper.NiceUrl(doc.Id);
+		}
+
+		/// <summary>
+		/// Gets the NiceUrlWithDomain for the content item
+		/// </summary>
+		/// <param name="doc"></param>
+		/// <returns></returns>
+		public static string NiceUrlWithDomain(this IPublishedContent doc)
+		{
+			var umbHelper = new UmbracoHelper(UmbracoContext.Current);
+			return umbHelper.NiceUrlWithDomain(doc.Id);
+		}
+
 		/// <summary>
 		/// Returns the current template Alias
 		/// </summary>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 389e13db63..9a42400d77 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -265,6 +265,7 @@
     <Compile Include="DefaultPublishedMediaStore.cs" />
     <Compile Include="Dictionary\UmbracoCultureDictionary.cs" />
     <Compile Include="Dictionary\UmbracoCultureDictionaryFactory.cs" />
+    <Compile Include="Mvc\UmbracoViewPage.cs" />
     <Compile Include="PublishedContentExtensions.cs" />
     <Compile Include="ExamineExtensions.cs" />
     <Compile Include="FormlessPage.cs">
@@ -360,12 +361,12 @@
     <Compile Include="Mvc\MasterControllerFactory.cs" />
     <Compile Include="Mvc\RenderActionInvoker.cs" />
     <Compile Include="Mvc\RenderControllerFactory.cs" />
-    <Compile Include="Mvc\RenderModel.cs" />
+    <Compile Include="Models\RenderModel.cs" />
     <Compile Include="Mvc\RenderModelBinder.cs" />
     <Compile Include="Mvc\RenderMvcController.cs" />
     <Compile Include="Mvc\RenderRouteHandler.cs" />
     <Compile Include="Mvc\RenderViewEngine.cs" />
-    <Compile Include="Mvc\RenderViewPage.cs" />
+    <Compile Include="Mvc\UmbracoTemplatePage.cs" />
     <Compile Include="Mvc\RouteDefinition.cs" />
     <Compile Include="Mvc\RouteValueDictionaryExtensions.cs" />
     <Compile Include="Routing\DocumentLookupBase.cs" />
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index 704b35a477..0a49d7673d 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Dynamics;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Web.Dictionary;
 using Umbraco.Web.Media.ThumbnailProviders;
+using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Web.Routing;