Merge pull request #99 from bausshf/master

Custom view routes

core/meta.d

@@ -0,0 +1,9 @@
+/**
+* Copyright © DiamondMVC 2018
+* License: MIT (https://github.com/DiamondMVC/Diamond/blob/master/LICENSE)
+* Author: Jacob Jensen (bausshf)
+*/
+module diamond.core.meta;
+
+/// A string equivalent to the current version of Diamond.
+static const diamondVersion = "2.10.1";

core/package.d

@@ -19,4 +19,5 @@ public
   import diamond.core.logging;
   import diamond.core.webinitialization;
   import diamond.core.cache;
+  import diamond.core.meta;
 }

http/routing.d

@@ -16,6 +16,34 @@ static if (isWeb)
   import diamond.http.client;
   import diamond.http.method;
 
+  static if (isWebServer)
+  {
+    private static __gshared string[string] _routableViews;
+
+    /**
+    * Adds a route to a view.
+    * Params:
+    *   route =    The route.
+    *   viewName = The view name.
+    */
+    void addViewRoute(string route, string viewName)
+    {
+      _routableViews[route] = viewName;
+    }
+
+    /**
+    * Gets the view name from a custom route.
+    * Params:
+    *   route = The route used to retrieve the view name.
+    * Returns:
+    *   The view name if routable, null otherwise.
+    */
+    package(diamond) string getViewNameFromRoute(string route)
+    {
+      return _routableViews.get(route, null);
+    }
+  }
+
   /// Collection of routes.
   private static __gshared RouteEntry[string] _routes;
 

views/viewformats.d

@@ -25,6 +25,7 @@ static if (!isWebApi)
         import diamond.errors.exceptions;
         import diamond.controllers;
         import diamond.markdown;
+        import diamond.core.meta;
         import i18n = diamond.data.i18n;
 
         import controllers;
@@ -118,6 +119,7 @@ static if (!isWebApi)
         import std.conv : to;
 
         import diamond.errors.exceptions;
+        import diamond.core.meta;
 
         import models;
 

views/viewroute.d

@@ -33,6 +33,12 @@ static if (!isWebApi)
             auto viewName =
               routableViews.get(route.name, checkRoute ? null : route.name);
 
+            if (!viewName)
+            {
+              import diamond.http.routing;
+              viewName = getViewNameFromRoute(route.name);
+            }
+
             if (!viewName)
             {
               return null;