Fix plugins loading

3 files changed, 11 insertions, 11 deletions

diff --git a/lib/plugins/loadForBook.js b/lib/plugins/loadForBook.js
index fcfac08..9494696 100644
--- a/lib/plugins/loadForBook.js
+++ b/lib/plugins/loadForBook.js
@@ -1,7 +1,7 @@
 var Promise = require('../utils/promise');
 
 var listForBook = require('./listForBook');
-var listInstalledForBook = require('./listInstalledForBook');
+var findForBook = require('./findForBook');
 var loadPlugin = require('./loadPlugin');
 
 
@@ -14,9 +14,9 @@ var loadPlugin = require('./loadPlugin');
 function loadForBook(book) {
     var logger = book.getLogger();
     var requirements = listForBook(book);
-    var requirementsKeys = requirements.keys().toList();
+    var requirementsKeys = requirements.keySeq().toList();
 
-    return listInstalledForBook(book)
+    return findForBook(book)
     .then(function(installed) {
         // Filter out plugins not listed of first level
         // (aka pre-installed plugins)
@@ -48,7 +48,7 @@ function loadForBook(book) {
         }
 
         return Promise.map(installed, function(plugin) {
-            return loadPlugin(plugin);
+            return loadPlugin(book, plugin);
         });
     });
 }
diff --git a/lib/plugins/loadPlugin.js b/lib/plugins/loadPlugin.js
index 375329e..39e2e33 100644
--- a/lib/plugins/loadPlugin.js
+++ b/lib/plugins/loadPlugin.js
@@ -26,7 +26,6 @@ function loadPlugin(book, plugin) {
     var name = plugin.getName();
     var pkgPath = plugin.getPath();
 
-
     // Try loading plugins from different location
     var p = Promise()
     .then(function() {
diff --git a/lib/plugins/validatePlugin.js b/lib/plugins/validatePlugin.js
index 37f6900..4baa911 100644
--- a/lib/plugins/validatePlugin.js
+++ b/lib/plugins/validatePlugin.js
@@ -14,20 +14,21 @@ function validatePlugin(plugin) {
     var isValid = (
         plugin.isLoaded() &&
         packageInfos &&
-        packageInfos.name &&
-        packageInfos.engines &&
-        packageInfos.engines.gitbook
+        packageInfos.get('name') &&
+        packageInfos.get('engines') &&
+        packageInfos.get('engines').get('gitbook')
     );
 
     if (!isValid) {
         return Promise.reject(new Error('Error loading plugin "' + plugin.getName() + '" at "' + plugin.getPath() + '"'));
     }
 
-    if (!gitbook.satisfies(this.packageInfos.engines.gitbook)) {
-        return Promise.reject(new Error('GitBook doesn\'t satisfy the requirements of this plugin: ' + packageInfos.engines.gitbook));
+    var engine = packageInfos.get('engines').get('gitbook');
+    if (!gitbook.satisfies(engine)) {
+        return Promise.reject(new Error('GitBook doesn\'t satisfy the requirements of this plugin: ' + engine));
     }
 
-    return Promise();
+    return Promise(plugin);
 }
 
 module.exports = validatePlugin;