(add) options to static assets

jstty · Jan 15, 2017 · 928cb3c · 928cb3c
1 parent 8387b32
commit 928cb3c
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 32 deletions.
diff --git a/legacy/http.framework.express.js b/legacy/http.framework.express.js
@@ -189,11 +189,11 @@ HttpFrameworkExpress.prototype.addMethodFunction = function (method, middlewareL
   this._app[method](routeStr, handler);
 };
 
-HttpFrameworkExpress.prototype.addStaticDir = function (staticDir, staticRoute) {
+HttpFrameworkExpress.prototype.addStaticDir = function (staticDir, staticRoute, staticOptions) {
   if (staticRoute) {
-    return this._app.use(staticRoute, express.static(staticDir));
+    return this._app.use(staticRoute, express.static(staticDir, staticOptions));
   } else {
-    return this._app.use(express.static(staticDir));
+    return this._app.use(express.static(staticDir, staticOptions));
   }
 };
 

diff --git a/legacy/service.middleware/defaultRoutes.js b/legacy/service.middleware/defaultRoutes.js
@@ -136,22 +136,29 @@ var DefaultRoutes = function (_ServiceMiddleware) {
   }, {
     key: '_addStaticRoute',
     value: function _addStaticRoute(service, staticContent, route) {
+      var staticOptions = {};
       if (!_.isArray(staticContent) && _.isObject(staticContent)) {
         var staticRoute = staticContent;
 
-        if (staticRoute.hasOwnProperty('from') && staticRoute.hasOwnProperty('to')) {
+        if (staticRoute.hasOwnProperty('from')) {
           staticContent = staticRoute.from;
+        }
+        if (staticRoute.hasOwnProperty('to')) {
           route = staticRoute.to;
-        } else {
-          if (staticRoute.hasOwnProperty('root')) {
-            service.directory.service = staticRoute.root;
-          }
-          if (staticRoute.hasOwnProperty('cache')) {
-            // TODO
-          }
-          if (staticRoute.hasOwnProperty('list')) {
-            staticContent = staticRoute.list;
-          }
+        }
+        if (staticRoute.hasOwnProperty('root')) {
+          service.directory.service = staticRoute.root;
+        }
+        if (staticRoute.hasOwnProperty('cache')) {}
+        // TODO
+
+        // this oversides "from"
+        if (staticRoute.hasOwnProperty('list')) {
+          staticContent = staticRoute.list;
+        }
+
+        if (staticRoute.hasOwnProperty('options') && _.isObject(staticRoute.options)) {
+          staticOptions = staticRoute.options;
         }
       }
 
@@ -177,7 +184,7 @@ var DefaultRoutes = function (_ServiceMiddleware) {
               // logger.log("Adding Static Dir Content -", staticContent);
               logger.log('Static Dir Route:', staticContent, '->', route || '/');
 
-              this._httpFramework.addStaticDir(staticContent, route);
+              this._httpFramework.addStaticDir(staticContent, route, staticOptions);
               return true;
             } else {
               // logger.log("Adding Static File -", staticContent);

diff --git a/lib/http.framework.express.js b/lib/http.framework.express.js
@@ -194,12 +194,12 @@ HttpFrameworkExpress.prototype.addMethodFunction = function (method, middlewareL
   this._app[ method ](routeStr, handler);
 };
 
-HttpFrameworkExpress.prototype.addStaticDir = function (staticDir, staticRoute) {
+HttpFrameworkExpress.prototype.addStaticDir = function (staticDir, staticRoute, staticOptions) {
   if (staticRoute) {
-    return this._app.use(staticRoute, express.static(staticDir));
+    return this._app.use(staticRoute, express.static(staticDir, staticOptions));
   }
   else {
-    return this._app.use(express.static(staticDir));
+    return this._app.use(express.static(staticDir, staticOptions));
   }
 };
 

diff --git a/lib/service.middleware/defaultRoutes.js b/lib/service.middleware/defaultRoutes.js
@@ -94,25 +94,30 @@ class DefaultRoutes extends ServiceMiddleware {
    * @private
    */
   _addStaticRoute (service, staticContent, route) {
+    var staticOptions = {};
     if (!_.isArray(staticContent) &&
       _.isObject(staticContent)) {
       var staticRoute = staticContent;
 
-      if (staticRoute.hasOwnProperty('from') &&
-        staticRoute.hasOwnProperty('to')) {
+      if (staticRoute.hasOwnProperty('from')) {
         staticContent = staticRoute.from;
+      }
+      if (staticRoute.hasOwnProperty('to')) {
         route = staticRoute.to;
       }
-      else {
-        if (staticRoute.hasOwnProperty('root')) {
-          service.directory.service = staticRoute.root;
-        }
-        if (staticRoute.hasOwnProperty('cache')) {
-          // TODO
-        }
-        if (staticRoute.hasOwnProperty('list')) {
-          staticContent = staticRoute.list;
-        }
+      if (staticRoute.hasOwnProperty('root')) {
+        service.directory.service = staticRoute.root;
+      }
+      if (staticRoute.hasOwnProperty('cache')) {
+        // TODO
+      }
+      // this oversides "from"
+      if (staticRoute.hasOwnProperty('list')) {
+        staticContent = staticRoute.list;
+      }
+
+      if (staticRoute.hasOwnProperty('options') && _.isObject(staticRoute.options)) {
+        staticOptions = staticRoute.options;
       }
     }
 
@@ -139,7 +144,7 @@ class DefaultRoutes extends ServiceMiddleware {
             // logger.log("Adding Static Dir Content -", staticContent);
             logger.log('Static Dir Route:', staticContent, '->', route || '/');
 
-            this._httpFramework.addStaticDir(staticContent, route);
+            this._httpFramework.addStaticDir(staticContent, route, staticOptions);
             return true;
           }
           else {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hyper.io",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "MicroServices so fast they've gone plaid!",
   "homepage": "https://github.com/jstty/hyper.io#readme",
   "keywords": [