work over default options management

I've adjusted the hooks to always consider the options from feathers config as well.

The unit test got an empty app dummy because the hooks now always require a valid app.

Author: SassNinja

src/hooks/cache.js

@@ -1,14 +1,17 @@
 /**
  * After hook - generates a cache object that is needed
  * for the redis hook and the express middelware.
- * @todo add default value in config file
  */
-const defaults = {};
+const defaults = {
+  defaultDuration: 3600 * 24
+};
 
 export function cache(options) { // eslint-disable-line no-unused-vars
-  options = Object.assign({}, defaults, options);
-
   return function (hook) {
+    const cacheOptions = hook.app.get('redisCache');
+
+    options = Object.assign({}, defaults, cacheOptions, options);
+
     if (!hook.result.hasOwnProperty('cache')) {
       let cache = {};
 
@@ -21,7 +24,7 @@ export function cache(options) { // eslint-disable-line no-unused-vars
 
       cache = Object.assign({}, cache, {
         cached: false,
-        duration: options.duration || 3600 * 24
+        duration: options.duration || options.defaultDuration
       });
 
       hook.result.cache = cache;
@@ -31,8 +34,6 @@ export function cache(options) { // eslint-disable-line no-unused-vars
 };
 
 export function removeCacheInformation(options) { // eslint-disable-line no-unused-vars
-  options = Object.assign({}, defaults, options);
-
   return function (hook) {
     if (hook.result.hasOwnProperty('cache')) {
       delete hook.result.cache;

src/hooks/redis.js

@@ -2,17 +2,20 @@ import moment from 'moment';
 import chalk from 'chalk';
 import { parsePath } from './helpers/path';
 
-const defaults = {};
+const defaults = {
+  env: 'production',
+  defaultDuration: 3600 * 24
+};
 
 export function before(options) { // eslint-disable-line no-unused-vars
-  options = Object.assign({}, defaults, options);
-
   return function (hook) {
+    const cacheOptions = hook.app.get('redisCache');
+
+    options = Object.assign({}, defaults, cacheOptions, options);
+
     return new Promise(resolve => {
       const client = hook.app.get('redisClient');
-      const cacheOptions = hook.app.get('redisCache');
-      const env = cacheOptions.env || 'production';
-      const path = parsePath(hook, cacheOptions);
+      const path = parsePath(hook, options);
 
       client.get(path, (err, reply) => {
         if (err !== null) resolve(hook);
@@ -24,7 +27,7 @@ export function before(options) { // eslint-disable-line no-unused-vars
           resolve(hook);
 
           /* istanbul ignore next */
-          if (env !== 'test') {
+          if (options.env !== 'test') {
             console.log(`${chalk.cyan('[redis]')} returning cached value for ${chalk.green(path)}.`);
             console.log(`> Expires on ${duration}.`);
           }
@@ -37,17 +40,16 @@ export function before(options) { // eslint-disable-line no-unused-vars
 };
 
 export function after(options) { // eslint-disable-line no-unused-vars
-  options = Object.assign({}, defaults, options);
-
   return function (hook) {
+    const cacheOptions = hook.app.get('redisCache');
+
+    options = Object.assign({}, defaults, cacheOptions, options);
+
     return new Promise(resolve => {
       if (!hook.result.cache.cached) {
-        const cacheOptions = hook.app.get('redisCache');
-        const env = cacheOptions.env || 'production';
-        const cachingDefault = cacheOptions.defaultDuration ? cacheOptions.defaultDuration : 3600 * 24;
-        const duration = hook.result.cache.duration || cachingDefault;
+        const duration = hook.result.cache.duration || options.defaultDuration;
         const client = hook.app.get('redisClient');
-        const path = parsePath(hook, cacheOptions);
+        const path = parsePath(hook, options);
 
         // adding a cache object
         Object.assign(hook.result.cache, {
@@ -66,7 +68,7 @@ export function after(options) { // eslint-disable-line no-unused-vars
         }
 
         /* istanbul ignore next */
-        if (env !== 'test') {
+        if (options.env !== 'test') {
           console.log(`${chalk.cyan('[redis]')} added ${chalk.green(path)} to the cache.`);
           console.log(`> Expires in ${moment.duration(duration, 'seconds').humanize()}.`);
         }

test/cache.test.js

@@ -1,10 +1,15 @@
 import { expect } from 'chai';
 import { hookCache } from '../src';
 
+const app = {
+  get: () => ({})
+};
+
 describe('Cache Hook', () => {
   it('adds a cache object', () => {
     const hook = hookCache();
     const mock = {
+      app: app,
       params: { query: ''},
       path: 'test-route',
       result: {
@@ -29,6 +34,7 @@ describe('Cache Hook', () => {
   it('does not modify the existing cache object', () => {
     const hook = hookCache();
     const mock = {
+      app: app,
       params: { query: ''},
       path: 'test-route',
       result: {
@@ -52,6 +58,7 @@ describe('Cache Hook', () => {
   it('wraps arrays', () => {
     const hook = hookCache();
     const mock = {
+      app: app,
       params: { query: ''},
       path: 'test-route-array',
       result: [