Kouhei Sutou
null+****@clear*****
Mon Jul 22 23:04:09 JST 2013
Kouhei Sutou 2013-07-22 23:04:09 +0900 (Mon, 22 Jul 2013) New Revision: 56e6b47ae81bfe6056582b122ba49ce2286d975a https://github.com/groonga/express-droonga/commit/56e6b47ae81bfe6056582b122ba49ce2286d975a Message: default-commands/ -> api/ Because "REST" is "API". Modified files: lib/adapter/http.js lib/adapter/socket.io.js test/adapter/rest.test.js test/adapter/socket.io.test.js test/rest-request-builder.test.js Renamed files: lib/adapter/api/rest-request-builder.js (from lib/adapter/default-commands/rest-request-builder.js) lib/adapter/api/rest.js (from lib/adapter/default-commands/rest.js) lib/adapter/api/socket.io.js (from lib/adapter/default-commands/socket.io.js) Renamed: lib/adapter/api/rest-request-builder.js (+0 -0) 100% =================================================================== Renamed: lib/adapter/api/rest.js (+0 -0) 100% =================================================================== Renamed: lib/adapter/api/socket.io.js (+0 -0) 100% =================================================================== Modified: lib/adapter/http.js (+2 -2) =================================================================== --- lib/adapter/http.js 2013-07-22 22:58:31 +0900 (a678f1c) +++ lib/adapter/http.js 2013-07-22 23:04:09 +0900 (81e1ad0) @@ -1,7 +1,7 @@ var debug = require('../debug'); var model = require('../model'); -var defaultCommands = require('./default-commands/rest'); +var restAPI = require('./api/rest'); function createHandler(params) { params = params || {}; @@ -65,7 +65,7 @@ exports.register = function(application, params) { var prefix = params.prefix || ''; prefix = prefix.replace(/\/$/, ''); - var commandSets = [defaultCommands].concat(params.plugins || []); + var commandSets = [restAPI].concat(params.plugins || []); var unifiedCommandSet = {}; commandSets.forEach(function(commandSet) { Object.keys(commandSet).forEach(function(commandName) { Modified: lib/adapter/socket.io.js (+2 -2) =================================================================== --- lib/adapter/socket.io.js 2013-07-22 22:58:31 +0900 (0633bad) +++ lib/adapter/socket.io.js 2013-07-22 23:04:09 +0900 (6b623fb) @@ -1,6 +1,6 @@ var socketIo = require('socket.io'); var model = require('../model'); -var defaultCommands = require('./default-commands/socket.io'); +var defaultAPI = require('./api/socket.io'); var DEFAULT_TIMEOUT = 10 * 1000; @@ -108,7 +108,7 @@ exports.register = function(application, server, params) { }); } - var commandSets = [defaultCommands].concat(params.plugins || []); + var commandSets = [defaultAPI].concat(params.plugins || []); var unifiedCommandSet = {}; commandSets.forEach(function(commandSet) { Object.keys(commandSet).forEach(function(commandName) { Modified: test/adapter/rest.test.js (+2 -2) =================================================================== --- test/adapter/rest.test.js 2013-07-22 22:58:31 +0900 (5591c28) +++ test/adapter/rest.test.js 2013-07-22 23:04:09 +0900 (817016a) @@ -7,7 +7,7 @@ var utils = require('../test-utils'); var express = require('express'); var httpAdapter = require('../../lib/adapter/http'); var model = require('../../lib/model'); -var restCommands = require('../../lib/adapter/default-commands/rest'); +var restAPI = require('../../lib/adapter/api/rest'); suite('HTTP Adapter', function() { test('registeration of plugin commands', function() { @@ -58,7 +58,7 @@ suite('HTTP Adapter', function() { }); assert.deepEqual(registeredCommands, [{ name: 'search', - definition: restCommands.search }, + definition: restAPI.search }, { name: 'getCommand', definition: basePlugin.getCommand }, { name: 'putCommand', Modified: test/adapter/socket.io.test.js (+3 -3) =================================================================== --- test/adapter/socket.io.test.js 2013-07-22 22:58:31 +0900 (19247be) +++ test/adapter/socket.io.test.js 2013-07-22 23:04:09 +0900 (6bb8daf) @@ -7,8 +7,8 @@ var utils = require('../test-utils'); var socketIoAdapter = require('../../lib/adapter/socket.io'); var model = require('../../lib/model'); -var scoketIoCommands = - require('../../lib/adapter/default-commands/socket.io'); +var scoketIoAPI = + require('../../lib/adapter/api/socket.io'); suite('Socket.IO Adapter', function() { var connection; @@ -86,7 +86,7 @@ suite('Socket.IO Adapter', function() { }); assert.deepEqual(registeredCommands, [{ name: 'search', - definition: scoketIoCommands.search }, + definition: scoketIoAPI.search }, { name: 'getCommand', definition: basePlugin.getCommand }, { name: 'putCommand', Modified: test/rest-request-builder.test.js (+1 -2) =================================================================== --- test/rest-request-builder.test.js 2013-07-22 22:58:31 +0900 (b9509fd) +++ test/rest-request-builder.test.js 2013-07-22 23:04:09 +0900 (b9922ab) @@ -2,8 +2,7 @@ var assert = require('chai').assert; var utils = require('./test-utils'); -var builders = - require('../lib/adapter/default-commands/rest-request-builder'); +var builders = require('../lib/adapter/api/rest-request-builder'); suite('building message from REST adapter request', function() { suite('search', function() { -------------- next part -------------- HTML����������������������������...Download