Added baseUrl to Router for blocks.middleware()

src/modules/Router.js

@@ -116,6 +116,7 @@
   function Router() {
     this._currentRoute = {};
     this._routes = {};
+    this._baseUrl = '';
   }
 
   blocks.core.Router = Router;
@@ -170,6 +171,10 @@
         }
       });
 
+      if (this._baseUrl) {
+        result = this._baseUrl + result;
+      }
+
       return result;
     },
 
@@ -180,6 +185,10 @@
 
       url = decodeURI(url);
 
+      if (this._baseUrl && url.startsWith(this._baseUrl)) {
+        url = url.substr(this._baseUrl.length, url.length);
+      }
+
       blocks.each(this._routes, function (routeMetadata) {
         blocks.each(routeMetadata.regExCollection, function (regEx) {
           if (regEx.regEx.test(url)) {
@@ -189,7 +198,7 @@
                 id: routeMetadata.route._routeString,
                 params: getUrlParams(routeMetadata, regEx.params, matches)
               });
-              routeMetadata  = routeMetadata.parent;
+              routeMetadata = routeMetadata.parent;
             }
             return false;
           }
@@ -380,6 +389,17 @@
           });
         }
       });
+    },
+    _setBaseUrl: function (url) {
+      if (blocks.isString(url)) {
+        if (!url.endsWith('/')) {
+          url += '/';
+        }
+        if(url.startsWith('/')) {
+          url = url.substr(1, url.length);
+        }
+        this._baseUrl = url;
+      }
     }
   };
 

src/mvc/Application.js

@@ -286,6 +286,11 @@ define([
       if (!this._started) {
         this._started = true;
         this._serverData = window.__blocksServerData__;
+
+        if (this._serverData && this._serverData.baseUrl) {
+          this._router._setBaseUrl(this._serverData.baseUrl);
+        }
+
         this._createViews();
         blocks.domReady(blocks.bind(this._ready, this, element));
       }

src/node/BrowserEnv.js

@@ -28,7 +28,11 @@ define([
         location[name] = props[name];
       });
     },
-
+    setBaseUrl: function (url) {
+      if (url) {
+        this._env.__baseUrl__ = url;
+      }
+    },
     addElementsById: function (elementsById) {
       var env = this._env;
       env.document.__elementsById__ = elementsById;

src/node/Middleware.js

@@ -39,6 +39,7 @@ define([
           next();
         } else {
           res.send(contents);
+          return;
         }
       });
     },
@@ -100,6 +101,7 @@ define([
     _createBrowserEnv: function (req, server) {
       var browserEnv = BrowserEnv.Create();
 
+      browserEnv.setBaseUrl(req.baseUrl);
       browserEnv.fillLocation(this._getLocation(req));
       browserEnv.addElementsById(this._elementsById);
       browserEnv.fillServer(server);
@@ -108,7 +110,7 @@ define([
     },
 
     _getLocation: function (req) {
-      return req.protocol + '://' + req.get('host') + req.url;
+      return req.protocol + '://' + req.get('host') + req.originalUrl;
     }
   };
 });

src/node/createBrowserEnvObject.js

@@ -31,6 +31,7 @@ define(function () {
     var timeoutId = 0;
     var windowObj = {
       __mock__: true,
+      __baseUrl__: '',
 
       console: createConsoleMock(),
 

src/node/overrides.js

@@ -198,4 +198,14 @@ define([
       this.callSuccess(contents);
     }
   };
+
+  var blocksApplication = blocks.Application;
+
+  blocks.Application = function (options) {
+    var app = blocksApplication(options);
+    app._router._setBaseUrl(window.__baseUrl__);
+    server.data.baseUrl = window.__baseUrl__;
+    return app;
+  };
+
 });