Use promisify-any module's .generators() method

overlookmotel · Jul 18, 2015 · a1efa8f · a1efa8f
1 parent 344ded4
commit a1efa8f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/changelog.md b/changelog.md
@@ -4,3 +4,4 @@
 
 * Initial code
 * Update dependencies
+* Use `promisify-any` module's `.generators()` method
diff --git a/lib/overlook.js b/lib/overlook.js
@@ -21,7 +21,7 @@ var Utils = require('./utils'),
     _ = Utils._;
 
 // exports
-module.exports = Utils.promisifyGenerators({
+module.exports = promisifyAny.generators({
     init: function(options) {
         // conform options
         if (!options) {
@@ -172,7 +172,7 @@ module.exports = Utils.promisifyGenerators({
             hooks: {
                 routeBeforePath: function(route) {
                     // co-wrap all generators
-                    Utils.promisifyGenerators(route);
+                    promisifyAny.generators(route);
 
                     // add reference to overlook to route
                     route.overlook = overlook;
@@ -188,7 +188,7 @@ module.exports = Utils.promisifyGenerators({
                     });
 
                     // co-wrap all generators
-                    Utils.promisifyGenerators(action);
+                    promisifyAny.generators(action);
 
                     // add reference to overlook to action
                     action.overlook = overlook;
@@ -212,7 +212,7 @@ module.exports = Utils.promisifyGenerators({
                 });
 
                 // co-wrap all generators
-                Utils.promisifyGenerators(action);
+                promisifyAny.generators(action);
 
                 // run init function on action
                 if (action.init) yield action.init();

diff --git a/lib/plugin.js b/lib/plugin.js
@@ -26,5 +26,5 @@ var Plugin = module.exports = function(name, params) {
 
     // promisify start function and promisify generators
     this.start = promisifyAny(this.start, 1);
-    Utils.promisifyGenerators(this);
+    promisifyAny.generators(this);
 };
diff --git a/lib/utils.js b/lib/utils.js
@@ -7,19 +7,12 @@
 var Promise = require('bluebird'),
     co = require('co-bluebird'),
     coSeries = require('co-series'),
-    isGeneratorFn = require('is-generator').fn,
     _ = require('lodash');
 
 // exports
 var Utils = module.exports = {
     _: _,
     Promise: Promise,
     co: co,
-    coSeries: coSeries,
-    promisifyGenerators: function(obj) {
-        Utils._.forIn(obj, function(fn, fnName) {
-            if (isGeneratorFn(fn)) obj[fnName] = Utils.co.wrap(fn);
-        });
-        return obj;
-    }
+    coSeries: coSeries
 };
diff --git a/package.json b/package.json
@@ -21,9 +21,8 @@
     "express": "^4.13.0",
     "expressor": "^2.1.1",
     "fs-extra-promise": "^0.2.0",
-    "is-generator": "^1.0.2",
     "lodash": "^3.10.0",
-    "promisify-any": "^1.0.0",
+    "promisify-any": "^1.1.1",
     "require-folder-tree": "^1.4.5",
     "walk-folder-tree": "^1.0.0"
   },