Kouhei Sutou
null+****@clear*****
Sun Jul 21 22:40:19 JST 2013
Kouhei Sutou 2013-07-21 22:40:19 +0900 (Sun, 21 Jul 2013) New Revision: da361395e7ab6d6271ffb4d959ef8d48c7cd5655 https://github.com/groonga/express-droonga/commit/da361395e7ab6d6271ffb4d959ef8d48c7cd5655 Message: Move lib/frontend/XXX-adaptor.js to lib/frontend/api/XXX.js There were two types in frontend, XXX-adaptor.js and XXX-handler.js. I rename "adaptor" to "API" because REST is used as "REST API" not "REST adaptor". lib/frontend/XXX-adaptor.js -> lib/frontend/api/XXX.js lib/frontend/default-commands/ -> lib/frontend/api/default-commands/ test/frontend/ -> test/frontend/api/ Modified files: index.js test/rest-request-builder.test.js Renamed files: lib/frontend/api/default-commands/rest-request-builder.js (from lib/frontend/default-commands/rest-request-builder.js) lib/frontend/api/default-commands/rest.js (from lib/frontend/default-commands/rest.js) lib/frontend/api/default-commands/socket.io.js (from lib/frontend/default-commands/socket.io.js) lib/frontend/api/rest.js (from lib/frontend/rest-adaptor.js) lib/frontend/api/socket.io.js (from lib/frontend/socket.io-adaptor.js) test/frontend/api/rest.test.js (from test/frontend/rest-adaptor.test.js) test/frontend/api/socket.io.test.js (from test/frontend/socket.io-adaptor.test.js) Modified: index.js (+4 -4) =================================================================== --- index.js 2013-07-21 22:30:29 +0900 (68d545b) +++ index.js 2013-07-21 22:40:19 +0900 (20bbd92) @@ -1,7 +1,7 @@ var express = require('express'); var Connection = require('./lib/backend/connection').Connection; -var restAdaptor = require('./lib/frontend/rest-adaptor'); -var socketIoAdaptor = require('./lib/frontend/socket.io-adaptor'); +var restAPI = require('./lib/frontend/api/rest'); +var socketIoAPI = require('./lib/frontend/api/socket.io'); var dashboardHandler = require('./lib/frontend/dashboard-handler'); express.application.droonga = function(params) { @@ -13,10 +13,10 @@ express.application.droonga = function(params) { params.prefix = params.prefix || ''; params.prefix = params.prefix.replace(/\/$/, ''); - restAdaptor.register(this, params); + restAPI.register(this, params); if (params.server) { - socketIoAdaptor.register(this, params.server, params); + socketIoAPI.register(this, params.server, params); params.server.on('close', function() { // The connection can be mocked/stubbed. We don't need to close // such a fake connection. Renamed: lib/frontend/api/default-commands/rest-request-builder.js (+0 -0) 100% =================================================================== Renamed: lib/frontend/api/default-commands/rest.js (+1 -1) 97% =================================================================== --- lib/frontend/default-commands/rest.js 2013-07-21 22:30:29 +0900 (30a003e) +++ lib/frontend/api/default-commands/rest.js 2013-07-21 22:40:19 +0900 (34f0bf4) @@ -1,4 +1,4 @@ -var model = require('../../model'); +var model = require('../../../model'); var requestBuilders = require('./rest-request-builder'); module.exports = { Renamed: lib/frontend/api/default-commands/socket.io.js (+1 -1) 85% =================================================================== --- lib/frontend/default-commands/socket.io.js 2013-07-21 22:30:29 +0900 (104795f) +++ lib/frontend/api/default-commands/socket.io.js 2013-07-21 22:40:19 +0900 (580250b) @@ -1,4 +1,4 @@ -var model = require('../../model'); +var model = require('../../../model'); module.exports = { // 'status': {}, Renamed: lib/frontend/api/rest.js (+2 -2) 97% =================================================================== --- lib/frontend/rest-adaptor.js 2013-07-21 22:30:29 +0900 (a678f1c) +++ lib/frontend/api/rest.js 2013-07-21 22:40:19 +0900 (df3ffc1) @@ -1,6 +1,6 @@ -var debug = require('../debug'); +var debug = require('../../debug'); -var model = require('../model'); +var model = require('../../model'); var defaultCommands = require('./default-commands/rest'); function createHandler(params) { Renamed: lib/frontend/api/socket.io.js (+1 -1) 99% =================================================================== --- lib/frontend/socket.io-adaptor.js 2013-07-21 22:30:29 +0900 (0633bad) +++ lib/frontend/api/socket.io.js 2013-07-21 22:40:19 +0900 (8f5c1dc) @@ -1,5 +1,5 @@ var socketIo = require('socket.io'); -var model = require('../model'); +var model = require('../../model'); var defaultCommands = require('./default-commands/socket.io'); var DEFAULT_TIMEOUT = 10 * 1000; Renamed: test/frontend/api/rest.test.js (+8 -8) 93% =================================================================== --- test/frontend/rest-adaptor.test.js 2013-07-21 22:30:29 +0900 (4b1c6b8) +++ test/frontend/api/rest.test.js 2013-07-21 22:40:19 +0900 (e6e6a9f) @@ -2,12 +2,12 @@ var assert = require('chai').assert; var nodemock = require('nodemock'); var Deferred = require('jsdeferred').Deferred; -var utils = require('../test-utils'); +var utils = require('../../test-utils'); var express = require('express'); -var restAdaptor = require('../../lib/frontend/rest-adaptor'); -var model = require('../../lib/model'); -var restCommands = require('../../lib/frontend/default-commands/rest'); +var restAPI = require('../../../lib/frontend/api/rest'); +var model = require('../../../lib/model'); +var restCommands = require('../../../lib/frontend/api/default-commands/rest'); suite('REST API', function() { test('registeration of plugin commands', function() { @@ -41,7 +41,7 @@ suite('REST API', function() { }; var application = express(); - var registeredCommands = restAdaptor.register(application, { + var registeredCommands = restAPI.register(application, { prefix: '', connection: utils.createStubbedBackendConnection(), plugins: [ @@ -101,7 +101,7 @@ suite('REST API', function() { }); test('to the document root', function(done) { - restAdaptor.register(application, { + restAPI.register(application, { prefix: '', connection: connection, plugins: [testPlugin] @@ -130,7 +130,7 @@ suite('REST API', function() { }); test('under specified path', function(done) { - restAdaptor.register(application, { + restAPI.register(application, { prefix: '/path/to/droonga', connection: connection, plugins: [testPlugin] @@ -173,7 +173,7 @@ suite('REST API', function() { var receiverCallback = {}; var connection = utils.createStubbedBackendConnection(); var application = express(); - restAdaptor.register(application, { + restAPI.register(application, { prefix: '', connection: connection }); Renamed: test/frontend/api/socket.io.test.js (+12 -11) 95% =================================================================== --- test/frontend/socket.io-adaptor.test.js 2013-07-21 22:30:29 +0900 (1cd9d0d) +++ test/frontend/api/socket.io.test.js 2013-07-21 22:40:19 +0900 (4593b6e) @@ -3,11 +3,12 @@ var nodemock = require('nodemock'); var Deferred = require('jsdeferred').Deferred; var express = require('express'); -var utils = require('../test-utils'); +var utils = require('../../test-utils'); -var socketIoAdaptor = require('../../lib/frontend/socket.io-adaptor'); -var model = require('../../lib/model'); -var scoketIoCommands = require('../../lib/frontend/default-commands/socket.io'); +var socketIoAPI = require('../../../lib/frontend/api/socket.io'); +var model = require('../../../lib/model'); +var scoketIoCommands = + require('../../../lib/frontend/api/default-commands/socket.io'); suite('Socket.IO API', function() { var connection; @@ -69,7 +70,7 @@ suite('Socket.IO API', function() { .next(function(newServer) { server = newServer; - var registeredCommands = socketIoAdaptor.register(application, server, { + var registeredCommands = socketIoAPI.register(application, server, { connection: utils.createStubbedBackendConnection(), plugins: [ basePlugin, @@ -113,7 +114,7 @@ suite('Socket.IO API', function() { utils.setupServer(application) .next(function(newServer) { server = newServer; - socketIoAdaptor.register(application, server, { + socketIoAPI.register(application, server, { connection: utils.createStubbedBackendConnection(), plugins: [testPlugin] }); @@ -142,7 +143,7 @@ suite('Socket.IO API', function() { server = result.server; connection = result.connection; backend = result.backend; - socketIoAdaptor.register(result.application, server, { + socketIoAPI.register(result.application, server, { tag: utils.testTag, connection: connection, plugins: [testPlugin] @@ -228,7 +229,7 @@ suite('Socket.IO API', function() { server = result.server; connection = result.connection; backend = result.backend; - socketIoAdaptor.register(result.application, server, { + socketIoAPI.register(result.application, server, { tag: utils.testTag, connection: connection, plugins: [testPlugin] @@ -302,7 +303,7 @@ suite('Socket.IO API', function() { server = result.server; connection = result.connection; backend = result.backend; - socketIoAdaptor.register(result.application, server, { + socketIoAPI.register(result.application, server, { tag: utils.testTag, connection: connection, plugins: [testPlugin] @@ -349,7 +350,7 @@ suite('Socket.IO API', function() { server = result.server; connection = result.connection; backend = result.backend; - socketIoAdaptor.register(result.application, server, { + socketIoAPI.register(result.application, server, { tag: utils.testTag, connection: connection, plugins: [testPlugin] @@ -430,7 +431,7 @@ suite('Socket.IO API', function() { server = result.server; connection = result.connection; backend = result.backend; - socketIoAdaptor.register(result.application, server, { + socketIoAPI.register(result.application, server, { tag: utils.testTag, connection: connection, plugins: [testPlugin] Modified: test/rest-request-builder.test.js (+2 -1) =================================================================== --- test/rest-request-builder.test.js 2013-07-21 22:30:29 +0900 (9a90782) +++ test/rest-request-builder.test.js 2013-07-21 22:40:19 +0900 (9626f8a) @@ -2,7 +2,8 @@ var assert = require('chai').assert; var utils = require('./test-utils'); -var builders = require('../lib/frontend/default-commands/rest-request-builder'); +var builders = + require('../lib/frontend/api/default-commands/rest-request-builder'); suite('building message from REST API request', function() { suite('search', function() { -------------- next part -------------- HTML����������������������������...Download