YUKI Hiroshi
null+****@clear*****
Mon Jan 21 13:56:57 JST 2013
YUKI Hiroshi 2013-01-21 13:56:57 +0900 (Mon, 21 Jan 2013) New Revision: 51fee2b5bf81fa0beadd9dd760acadde3d857c51 https://github.com/groonga/express-kotoumi/commit/51fee2b5bf81fa0beadd9dd760acadde3d857c51 Log: Simplify implementations around response builders for REST API Removed files: lib/builders/index.js lib/builders/response.js Modified files: lib/rest-adaptor.js Renamed files: lib/rest-request-builder.js (from lib/builders/rest-request.js) test/rest-request-builder.test.js (from test/builders-rest-request.test.js) Deleted: lib/builders/index.js (+0 -2) 100644 =================================================================== --- lib/builders/index.js 2013-01-21 13:07:08 +0900 (5b0a83c) +++ /dev/null @@ -1,2 +0,0 @@ -exports.requestInREST = require('./rest-request'); -exports.response = require('./response'); Deleted: lib/builders/response.js (+0 -4) 100644 =================================================================== --- lib/builders/response.js 2013-01-21 13:07:08 +0900 (dcd4769) +++ /dev/null @@ -1,4 +0,0 @@ -function searchResponseBuilder(envelope) { - return envelope.body; -} -exports.search = searchResponseBuilder; Modified: lib/rest-adaptor.js (+4 -10) =================================================================== --- lib/rest-adaptor.js 2013-01-21 13:07:08 +0900 (39a8c8b) +++ lib/rest-adaptor.js 2013-01-21 13:56:57 +0900 (d42ec38) @@ -1,22 +1,16 @@ var Connection = require('./backend-adaptor').Connection; -var builders = require('./builders'); +var restRequestBuilders = require('./rest-request-builder'); function createRESTHandler(type, - requestBuilders, - responseBuilders, + requestBuilder, connection) { - var requestBuilder = requestBuilders[type]; if (!requestBuilder) throw new Error('no request builder for ' + type); - var responseBuilder = responseBuilders[type]; - if (!responseBuilder) - throw new Error('no response builder for ' + type); - return (function(request, response) { var message = requestBuilder(request); connection.emitMessage(type, message, function(responseMessage) { - var body = responseBuilder(responseMessage); + var body = responseMessage.body; response.contentType('application/json'); response.send(body, 200); }); @@ -35,7 +29,7 @@ exports.registerHandlers = function(application, params) { if (params.handlers) return params.handlers[type](connection); else - return createRESTHandler(type, builders.requestInREST, builders.response, connection); + return createRESTHandler(type, restRequestBuilders[type], connection); } // this.get(prefix + '/status/:target', createHandler('status')); Renamed: lib/rest-request-builder.js (+0 -0) 100% =================================================================== Renamed: test/rest-request-builder.test.js (+1 -1) 98% =================================================================== --- test/builders-rest-request.test.js 2013-01-21 13:07:08 +0900 (863cb9c) +++ test/rest-request-builder.test.js 2013-01-21 13:56:57 +0900 (fdfe77c) @@ -2,7 +2,7 @@ var assert = require('chai').assert; var utils = require('./test-utils'); -var builders = require('../lib/builders/rest-request'); +var builders = require('../lib/rest-request-builder'); suite('building message from REST API request', function() { suite('search', function() { -------------- next part -------------- HTML����������������������������...Télécharger
