Merge pull request #50 from bausshf/master

Added ability to use a single view for routing
DiamondMVC · Mar 5, 2018 · 91f0cdb · 91f0cdb
2 parents 4407811 + a7e9ddb
commit 91f0cdb
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/core/webconfig.d b/core/webconfig.d
@@ -125,6 +125,8 @@ static if (isWeb)
     @optional string maintenance;
     /// An array of ips that can still access the site during maintenance.
     @optional string[] maintenanceWhiteList;
+    /// Boolean determining whethere there's only one view to use for routing. The view must be named __view.dd
+    @optional bool viewOnly;
   }
 
   /// A web address.

diff --git a/extensions/extensiontype.d b/extensions/extensiontype.d
@@ -20,6 +20,9 @@ enum ExtensionType
   /// An extension used to extend the general view class.
   viewExtension = "ViewExtension",
 
+  /// An extension used to extend the general view constructor.
+  viewCtorExtension = "ViewCtorExtension",
+
   /// An extension used to extend the general controller class.
   controllerExtension = "ControllerExtension",
 

diff --git a/init/server.d b/init/server.d
@@ -51,7 +51,18 @@ static if (isWebServer)
 
     import diamond.init.web : getView;
 
-    auto page = getView(client, client.route, true);
+    import diamond.views.view : View;
+
+    View page;
+
+    if (webConfig.viewOnly)
+    {
+      page = getView(client, new Route("__view"), false, true);
+    }
+    else
+    {
+      page = getView(client, client.route, true);
+    }
 
     if (!page)
     {

diff --git a/views/view.d b/views/view.d
@@ -84,6 +84,13 @@ static if (!isWebApi)
 
         _placeHolders["doctype"] = "<!DOCTYPE html>";
         _placeHolders["defaultRoute"] = _client.route.name;
+
+        import diamond.extensions;
+        mixin ExtensionEmit!(ExtensionType.viewCtorExtension, q{
+          mixin {{extensionEntry}}.extension;
+        });
+
+        onViewCtor();
       }
     }
     else

diff --git a/views/viewroute.d b/views/viewroute.d
@@ -28,7 +28,7 @@ static if (!isWebApi)
       string generateGetView()
       {
         string getViewMixin = "
-          View getView(HttpClient client, Route route, bool checkRoute)
+          View getView(HttpClient client, Route route, bool checkRoute, bool keepRoute = false)
           {
             auto viewName =
               routableViews.get(route.name, checkRoute ? null : route.name);
@@ -49,7 +49,11 @@ static if (!isWebApi)
           getViewMixin ~= format(q{
             case "%s":
             {
-              client.route = route;
+              if (!keepRoute)
+              {
+                client.route = route;
+              }
+
               return new view_%s(client, "%s");
             }
           }, viewName, viewName, viewName);