Kouhei Sutou
null+****@clear*****
Tue Jul 23 22:13:31 JST 2013
Kouhei Sutou 2013-07-23 22:13:31 +0900 (Tue, 23 Jul 2013) New Revision: 26f288a232a22d9530eeb950bec6e6baec50bf64 https://github.com/groonga/express-droonga/commit/26f288a232a22d9530eeb950bec6e6baec50bf64 Message: model: rename droonga cluster -> droonga client converer key There are two clients in model context, droonga protocol client and HTTP/Socket.IO client. I want to use "client" word as "droonga protocol client" in the context. So I rename "client" in "toClient". toClient -> responseConverter toBackend will also be renamed. Modified files: lib/adapter/api/model.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/model.js (+2 -2) =================================================================== --- lib/adapter/api/model.js 2013-07-22 23:48:19 +0900 (7f38255) +++ lib/adapter/api/model.js 2013-07-23 22:13:31 +0900 (88b44c6) @@ -6,8 +6,8 @@ CommandModel.prototype = { get toBackend() { return this._options.toBackend; }, - get toClient() { - return this._options.toClient; + get responseConverter() { + return this._options.responseConverter; } }; CommandModel.isInstance = function(modelInstance) { Modified: lib/adapter/http.js (+2 -2) =================================================================== --- lib/adapter/http.js 2013-07-22 23:48:19 +0900 (5dc981a) +++ lib/adapter/http.js 2013-07-23 22:13:31 +0900 (4fe2ba0) @@ -33,8 +33,8 @@ function createHandler(params) { } else { debug('adapter.rest.createHandler.handle.response.success'); var body = envelope.body; - if (definition.toClient) { - var result = definition.toClient(commandName, body); + if (definition.responseConverter) { + var result = definition.responseConverter(commandName, body); body = result[1]; } response.jsonp(body, 200); Modified: lib/adapter/socket.io.js (+4 -4) =================================================================== --- lib/adapter/socket.io.js 2013-07-22 23:48:19 +0900 (1fb39ce) +++ lib/adapter/socket.io.js 2013-07-23 22:13:31 +0900 (5d4c99a) @@ -64,8 +64,8 @@ exports.register = function(application, server, params) { var responseEvent = envelope.type; var responseData = envelope.body; - if (commandDefinition.toClient) { - var result = commandDefinition.toClient(responseEvent, responseData); + if (commandDefinition.responseConverter) { + var result = commandDefinition.responseConverter(responseEvent, responseData); responseEvent = result[0]; responseData = result[1]; } @@ -92,8 +92,8 @@ exports.register = function(application, server, params) { var event = commandName; var data = body; - if (commandDefinition.toClient) { - var result = commandDefinition.toClient(event, data); + if (commandDefinition.responseConverter) { + var result = commandDefinition.responseConverter(event, data); event = result[0]; data = result[1]; } Modified: test/adapter/rest.test.js (+1 -1) =================================================================== --- test/adapter/rest.test.js 2013-07-22 23:48:19 +0900 (ecb8a0a) +++ test/adapter/rest.test.js 2013-07-23 22:13:31 +0900 (5eddffe) @@ -77,7 +77,7 @@ suite('HTTP Adapter', function() { adapter: new model.HTTPCommand({ path: '/path/to/adapter', toBackend: function(event, request) { return [event, 'adapter requested']; }, - toClient: function(event, data) { return [event, 'adapter OK']; } + 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-22 23:48:19 +0900 (0cc4f9d) +++ test/adapter/socket.io.test.js 2013-07-23 22:13:31 +0900 (909881c) @@ -19,20 +19,20 @@ suite('Socket.IO Adapter', function() { 'reqrep': new model.SocketRequestResponse(), 'reqrep-mod-event': new model.SocketRequestResponse({ toBackend: function(event, data) { return [event + '.mod', data]; }, - toClient: 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']; }, - toClient: function(event, data) { return [event, 'modified response']; } + 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]; }, - toClient: 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']; }, - toClient: function(event, data) { return [event, 'modified response']; } + responseConverter: function(event, data) { return [event, 'modified response']; } }) }; Modified: test/express-adapter.test.js (+2 -2) =================================================================== --- test/express-adapter.test.js 2013-07-22 23:48:19 +0900 (1b38a4b) +++ test/express-adapter.test.js 2013-07-23 22:13:31 +0900 (61f7cff) @@ -13,13 +13,13 @@ suite('Adaption for express application', function() { api: new model.HTTPCommand({ path: '/path/to/api', toBackend: function(event, request) { return [event, 'api requested']; }, - toClient: function(event, data) { return [event, 'api OK']; } + responseConverter: function(event, data) { return [event, 'api OK']; } }) }; var testSocketPlugin = { api: new model.SocketRequestResponse({ toBackend: function(event, data) { return [event, 'api requested']; }, - toClient: function(event, data) { return [event, 'api OK']; } + responseConverter: function(event, data) { return [event, 'api OK']; } }) }; -------------- next part -------------- HTML����������������������������...Download