droonga/express-droonga at a002886 [master] Don't mount builtin commands by default (Groonga-commit) - Groonga - fulltext search engine.

YUKI Hiroshi	2013-10-16 18:34:37 +0900 (Wed, 16 Oct 2013)

  New Revision: a002886c04b9a312781dc0eea67ce33493c83e19
  https://github.com/droonga/express-droonga/commit/a002886c04b9a312781dc0eea67ce33493c83e19

  Message:
    Don't mount builtin commands by default

  Modified files:
    application.js
    lib/adapter/http.js
    lib/adapter/socket.io.js

  Modified: application.js (+12 -1)
===================================================================

--- application.js    2013-10-16 17:52:32 +0900 (bf47d1e)
+++ application.js    2013-10-16 18:34:37 +0900 (a880996)
@@ -4,12 +4,23 @@ var express = require('express'),
     droonga = require('./index'),
     http = require('http');
 
+var builtInRestAPI = require('./lib/adapter/api/rest');
+var builtInSocketIoAPI = require('./lib/adapter/api/socket.io');
+var builtInGroongaAPI = require('./lib/adapter/api/groonga');
+var builtInDroongaAPI = require('./lib/adapter/api/droonga');
+
 var application = express();
 var server = http.createServer(application);
 application.droonga({
   prefix: '',
   defaultDataset: 'example',
-  server: server
+  server: server,
+  plugins: [
+    builtInRestAPI,
+    builtInSocketIoAPI,
+    builtInGroongaAPI,
+    builtInDroongaAPI
+  ]
 });
 
 server.listen(13000);

  Modified: lib/adapter/http.js (+4 -4)
===================================================================
--- lib/adapter/http.js    2013-10-16 17:52:32 +0900 (fe8bf8b)
+++ lib/adapter/http.js    2013-10-16 18:34:37 +0900 (8ee07fa)
@@ -2,9 +2,6 @@ var debug = require('../debug');
 
 var command = require('./command');
 var wrapper = require('./wrapper');
-var restAPI = require('./api/rest');
-var droongaAPI = require('./api/droonga');
-var groongaAPI = require('./api/groonga');
 
 function createHandler(params) {
   params = params || {};
@@ -72,7 +69,10 @@ exports.register = function(application, params) {
   var prefix = params.prefix || '';
   prefix = prefix.replace(/\/$/, '');
 
-  var commandSets = [restAPI, droongaAPI, groongaAPI].concat(params.plugins || []);
+  var commandSets = params.plugins || [];
+  if (!Array.isArray(commandSets))
+    commandSets = [commandSets];
+
   var unifiedCommandSet = {};
   commandSets.forEach(function(commandSet) {
     Object.keys(commandSet).forEach(function(commandName) {

  Modified: lib/adapter/socket.io.js (+4 -2)
===================================================================
--- lib/adapter/socket.io.js    2013-10-16 17:52:32 +0900 (4e2d4a8)
+++ lib/adapter/socket.io.js    2013-10-16 18:34:37 +0900 (39c240d)
@@ -1,7 +1,6 @@
 var socketIo = require('socket.io');
 var command = require('./command');
 var wrapper = require('./wrapper');
-var defaultAPI = require('./api/socket.io');
 
 var DEFAULT_TIMEOUT = 10 * 1000;
 
@@ -132,7 +131,10 @@ exports.register = function(application, server, params) {
     });
   }
 
-  var commandSets = [defaultAPI].concat(params.plugins || []);
+  var commandSets = params.plugins || [];
+  if (!Array.isArray(commandSets))
+    commandSets = [commandSets];
+  
   var unifiedCommandSet = {};
   commandSets.forEach(function(commandSet) {
     Object.keys(commandSet).forEach(function(commandName) {
-------------- next part --------------
HTML����������������������������...
下載 


Groonga - fulltext search engine.

[Groonga-commit] droonga/express-droonga at a002886 [master] Don't mount builtin commands by default