Added support for Nested Razor Layouts

Updated the RazorPageResolver ResolveAndExecuteRazorPage function to
recursively render layouts until it finds one with no RazorPage Layout
value assigned.

Author: pwhe23

src/ServiceStack.Razor/Managers/RazorPageResolver.cs

@@ -135,42 +135,54 @@ public IRazorView ResolveAndExecuteRazorPage(IHttpRequest httpReq, IHttpResponse
                 httpRes.StatusCode = (int)HttpStatusCode.NotFound;
                 return null;
             }
-            
+
             using (var writer = new StreamWriter(httpRes.OutputStream, UTF8EncodingWithoutBom))
             {
                 var page = CreateRazorPageInstance(httpReq, httpRes, model, razorPage);
 
                 var includeLayout = !(httpReq.GetParam(QueryStringFormatKey) ?? "").Contains(NoTemplateFormatValue);
                 if (includeLayout)
                 {
-                    using (var ms = new MemoryStream())
-                    using (var childWriter = new StreamWriter(ms, UTF8EncodingWithoutBom))
+                    var result = ExecuteRazorPageWithLayout(httpReq, httpRes, model, page, () =>
                     {
-                        //child page needs to execute before master template to populate ViewBags, sections, etc
-                        page.WriteTo(childWriter);
+                        return httpReq.GetItem(LayoutKey) as string
+                                       ?? page.Layout
+                                       ?? DefaultLayoutName;
+                    });
+
+                    writer.Write(result.Item2);
+                    return result.Item1;
+                }
 
-                        var layout = httpReq.GetItem(LayoutKey) as string
-                            ?? page.Layout
-                            ?? DefaultLayoutName;
+                page.WriteTo(writer);
+                return page;
+            }
+        }
+
+        private Tuple<IRazorView, string> ExecuteRazorPageWithLayout(IHttpRequest httpReq, IHttpResponse httpRes, object model, IRazorView page, Func<string> layout)
+        {
+            using (var ms = new MemoryStream())
+            {
+                using (var childWriter = new StreamWriter(ms, UTF8EncodingWithoutBom))
+                {
+                    //child page needs to execute before master template to populate ViewBags, sections, etc
+                    page.WriteTo(childWriter);
+                    var childBody = ms.ToArray().FromUtf8Bytes();
 
-                        var childBody = ms.ToArray().FromUtf8Bytes();
-                        var layoutPage = this.viewManager.GetPageByName(layout, httpReq, model);
+                    var layoutName = layout();
+                    if (!String.IsNullOrEmpty(layoutName))
+                    {
+                        var layoutPage = this.viewManager.GetPageByName(layoutName, httpReq, model);
                         if (layoutPage != null)
                         {
                             var layoutView = CreateRazorPageInstance(httpReq, httpRes, model, layoutPage);
-
                             layoutView.SetChildPage(page, childBody);
-                            layoutView.WriteTo(writer);
-                            return layoutView;
+                            return ExecuteRazorPageWithLayout(httpReq, httpRes, model, layoutView, () => layoutView.Layout);
                         }
-
-                        writer.Write(childBody);
-                        return page;
                     }
-                }
 
-                page.WriteTo(writer);
-                return page;
+                    return Tuple.Create(page, childBody);
+                }
             }
         }
 

tests/ServiceStack.ServiceHost.Tests/Formats_Razor/IntroductionLayoutRazorTests.cs

@@ -132,20 +132,29 @@ comes from ^^^websiteTemplate.</p>
 		}
 
 		[Test]
-		public void Simple_Nested_Layout_Example()
+		public void Nested_Layout_Example_With_Sections()
 		{
 			var websiteTemplate2 =
-				@"<div id=""body2"">@RenderBody()</div>".Replace("\r\n", "").Replace("\t", "");
+				@"<div id=""body2"">@RenderBody()</div>
+				@RenderSection(""Section1"")"
+				.Replace("\r\n", "").Replace("\t", "");
 
 			var websiteTemplate1 =
 				@"@{Layout=""websiteTemplate2"";}
-				<div id=""body1"">@RenderBody()</div>".Replace("\r\n", "").Replace("\t", "");
+				<div id=""body1"">@RenderBody()</div>
+				@RenderSection(""Section1"")
+				@section Section1 {<div>Menu2</div>}"
+				.Replace("\r\n", "").Replace("\t", "");
 
 			var pageTemplate =
 				@"@{Layout=""websiteTemplate1"";}
-				<h1>@DateTime.Now.Year</h1>".Replace("\r\n", "").Replace("\t", "");
+				<h1>@DateTime.Now.Year</h1>
+				@section Section1 {<div>Menu1</div>}"
+				.Replace("\r\n", "").Replace("\t", "");
 
-			var expectedHtml = (@"<div id=""body2""><div id=""body1""><h1>" + DateTime.Now.Year + "</h1></div></div>")
+			var expectedHtml = (@"<div id=""body2""><div id=""body1"">
+				<h1>" + DateTime.Now.Year + @"</h1></div>
+				<div>Menu1</div></div><div>Menu2</div>")
 				.Replace("\r\n", "").Replace("\t", "");
 
 			RazorFormat.AddFileAndPage("/views/websiteTemplate2.cshtml", websiteTemplate2);