Groonga - fulltext search engine.

[Groonga-commit] groonga/express-kotoumi [master] Put codes for backend under "lib/backend" and codes for frontend under "lib/frontend"

YUKI Hiroshi null+****@clear*****
Mon Jan 28 11:26:59 JST 2013

• Previous message: [Groonga-commit] groonga/fluent-plugin-kotoumi [master] Use do ... end for block
• Next message: [Groonga-commit] groonga/fluent-plugin-kotoumi [master] Enable Travis CI
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

YUKI Hiroshi	2013-01-28 11:26:59 +0900 (Mon, 28 Jan 2013)

  New Revision: 49472f8ecdb0658e16bf0af383c0b668b92d91c6
  https://github.com/groonga/express-kotoumi/commit/49472f8ecdb0658e16bf0af383c0b668b92d91c6

  Log:
    Put codes for backend under "lib/backend" and codes for frontend under "lib/frontend"

  Modified files:
    index.js
    test/express-adaptor.test.js
    test/test-utils.js
  Renamed files:
    lib/backend/connection.js
      (from lib/backend-adaptor.js)
    lib/frontend/dashboard-handler.js
      (from lib/dashboard-adaptor.js)
    lib/frontend/rest-handler.js
      (from lib/rest-adaptor.js)
    lib/frontend/rest-request-builder.js
      (from lib/rest-request-builder.js)
    lib/frontend/socket.io-handler.js
      (from lib/socket-adaptor.js)
    test/backend-connection.test.js
      (from test/backend-adaptor.test.js)
    test/frontend-rest-handler.test.js
      (from test/rest-api.test.js)
    test/frontend-socket.io-handler-test.js
      (from test/socket-api.test.js)

  Modified: index.js (+7 -7)
===================================================================
--- index.js    2013-01-23 18:24:35 +0900 (c6a3238)
+++ index.js    2013-01-28 11:26:59 +0900 (adeacdc)
@@ -1,8 +1,8 @@
 var express = require('express');
-var Connection = require('./lib/backend-adaptor').Connection;
-var restAdaptor = require('./lib/rest-adaptor');
-var socketAdaptor = require('./lib/socket-adaptor');
-var dashboardAdaptor = require('./lib/dashboard-adaptor');
+var Connection = require('./lib/backend/connection').Connection;
+var restHandler = require('./lib/frontend/rest-handler');
+var socketIoHandler = require('./lib/frontend/socket.io-handler');
+var dashboardHandler = require('./lib/frontend/dashboard-handler');
 
 express.application.kotoumi = function(params) {
   params = params || {};
@@ -12,10 +12,10 @@ express.application.kotoumi = function(params) {
   params.prefix = params.prefix || '';
   params.prefix = params.prefix.replace(/\/$/, '');
 
-  restAdaptor.registerHandlers(this, params);
+  restHandler.register(this, params);
 
   if (params.server)
-    socketAdaptor.registerHandlers(this, params.server, params);
+    socketIoHandler.register(this, params.server, params);
 
-  dashboardAdaptor.registerHandlers(this, params);
+  dashboardHandler.register(this, params);
 }

  Renamed: lib/backend/connection.js (+19 -7) 89%
===================================================================
--- lib/backend-adaptor.js    2013-01-23 18:24:35 +0900 (105da2b)
+++ lib/backend/connection.js    2013-01-28 11:26:59 +0900 (9f63c5b)
@@ -32,13 +32,25 @@ var EventEmitter = require('events').EventEmitter;
 var socketIo = require('socket.io');
 var fluent = require('fluent-logger');
 
-var DEFAULT_FLUENT_TAG        = 'groonga';
-var DEFAULT_FLUENT_HOST_NAME  = 'localhost';
-var DEFAULT_FLUENT_PORT       = 24224;
-var DEFAULT_RECEIVE_HOST_NAME = 'localhost';
-var DEFAULT_RECEIVE_PORT      = 10030;
-
-var ERROR_GATEWAY_TIMEOUT = exports.ERROR_GATEWAY_TIMEOUT = 504;
+var Connection.DEFAULT_FLUENT_TAG =
+      DEFAULT_FLUENT_TAG =
+        'groonga';
+var Connection.DEFAULT_FLUENT_HOST_NAME =
+      DEFAULT_FLUENT_HOST_NAME =
+        'localhost';
+var Connection.DEFAULT_FLUENT_PORT =
+      DEFAULT_FLUENT_PORT =
+        24224;
+var Connection.DEFAULT_RECEIVE_HOST_NAME =
+      DEFAULT_RECEIVE_HOST_NAME =
+        'localhost';
+var Connection.DEFAULT_RECEIVE_PORT =
+      DEFAULT_RECEIVE_PORT =
+        10030;
+
+var Connection.ERROR_GATEWAY_TIMEOUT =
+      ERROR_GATEWAY_TIMEOUT =
+        504;
 
 function Connection(params) {
   this._params = params || {};

  Renamed: lib/frontend/dashboard-handler.js (+1 -1) 94%
===================================================================
--- lib/dashboard-adaptor.js    2013-01-23 18:24:35 +0900 (492707b)
+++ lib/frontend/dashboard-handler.js    2013-01-28 11:26:59 +0900 (2820e03)
@@ -2,7 +2,7 @@ var express = require('express');
 var less = require('less-middleware');
 var path = require('path');
 
-exports.registerHandlers = function(application, params) {
+exports.register = function(application, params) {
   params = params || {};
 
   var prefix = params.prefix || '';

  Renamed: lib/frontend/rest-handler.js (+1 -1) 97%
===================================================================
--- lib/rest-adaptor.js    2013-01-23 18:24:35 +0900 (e5fbe6c)
+++ lib/frontend/rest-handler.js    2013-01-28 11:26:59 +0900 (495cfac)
@@ -24,7 +24,7 @@ function createHandler(type,
 }
 exports.createHandler = createHandler;
 
-exports.registerHandlers = function(application, params) {
+exports.register = function(application, params) {
   params = params || {};
   var connection = params.connection;
   if (!connection)

  Renamed: lib/frontend/rest-request-builder.js (+0 -0) 100%
===================================================================

  Renamed: lib/frontend/socket.io-handler.js (+1 -1) 95%
===================================================================
--- lib/socket-adaptor.js    2013-01-23 18:24:35 +0900 (ddbb90f)
+++ lib/frontend/socket.io-handler.js    2013-01-28 11:26:59 +0900 (ba94c12)
@@ -31,7 +31,7 @@ function buildResultData(envelope) {
 }
 exports.buildResultData = buildResultData;
 
-exports.registerHandlers = function(application, server, params) {
+exports.register = function(application, server, params) {
   params = params || {};
   var connection = params.connection;
   if (!connection)

  Renamed: test/backend-connection.test.js (+2 -3) 97%
===================================================================
--- test/backend-adaptor.test.js    2013-01-23 18:24:35 +0900 (e0702d5)
+++ test/backend-connection.test.js    2013-01-28 11:26:59 +0900 (78a2e91)
@@ -6,8 +6,7 @@ var utils = require('./test-utils');
 var TypeOf = utils.TypeOf;
 var InstanceOf = utils.InstanceOf;
 
-var backendAdaptor = require('../lib/backend-adaptor');
-var Connection = backendAdaptor.Connection;
+var Connection = require('../lib/backend/connection').Connection;
 
 suite('Connection', function() {
   var connection;
@@ -160,7 +159,7 @@ suite('Connection', function() {
     sender.assertSent('message', message);
     assert.equal(connection.listeners('inReplyTo:' + message.id).length, 1);
 
-    callback.takes(backendAdaptor.ERROR_GATEWAY_TIMEOUT, null);
+    callback.takes(Connection.ERROR_GATEWAY_TIMEOUT, null);
     Deferred
       .wait(0.01)
       .next(function() {

  Modified: test/express-adaptor.test.js (+1 -1)
===================================================================
--- test/express-adaptor.test.js    2013-01-23 18:24:35 +0900 (4e47707)
+++ test/express-adaptor.test.js    2013-01-28 11:26:59 +0900 (31a159f)
@@ -6,7 +6,7 @@ var express = require('express');
 var utils = require('./test-utils');
 
 var adaptor = require('../index');
-var Connection = require('../lib/backend-adaptor').Connection;
+var Connection = require('../lib/backend/connection').Connection;
 
 suite('Adaption for express application', function() {
   suite('REST API', function() {

  Renamed: test/frontend-rest-handler.test.js (+7 -7) 92%
===================================================================
--- test/rest-api.test.js    2013-01-23 18:24:35 +0900 (d076d96)
+++ test/frontend-rest-handler.test.js    2013-01-28 11:26:59 +0900 (7ff50a9)
@@ -4,8 +4,8 @@ var nodemock = require('nodemock');
 var utils = require('./test-utils');
 
 var express = require('express');
-var restAdaptor = require('../lib/rest-adaptor');
-var Connection = require('../lib/backend-adaptor').Connection;
+var restHandler = require('../lib/frontend/rest-handler');
+var Connection = require('../lib/backend/connection').Connection;
 
 suite('REST API', function() {
   test('registeration for given handlers', function() {
@@ -13,7 +13,7 @@ suite('REST API', function() {
           .takes('fake connection')
           .returns(function() {});
     var application = express();
-    restAdaptor.registerHandlers(application, {
+    restHandler.register(application, {
       prefix:     '',
       connection: 'fake connection',
       handlers:   mockedHandlers
@@ -44,7 +44,7 @@ suite('REST API', function() {
 
     test('to the document root', function(done) {
       var application = express();
-      restAdaptor.registerHandlers(application, {
+      restHandler.register(application, {
         prefix:     '',
         connection: 'fake connection',
         handlers:   handlersFactory
@@ -64,7 +64,7 @@ suite('REST API', function() {
 
     test('under specified path', function(done) {
       var application = express();
-      restAdaptor.registerHandlers(application, {
+      restHandler.register(application, {
         prefix:     '/path/to/kotoumi',
         connection: 'fake connection',
         handlers:   handlersFactory
@@ -94,7 +94,7 @@ suite('REST API', function() {
           .mock('emitMessage')
             .takes('search', { requestMessage: true }, function() {}, null)
             .ctrl(2, onReceive);
-    var handler = restAdaptor
+    var handler = restHandler
           .createHandler('search',
                          requestBuilders.search,
                          connection);
@@ -137,7 +137,7 @@ suite('REST API', function() {
             emitMessageCalledArguments: []
           };
       var application = express();
-      restAdaptor.registerHandlers(application, {
+      restHandler.register(application, {
         prefix:     '',
         connection: connection
       });

  Renamed: test/frontend-socket.io-handler-test.js (+5 -5) 91%
===================================================================
--- test/socket-api.test.js    2013-01-23 18:24:35 +0900 (8f1f18e)
+++ test/frontend-socket.io-handler-test.js    2013-01-28 11:26:59 +0900 (264cc0b)
@@ -5,8 +5,8 @@ var express = require('express');
 
 var utils = require('./test-utils');
 
-var socketAdaptor = require('../lib/socket-adaptor');
-var Connection = require('../lib/backend-adaptor').Connection;
+var socketIoHandler = require('../lib/frontend/socket.io-handler');
+var Connection = require('../lib/backend/connection').Connection;
 
 suite('Socket.IO API', function() {
   var server;
@@ -30,7 +30,7 @@ suite('Socket.IO API', function() {
 
     var application = express();
     server = utils.setupServer(application);
-    socketAdaptor.registerHandlers(application, server, {
+    socketIoHandler.register(application, server, {
       connection: connection
     });
 
@@ -56,7 +56,7 @@ suite('Socket.IO API', function() {
 
     var application = express();
     server = utils.setupServer(application);
-    socketAdaptor.registerHandlers(application, server, {
+    socketIoHandler.register(application, server, {
       connection: connection
     });
 
@@ -105,7 +105,7 @@ suite('Socket.IO API', function() {
 
     var application = express();
     server = utils.setupServer(application);
-    socketAdaptor.registerHandlers(application, server, {
+    socketIoHandler.register(application, server, {
       connection: connection,
       extraCommands: [
         'foobar'

  Modified: test/test-utils.js (+2 -2)
===================================================================
--- test/test-utils.js    2013-01-23 18:24:35 +0900 (7313e65)
+++ test/test-utils.js    2013-01-28 11:26:59 +0900 (2640899)
@@ -4,7 +4,7 @@ var http = require('http');
 var Deferred = require('jsdeferred').Deferred;
 var client = require('socket.io-client');
 
-var socketAdaptor = require('../lib/socket-adaptor');
+var socketIoHandler = require('../lib/frontend/socket.io-handler');
 
 function createMockedSender() {
   var sender = {
@@ -134,7 +134,7 @@ exports.createClientSocket = createClientSocket;
 function createMockedBackendConnection() {
   var connection = nodemock;
   var onMessageControllers = {};
-  socketAdaptor.commands.forEach(function(command) {
+  socketIoHandler.commands.forEach(function(command) {
     onMessageControllers[command] = {};
     connection = connection
       .mock('on')
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] groonga/fluent-plugin-kotoumi [master] Use do ... end for block
• Next message: [Groonga-commit] groonga/fluent-plugin-kotoumi [master] Enable Travis CI
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]