Made sure the diag view renderer has the correct context

christhomet · Feb 7, 2012 · 5112184 · 5112184
1 parent 0256a70
commit 5112184
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/src/Nancy/Diagnostics/DiagnosticModule.cs b/src/Nancy/Diagnostics/DiagnosticModule.cs
@@ -15,7 +15,7 @@ protected DiagnosticModule(string basePath)
 
         public new DiagnosticsViewRenderer View
         {
-            get { return new DiagnosticsViewRenderer(); }
+            get { return new DiagnosticsViewRenderer(this.Context); }
         }
     }
 }
diff --git a/src/Nancy/Diagnostics/DiagnosticsHook.cs b/src/Nancy/Diagnostics/DiagnosticsHook.cs
@@ -70,7 +70,7 @@ public static void Enable(DiagnosticsConfiguration diagnosticsConfiguration, IPi
 
                         return diagnosticsConfiguration.Valid
                                    ? ExecuteDiagnostics(ctx, diagnosticsRouteResolver, diagnosticsConfiguration, serializer)
-                                   : GetDiagnosticsHelpView();
+                                   : GetDiagnosticsHelpView(ctx);
                     }));
         }
 
@@ -79,16 +79,16 @@ public static void Disable(IPipelines pipelines)
             pipelines.BeforeRequest.RemoveByName(PipelineKey);
         }
 
-        private static Response GetDiagnosticsHelpView()
+        private static Response GetDiagnosticsHelpView(NancyContext ctx)
         {
-            var renderer = new DiagnosticsViewRenderer();
+            var renderer = new DiagnosticsViewRenderer(ctx);
 
             return renderer["help"];
         }
 
-        private static Response GetDiagnosticsLoginView()
+        private static Response GetDiagnosticsLoginView(NancyContext ctx)
         {
-            var renderer = new DiagnosticsViewRenderer();
+            var renderer = new DiagnosticsViewRenderer(ctx);
 
             return renderer["login"];
         }
@@ -99,7 +99,7 @@ private static Response ExecuteDiagnostics(NancyContext ctx, IRouteResolver rout
 
             if (session == null)
             {
-                var view = GetDiagnosticsLoginView();
+                var view = GetDiagnosticsLoginView(ctx);
 
                 view.AddCookie(
                     new NancyCookie(DiagsCookieName, String.Empty, true) { Expires = DateTime.Now.AddDays(-1) });

diff --git a/src/Nancy/Diagnostics/DiagnosticsViewRenderer.cs b/src/Nancy/Diagnostics/DiagnosticsViewRenderer.cs
@@ -7,21 +7,27 @@ namespace Nancy.Diagnostics
 
     public class DiagnosticsViewRenderer
     {
+        private readonly NancyContext context;
         private static readonly IViewResolver ViewResolver = new DiagnosticsViewResolver();
 
         private static readonly IViewEngine Engine = new SuperSimpleViewEngineWrapper();
 
+        public DiagnosticsViewRenderer(NancyContext context)
+        {
+            this.context = context;
+        }
+
         public Response this[string name]
         {
-            get { return RenderView(name, null); }
+            get { return RenderView(name, null, this.context); }
         }
 
         public Response this[string name, dynamic model]
         {
-            get { return RenderView(name, model); }
+            get { return RenderView(name, model, this.context); }
         }
 
-        private static Response RenderView(string name, dynamic model)
+        private static Response RenderView(string name, dynamic model, NancyContext context)
         {
             var fullName = string.Concat(name, ".sshtml");
 
@@ -31,9 +37,6 @@ private static Response RenderView(string name, dynamic model)
 
             var cache = new DefaultViewCache();
 
-            var context = 
-                new NancyContext();
-
             context.Items.Add(CsrfToken.DEFAULT_CSRF_KEY, "DIAGNOSTICSTOKEN");
 
             var renderContext =