YUKI Hiroshi
null+****@clear*****
Fri Mar 1 13:56:52 JST 2013
YUKI Hiroshi 2013-03-01 13:56:52 +0900 (Fri, 01 Mar 2013) New Revision: b417a7af09cb0852a45f4a860b99724fcd97d7a1 https://github.com/groonga/express-droonga/commit/b417a7af09cb0852a45f4a860b99724fcd97d7a1 Log: Rename project to "droonga" (distributed-groonga) Modified files: README.md application.js index.js lib/backend/connection.js lib/backend/receiver.js package.json test/backend-receiver.test.js test/express-adaptor.test.js test/frontend-rest-adaptor.test.js Modified: README.md (+25 -21) =================================================================== --- README.md 2013-02-18 20:37:35 +0900 (f4b8b64) +++ README.md 2013-03-01 13:56:52 +0900 (0bccd2d) @@ -1,49 +1,53 @@ -# express-kotoumi +"Droonga" (distributed-groonga) is built with the part of frontend named +"express-droonga" and the part of backend named "fluent-plugin-droonga". - express-kotoumi provides a framework for building scalable + +# express-droonga + + express-droonga provides a framework for building scalable realtime web API services for Express. # usage ## server -If both express-kotoumi and kotoumi (fluentd) are running on the same machine, -you can initialize the express-kotoumi instance easily. +If both express-droonga and fluentd are running on the same machine, +you can initialize the express-droonga instance easily. var express = require('express'), - kotoumi = require('express-kotoumi'); + droonga = require('express-droonga'); var application = express(); var server = require('http').createServer(application); server.listen(80); // the port to communicate with clients - application.kotoumi({ - prefix: '/kotoumi', - tag: 'kotoumi', + application.droonga({ + prefix: '/droonga', + tag: 'droonga', server: server, // this is required to initialize Socket.IO API! extraCommands: [ // optional - // extra command will be sent to kotoumi via the Socket.IO API, as is. - 'kotoumi.reindex' + // extra command will be sent to fluentd via the Socket.IO API, as is. + 'droonga.reindex' ] }); Otherwise, you have to specify pairs of host and port to send messages -to the kotoumi and to receive messages from the kotoumi. +to the fluentd and to receive messages from the fluentd. - application.kotoumi({ - prefix: '/kotoumi', - tag: 'kotoumi', + application.droonga({ + prefix: '/droonga', + tag: 'droonga', server: server, extraCommands: [ - 'kotoumi.reindex' + 'droonga.reindex' ], - // host and port to send messages to kotoumi - hostName: 'backend.kotoumi.example.org', + // host and port to send messages to fluentd + hostName: 'backend.droonga.example.org', port: 24224, - // host and port to receive messages from kotoumi - receiveHostName: 'express.kotoumi.example.org', + // host and port to receive messages from fluentd + receiveHostName: 'express.droonga.example.org', receivePort: 10030 }); @@ -51,9 +55,9 @@ to the kotoumi and to receive messages from the kotoumi. ## client (REST) Frontend applications can call REST APIs to access resources stored in -the kotoumi. For example: +the droonga. For example: - GET /kotoumi/tables/entries?query=foobar HTTP/1.1 + GET /droonga/tables/entries?query=foobar HTTP/1.1 It works as a search request, and a JSON string will be returned as the result. Modified: application.js (+3 -3) =================================================================== --- application.js 2013-02-18 20:37:35 +0900 (98ebefd) +++ application.js 2013-03-01 13:56:52 +0900 (f609016) @@ -1,13 +1,13 @@ #!/usr/bin/env node var express = require('express'), - kotoumi = require('./index'), + droonga = require('./index'), http = require('http'); var application = express(); var server = http.createServer(application); -application.kotoumi({ - prefix: '/kotoumi', +application.droonga({ + prefix: '/droonga', server: server }); Modified: index.js (+1 -1) =================================================================== --- index.js 2013-02-18 20:37:35 +0900 (3f1cb3f) +++ index.js 2013-03-01 13:56:52 +0900 (68d545b) @@ -4,7 +4,7 @@ var restAdaptor = require('./lib/frontend/rest-adaptor'); var socketIoAdaptor = require('./lib/frontend/socket.io-adaptor'); var dashboardHandler = require('./lib/frontend/dashboard-handler'); -express.application.kotoumi = function(params) { +express.application.droonga = function(params) { params = params || {}; params.connection = params.connection || new Connection(params); Modified: lib/backend/connection.js (+2 -2) =================================================================== --- lib/backend/connection.js 2013-02-18 20:37:35 +0900 (62bbd50) +++ lib/backend/connection.js 2013-03-01 13:56:52 +0900 (31e4ca0) @@ -1,5 +1,5 @@ /** - * var connection = new Connection({ tag: 'kotoumi', + * var connection = new Connection({ tag: 'droonga', * hostName: 'localhost', * port: 24224, * receiveHostName: 'localhost', @@ -12,7 +12,7 @@ var FluentReceiver = require('./receiver').FluentReceiver; var DEFAULT_FLUENT_TAG = Connection.DEFAULT_FLUENT_TAG = - 'kotoumi'; + 'droonga'; var DEFAULT_FLUENT_HOST_NAME = Connection.DEFAULT_FLUENT_HOST_NAME = 'localhost'; Modified: lib/backend/receiver.js (+1 -1) =================================================================== --- lib/backend/receiver.js 2013-02-18 20:37:35 +0900 (9a39ac5) +++ lib/backend/receiver.js 2013-03-01 13:56:52 +0900 (3474820) @@ -54,7 +54,7 @@ exports.MsgPackReceiver = MsgPackReceiver; /** * Supports two type packets: - * Forward (used by fluent-cat and fluent-plugin-kotoumi) + * Forward (used by fluent-cat and fluent-plugin-droonga) * [tag, [[time, data], [time,data], ...]] * Message (used by fluent-logger-node) * [tag, time, data] Modified: package.json (+2 -2) =================================================================== --- package.json 2013-02-18 20:37:35 +0900 (c74f7da) +++ package.json 2013-03-01 13:56:52 +0900 (86422a5) @@ -1,8 +1,8 @@ { - "name": "express-kotoumi", + "name": "express-droonga", "description": "A framework for building scalable realtime web API services for Express", "version": "0.0.1", - "author": "Kotoumi project <kotoumi �� groonga.org>", + "author": "Droonga project <droonga �� groonga.org>", "contributors": [ { "name": "Daijiro MORI", Modified: test/backend-receiver.test.js (+7 -7) =================================================================== --- test/backend-receiver.test.js 2013-02-18 20:37:35 +0900 (91e0378) +++ test/backend-receiver.test.js 2013-03-01 13:56:52 +0900 (24ea80b) @@ -23,7 +23,7 @@ suite('FluentReceiver', function() { .takes({ message: true }); receiver = new FluentReceiver(); - receiver.on('kotoumi.message', function(data) { + receiver.on('droonga.message', function(data) { mockedReceiver.receive(data); }); receiver.listen(function() { @@ -35,7 +35,7 @@ suite('FluentReceiver', function() { .next(function() { assert.notEqual(receiver.port, undefined); - var rawPacket = ['kotoumi.message', Date.now(), { message: true }]; + var rawPacket = ['droonga.message', Date.now(), { message: true }]; return utils.sendPacketTo(rawPacket, receiver.port); }) .next(function() { @@ -56,7 +56,7 @@ suite('FluentReceiver', function() { .takes({ message2: true }); receiver = new FluentReceiver(); - receiver.on('kotoumi.message', function(data) { + receiver.on('droonga.message', function(data) { mockedReceiver.receive(data); }); receiver.listen(function() { @@ -68,7 +68,7 @@ suite('FluentReceiver', function() { .next(function() { assert.notEqual(receiver.port, undefined); - var rawPacket = ['kotoumi.message', [[Date.now(), { message1: true }], + var rawPacket = ['droonga.message', [[Date.now(), { message1: true }], [Date.now(), { message2: true }]]]; return utils.sendPacketTo(rawPacket, receiver.port); }) @@ -90,7 +90,7 @@ suite('FluentReceiver', function() { .takes({ message2: true }); receiver = new FluentReceiver(); - receiver.on('kotoumi.message', function(data) { + receiver.on('droonga.message', function(data) { mockedReceiver.receive(data); }); receiver.listen(function() { @@ -102,11 +102,11 @@ suite('FluentReceiver', function() { .next(function() { assert.notEqual(receiver.port, undefined); - var rawPacket = ['kotoumi.message', Date.now(), { message1: true }]; + var rawPacket = ['droonga.message', Date.now(), { message1: true }]; return utils.sendPacketTo(rawPacket, receiver.port); }) .next(function() { - var rawPacket = ['kotoumi.message', Date.now(), { message2: true }]; + var rawPacket = ['droonga.message', Date.now(), { message2: true }]; return utils.sendPacketTo(rawPacket, receiver.port); }) .next(function() { Modified: test/express-adaptor.test.js (+5 -5) =================================================================== --- test/express-adaptor.test.js 2013-02-18 20:37:35 +0900 (e56dd42) +++ test/express-adaptor.test.js 2013-03-01 13:56:52 +0900 (bb0bcc2) @@ -47,7 +47,7 @@ suite('Adaption for express application', function() { }); test('to the document root', function(done) { - application.kotoumi({ + application.droonga({ prefix: '', connection: connection, plugins: [testRestPlugin, testSocketPlugin] @@ -80,14 +80,14 @@ suite('Adaption for express application', function() { }); test('under specified path', function(done) { - application.kotoumi({ - prefix: '/path/to/kotoumi', + application.droonga({ + prefix: '/path/to/droonga', connection: connection, plugins: [testRestPlugin, testSocketPlugin] }); var responseBody; - utils.get('/path/to/kotoumi/path/to/api') + utils.get('/path/to/droonga/path/to/api') .next(function(response) { responseBody = response.body; }); @@ -142,7 +142,7 @@ suite('Adaption for express application', function() { }); test('request-response', function(done) { - application.kotoumi({ + application.droonga({ connection: connection, server: server, plugins: [testRestPlugin, testSocketPlugin] Modified: test/frontend-rest-adaptor.test.js (+2 -2) =================================================================== --- test/frontend-rest-adaptor.test.js 2013-02-18 20:37:35 +0900 (5623854) +++ test/frontend-rest-adaptor.test.js 2013-03-01 13:56:52 +0900 (f5f44d4) @@ -138,7 +138,7 @@ suite('REST API', function() { test('under specified path', function(done) { restAdaptor.register(application, { - prefix: '/path/to/kotoumi', + prefix: '/path/to/droonga', connection: connection, plugins: [testPlugin] }); @@ -147,7 +147,7 @@ suite('REST API', function() { .mock('receive') .takes('api OK'); - utils.get('/path/to/kotoumi/path/to/api') + utils.get('/path/to/droonga/path/to/api') .next(function(response) { mockedReceiver.receive(response.body); }); -------------- next part -------------- HTML����������������������������...다운로드