Kouhei Sutou
null+****@clear*****
Tue Jul 23 22:16:12 JST 2013
Kouhei Sutou 2013-07-23 22:16:12 +0900 (Tue, 23 Jul 2013) New Revision: 696dc8375ba65de61538bcdff0c0332bea051f3f https://github.com/groonga/express-droonga/commit/696dc8375ba65de61538bcdff0c0332bea051f3f Message: model: rename droonga client -> droonga cluster request converer key toBackend -> requestConverter Modified files: lib/adapter/api/groonga.js lib/adapter/api/model.js lib/adapter/api/rest.js lib/adapter/http.js lib/adapter/socket.io.js test/adapter/rest.test.js test/adapter/socket.io.test.js test/express-adapter.test.js Modified: lib/adapter/api/groonga.js (+1 -1) =================================================================== --- lib/adapter/api/groonga.js 2013-07-23 22:13:31 +0900 (9e93bfc) +++ lib/adapter/api/groonga.js 2013-07-23 22:16:12 +0900 (f7dbf3b) @@ -3,7 +3,7 @@ var model = require('./model'); module.exports = { 'groonga': new model.HTTPCommand({ path: '/d/:commandName', - toBackend: function(commandName, request) { + requestConverter: function(commandName, request) { return [request.params.commandName, request.query]; } }) Modified: lib/adapter/api/model.js (+3 -3) =================================================================== --- lib/adapter/api/model.js 2013-07-23 22:13:31 +0900 (88b44c6) +++ lib/adapter/api/model.js 2013-07-23 22:16:12 +0900 (8d4d300) @@ -3,8 +3,8 @@ function CommandModel(options) { this._modelTypes = []; } CommandModel.prototype = { - get toBackend() { - return this._options.toBackend; + get requestConverter() { + return this._options.requestConverter; }, get responseConverter() { return this._options.responseConverter; @@ -42,7 +42,7 @@ function HTTPCommand(options) { RequestResponse.apply(this, arguments); this._modelTypes.push(HTTPCommand); // default handler - this._options.toBackend = this._options.toBackend || function(event, request) { + this._options.requestConverter = this._options.requestConverter || function(event, request) { return [event, {}]; }; } Modified: lib/adapter/api/rest.js (+8 -8) =================================================================== --- lib/adapter/api/rest.js 2013-07-23 22:13:31 +0900 (1e2cf2a) +++ lib/adapter/api/rest.js 2013-07-23 22:16:12 +0900 (79337a0) @@ -4,42 +4,42 @@ var requestBuilders = require('./rest-request-builder'); module.exports = { // 'status': new model.HTTPCommand({ // path: '/status/:target', -// toBackend: requestBuilders.status +// requestConverter: requestBuilders.status // }), 'search': new model.HTTPCommand({ path: '/tables/:tableName', - toBackend: function(event, request) { + requestConverter: function(event, request) { return [event, requestBuilders.search(request)]; } }) //, // 'createtable': new model.HTTPCommand({ // method: 'PUT', // path: '/tables/:tableName', -// toBackend: requestBuilders.createTable +// requestConverter: requestBuilders.createTable // }), // 'removetable': new model.HTTPCommand({ // method: 'DELETE', // path: '/tables/:tableName', -// toBackend: requestBuilders.removeTable +// requestConverter: requestBuilders.removeTable // }), // 'createcolumn': new model.HTTPCommand({ // method: 'PUT', // path: '/tables/:tableName/columns/:columnName', -// toBackend: requestBuilders.createColumn +// requestConverter: requestBuilders.createColumn // }), // 'removecolumn': new model.HTTPCommand({ // method: 'DELETE', // path: '/tables/:tableName/columns/:columnName', -// toBackend: requestBuilders.removeColumn +// requestConverter: requestBuilders.removeColumn // }), // 'loadrecord': new model.HTTPCommand({ // method: 'PUT', // path: '/tables/:tableName/records/:key', -// toBackend: requestBuilders.loadRecord +// requestConverter: requestBuilders.loadRecord // }), // 'loadrecords': new model.HTTPCommand({ // method: 'PUT', // path: '/tables/:tableName/records', -// toBackend: requestBuilders.loadRecords +// requestConverter: requestBuilders.loadRecords // }) }; Modified: lib/adapter/http.js (+2 -2) =================================================================== --- lib/adapter/http.js 2013-07-23 22:13:31 +0900 (4fe2ba0) +++ lib/adapter/http.js 2013-07-23 22:16:12 +0900 (6331dcb) @@ -10,13 +10,13 @@ function createHandler(params) { var commandName = params.name; var definition = params.definition; - if (!definition.toBackend) + if (!definition.requestConverter) throw new Error('no filter for the backend: ' + commandName); return (function(request, response) { debug('adapter.http.createHandler.handle'); - var result = definition.toBackend(commandName, request); + var result = definition.requestConverter(commandName, request); var messageType = result[0]; var body = result[1]; var timeout = body.timeout || null; Modified: lib/adapter/socket.io.js (+2 -2) =================================================================== --- lib/adapter/socket.io.js 2013-07-23 22:13:31 +0900 (5d4c99a) +++ lib/adapter/socket.io.js 2013-07-23 22:16:12 +0900 (4488230) @@ -41,9 +41,9 @@ exports.register = function(application, server, params) { clientOptions = clientOptions || {}; var event = commandName; - if (commandDefinition.toBackend) { + if (commandDefinition.requestConverter) { try { - var result = commandDefinition.toBackend(event, data); + var result = commandDefinition.requestConverter(event, data); event = result[0]; data = result[1]; } catch(error) { Modified: test/adapter/rest.test.js (+1 -1) =================================================================== --- test/adapter/rest.test.js 2013-07-23 22:13:31 +0900 (5eddffe) +++ test/adapter/rest.test.js 2013-07-23 22:16:12 +0900 (df53cd9) @@ -76,7 +76,7 @@ suite('HTTP Adapter', function() { var testPlugin = { adapter: new model.HTTPCommand({ path: '/path/to/adapter', - toBackend: function(event, request) { return [event, 'adapter requested']; }, + requestConverter: function(event, request) { return [event, 'adapter requested']; }, responseConverter: function(event, data) { return [event, 'adapter OK']; } }) }; Modified: test/adapter/socket.io.test.js (+4 -4) =================================================================== --- test/adapter/socket.io.test.js 2013-07-23 22:13:31 +0900 (909881c) +++ test/adapter/socket.io.test.js 2013-07-23 22:16:12 +0900 (8761562) @@ -18,20 +18,20 @@ suite('Socket.IO Adapter', function() { var testPlugin = { 'reqrep': new model.SocketRequestResponse(), 'reqrep-mod-event': new model.SocketRequestResponse({ - toBackend: function(event, data) { return [event + '.mod', data]; }, + requestConverter: function(event, data) { return [event + '.mod', data]; }, responseConverter: function(event, data) { return [event + '.mod', data]; } }), 'reqrep-mod-body': new model.SocketRequestResponse({ - toBackend: function(event, data) { return [event, 'modified request']; }, + requestConverter: function(event, data) { return [event, 'modified request']; }, responseConverter: function(event, data) { return [event, 'modified response']; } }), 'pubsub': new model.SocketPublishSubscribe(), 'pubsub-mod-event': new model.SocketPublishSubscribe({ - toBackend: function(event, data) { return [event + '.mod', data]; }, + requestConverter: function(event, data) { return [event + '.mod', data]; }, responseConverter: function(event, data) { return [event + '.mod', data]; } }), 'pubsub-mod-body': new model.SocketPublishSubscribe({ - toBackend: function(event, data) { return [event, 'modified request']; }, + requestConverter: function(event, data) { return [event, 'modified request']; }, responseConverter: function(event, data) { return [event, 'modified response']; } }) }; Modified: test/express-adapter.test.js (+2 -2) =================================================================== --- test/express-adapter.test.js 2013-07-23 22:13:31 +0900 (61f7cff) +++ test/express-adapter.test.js 2013-07-23 22:16:12 +0900 (fe67f3c) @@ -12,13 +12,13 @@ suite('Adaption for express application', function() { var testRestPlugin = { api: new model.HTTPCommand({ path: '/path/to/api', - toBackend: function(event, request) { return [event, 'api requested']; }, + requestConverter: function(event, request) { return [event, 'api requested']; }, responseConverter: function(event, data) { return [event, 'api OK']; } }) }; var testSocketPlugin = { api: new model.SocketRequestResponse({ - toBackend: function(event, data) { return [event, 'api requested']; }, + requestConverter: function(event, data) { return [event, 'api requested']; }, responseConverter: function(event, data) { return [event, 'api OK']; } }) }; -------------- next part -------------- HTML����������������������������...Download