Merge pull request #11 from bausshf/master

Base-view passing to controllers

controllers/controller.d

@@ -135,6 +135,8 @@ static if (isWeb)
 // WebServer's will have a view associated with the controller, the view then contains information about the request etc.
 static if (isWebServer)
 {
+  public import diamond.views.view;
+
   /// Wrapper around a controller.
   class Controller(TView) : BaseController
   {

views/view.d

@@ -21,6 +21,16 @@ static if (!isWebApi)
     import diamond.http;
   }
 
+  /**
+  * Template to get the type name of a view.
+  * Params:
+  *   name = The name of the view.
+  */
+  template ViewTypeName(string name)
+  {
+    mixin("alias ViewTypeName = view_" ~ name ~ ";");
+  }
+
   /// The abstract wrapper for views.
   abstract class View
   {
@@ -289,6 +299,27 @@ static if (!isWebApi)
         append(result);
       }
 
+      /**
+      * Gets th current view as a specific view.
+      * Params:
+      *   name = The name of the view to get the view as.
+      * Returns:
+      *   The view converted to the specific view.
+      */
+      auto asView(string name)()
+      {
+        mixin("import diamondapp : getView, view_" ~ name ~ ";");
+
+        static if (isWebServer)
+        {
+          mixin("return cast(view_" ~ name ~ ")this;");
+        }
+        else
+        {
+          mixin("return cast(view_" ~ name ~ ")this;");
+        }
+      }
+
       /**
       * Retrieves a raw view by name.
       * This wraps around getView.

views/viewformats.d

@@ -94,10 +94,10 @@ static if (!isWebApi)
     };
 
     /// The format for the controller member.
-    enum controllerMemberFormat = "%s!view_%s controller;\r\n";
+    enum controllerMemberFormat = "%s!%s controller;\r\n";
 
     /// The format for controller constructors.
-    enum controllerConstructorFormat = "controller = new %s!view_%s(this);\r\n";
+    enum controllerConstructorFormat = "controller = new %s!%s(this);\r\n";
 
   }
   else

views/viewparser.d

@@ -14,6 +14,7 @@ static if (!isWebApi)
 
   import std.string : strip, format;
   import std.array : replace, split;
+  import std.conv : to;
 
   /**
   * Parses the view parts into a view class.
@@ -34,6 +35,7 @@ static if (!isWebApi)
     string viewCodeGeneration = "";
     string viewPlaceHolderGeneration = "";
     bool hasController;
+    bool useBaseView;
     string layoutName = null;
 
     foreach (sectionName,parts; allParts)
@@ -91,6 +93,7 @@ static if (!isWebApi)
               viewName,
               viewClassMembersGeneration, viewConstructorGeneration,
               viewModelGenerateGeneration, viewPlaceHolderGeneration,
+              useBaseView,
               hasController,
               layoutName, route
             );
@@ -185,6 +188,7 @@ static if (!isWebApi)
     ref string viewConstructorGeneration,
     ref string viewModelGenerateGeneration,
     ref string viewPlaceHolderGeneration,
+    ref bool useBaseView,
     ref bool hasController,
     ref string layoutName,
     ref string route)
@@ -236,11 +240,17 @@ static if (!isWebApi)
 
         static if (isWebServer)
         {
+          case "controllerUseBaseView":
+          {
+            useBaseView = to!bool(value);
+            break;
+          }
+
           case "controller":
           {
             hasController = true;
-            viewClassMembersGeneration ~= controllerMemberFormat.format(value, viewName);
-            viewConstructorGeneration ~= controllerConstructorFormat.format(value, viewName);
+            viewClassMembersGeneration ~= controllerMemberFormat.format(value, useBaseView ? "View" : "view_" ~ viewName);
+            viewConstructorGeneration ~= controllerConstructorFormat.format(value, useBaseView ? "View" : "view_" ~ viewName);
             break;
           }
         }