Groonga - fulltext search engine.

[Groonga-commit] groonga/express-droonga at 28b5821 [master] api/ -> adapter/

Kouhei Sutou null+****@clear*****
Mon Jul 22 22:49:40 JST 2013

• Previous message: [Groonga-commit] groonga/express-droonga at 79eb9df [master] Remove frontend/ directory and pull the sub directories of it up
• Next message: [Groonga-commit] groonga/express-droonga at e01f3e2 [master] Use "e" for "adapter"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Kouhei Sutou	2013-07-22 22:49:40 +0900 (Mon, 22 Jul 2013)

  New Revision: 28b5821749d1ced18e4675d867929a323a5fb973
  https://github.com/groonga/express-droonga/commit/28b5821749d1ced18e4675d867929a323a5fb973

  Message:
    api/ -> adapter/
    
    We will call default-commands/ as "API".

  Modified files:
    index.js
    test/rest-request-builder.test.js
  Renamed files:
    lib/adapter/default-commands/rest-request-builder.js
      (from lib/api/default-commands/rest-request-builder.js)
    lib/adapter/default-commands/rest.js
      (from lib/api/default-commands/rest.js)
    lib/adapter/default-commands/socket.io.js
      (from lib/api/default-commands/socket.io.js)
    lib/adapter/groonga.js
      (from lib/api/groonga.js)
    lib/adapter/rest.js
      (from lib/api/rest.js)
    lib/adapter/socket.io.js
      (from lib/api/socket.io.js)
    test/adapter/rest.test.js
      (from test/api/rest.test.js)
    test/adapter/socket.io.test.js
      (from test/api/socket.io.test.js)

  Modified: index.js (+6 -6)
===================================================================
--- index.js    2013-07-22 22:47:33 +0900 (4cefabf)
+++ index.js    2013-07-22 22:49:40 +0900 (f367f6d)
@@ -1,8 +1,8 @@
 var express = require('express');
 var Connection = require('./lib/backend/connection').Connection;
-var restAPI = require('./lib/api/rest');
-var groongaAPI = require('./lib/api/groonga');
-var socketIoAPI = require('./lib/api/socket.io');
+var restAdapter = require('./lib/adapter/rest');
+var groongaAdapter = require('./lib/adapter/groonga');
+var socketIoAdapter = require('./lib/adapter/socket.io');
 var dashboardUI = require('./lib/ui/dashboard');
 
 express.application.droonga = function(params) {
@@ -14,11 +14,11 @@ express.application.droonga = function(params) {
   params.prefix = params.prefix || '';
   params.prefix = params.prefix.replace(/\/$/, '');
 
-  restAPI.register(this, params);
-  groongaAPI.register(this, params);
+  restAdapter.register(this, params);
+  groongaAdapter.register(this, params);
 
   if (params.server) {
-    socketIoAPI.register(this, params.server, params);
+    socketIoAdapter.register(this, params.server, params);
     params.server.on('close', function() {
       // The connection can be mocked/stubbed. We don't need to close
       // such a fake connection.

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

  Renamed: lib/adapter/default-commands/rest.js (+0 -0) 100%
===================================================================

  Renamed: lib/adapter/default-commands/socket.io.js (+0 -0) 100%
===================================================================

  Renamed: lib/adapter/groonga.js (+0 -0) 100%
===================================================================

  Renamed: lib/adapter/rest.js (+0 -0) 100%
===================================================================

  Renamed: lib/adapter/socket.io.js (+0 -0) 100%
===================================================================

  Renamed: test/adapter/rest.test.js (+21 -21) 80%
===================================================================
--- test/api/rest.test.js    2013-07-22 22:47:33 +0900 (30f1d52)
+++ test/adapter/rest.test.js    2013-07-22 22:49:40 +0900 (574d106)
@@ -5,11 +5,11 @@ var Deferred = require('jsdeferred').Deferred;
 var utils = require('../test-utils');
 
 var express = require('express');
-var restAPI = require('../../lib/api/rest');
+var restAdapter = require('../../lib/adapter/rest');
 var model = require('../../lib/model');
-var restCommands = require('../../lib/api/default-commands/rest');
+var restCommands = require('../../lib/adapter/default-commands/rest');
 
-suite('REST API', function() {
+suite('REST Adapter', function() {
   test('registeration of plugin commands', function() {
     var basePlugin = {
       getCommand: new model.REST({
@@ -41,7 +41,7 @@ suite('REST API', function() {
     };
 
     var application = express();
-    var registeredCommands = restAPI.register(application, {
+    var registeredCommands = restAdapter.register(application, {
       prefix:     '',
       connection: utils.createStubbedBackendConnection(),
       plugins: [
@@ -71,10 +71,10 @@ suite('REST API', function() {
 
   suite('registeration', function() {
     var testPlugin = {
-      api: new model.REST({
-        path: '/path/to/api',
-        toBackend: function(event, request) { return [event, 'api requested']; },
-        toClient: function(event, data) { return [event, 'api OK']; }
+      adapter: new model.REST({
+        path: '/path/to/adapter',
+        toBackend: function(event, request) { return [event, 'adapter requested']; },
+        toClient: function(event, data) { return [event, 'adapter OK']; }
       })
     };
 
@@ -101,7 +101,7 @@ suite('REST API', function() {
     });
 
     test('to the document root', function(done) {
-      restAPI.register(application, {
+      restAdapter.register(application, {
         prefix:     '',
         connection: connection,
         plugins:    [testPlugin]
@@ -111,17 +111,17 @@ suite('REST API', function() {
         return utils.createReplyPacket(request,
                                        {
                                          statusCode: 200,
-                                         body:       'API response',
+                                         body:       'Adapter response',
                                        });
       });
 
-      utils.get('/path/to/api')
+      utils.get('/path/to/adapter')
         .next(function(response) {
-          backend.assertReceived([{ type: 'api',
-                                    body: 'api requested' }]);
+          backend.assertReceived([{ type: 'adapter',
+                                    body: 'adapter requested' }]);
           assert.deepEqual(response,
                           { statusCode: 200,
-                            body:       JSON.stringify('api OK') });
+                            body:       JSON.stringify('adapter OK') });
           done();
         })
         .error(function(error) {
@@ -130,7 +130,7 @@ suite('REST API', function() {
     });
 
     test('under specified path', function(done) {
-      restAPI.register(application, {
+      restAdapter.register(application, {
         prefix:     '/path/to/droonga',
         connection: connection,
         plugins:    [testPlugin]
@@ -140,17 +140,17 @@ suite('REST API', function() {
         return utils.createReplyPacket(request,
                                        {
                                          statusCode: 200,
-                                         body:       'API response',
+                                         body:       'Adapter response',
                                        });
       });
 
-      utils.get('/path/to/droonga/path/to/api')
+      utils.get('/path/to/droonga/path/to/adapter')
         .next(function(response) {
-          backend.assertReceived([{ type: 'api',
-                                    body: 'api requested' }]);
+          backend.assertReceived([{ type: 'adapter',
+                                    body: 'adapter requested' }]);
           assert.deepEqual(response,
                           { statusCode: 200,
-                            body:       JSON.stringify('api OK') });
+                            body:       JSON.stringify('adapter OK') });
           done();
         })
         .error(function(error) {
@@ -173,7 +173,7 @@ suite('REST API', function() {
       var receiverCallback = {};
       var connection = utils.createStubbedBackendConnection();
       var application = express();
-      restAPI.register(application, {
+      restAdapter.register(application, {
         prefix:     '',
         connection: connection
       });

  Renamed: test/adapter/socket.io.test.js (+10 -10) 96%
===================================================================
--- test/api/socket.io.test.js    2013-07-22 22:47:33 +0900 (3f91972)
+++ test/adapter/socket.io.test.js    2013-07-22 22:49:40 +0900 (19247be)
@@ -5,12 +5,12 @@ var express = require('express');
 
 var utils = require('../test-utils');
 
-var socketIoAPI = require('../../lib/api/socket.io');
+var socketIoAdapter = require('../../lib/adapter/socket.io');
 var model = require('../../lib/model');
 var scoketIoCommands =
-      require('../../lib/api/default-commands/socket.io');
+      require('../../lib/adapter/default-commands/socket.io');
 
-suite('Socket.IO API', function() {
+suite('Socket.IO Adapter', function() {
   var connection;
   var server;
   var clientSockets;
@@ -70,7 +70,7 @@ suite('Socket.IO API', function() {
       .next(function(newServer) {
         server = newServer;
 
-        var registeredCommands = socketIoAPI.register(application, server, {
+        var registeredCommands = socketIoAdapter.register(application, server, {
           connection: utils.createStubbedBackendConnection(),
           plugins: [
             basePlugin,
@@ -114,7 +114,7 @@ suite('Socket.IO API', function() {
     utils.setupServer(application)
       .next(function(newServer) {
         server = newServer;
-        socketIoAPI.register(application, server, {
+        socketIoAdapter.register(application, server, {
           connection: utils.createStubbedBackendConnection(),
           plugins: [testPlugin]
         });
@@ -143,7 +143,7 @@ suite('Socket.IO API', function() {
             server     = result.server;
             connection = result.connection;
             backend    = result.backend;
-            socketIoAPI.register(result.application, server, {
+            socketIoAdapter.register(result.application, server, {
               tag:      utils.testTag,
               connection: connection,
               plugins: [testPlugin]
@@ -229,7 +229,7 @@ suite('Socket.IO API', function() {
           server     = result.server;
           connection = result.connection;
           backend    = result.backend;
-          socketIoAPI.register(result.application, server, {
+          socketIoAdapter.register(result.application, server, {
             tag:      utils.testTag,
             connection: connection,
             plugins: [testPlugin]
@@ -303,7 +303,7 @@ suite('Socket.IO API', function() {
           server     = result.server;
           connection = result.connection;
           backend    = result.backend;
-          socketIoAPI.register(result.application, server, {
+          socketIoAdapter.register(result.application, server, {
             tag:      utils.testTag,
             connection: connection,
             plugins: [testPlugin]
@@ -350,7 +350,7 @@ suite('Socket.IO API', function() {
             server     = result.server;
             connection = result.connection;
             backend    = result.backend;
-            socketIoAPI.register(result.application, server, {
+            socketIoAdapter.register(result.application, server, {
               tag:      utils.testTag,
               connection: connection,
               plugins: [testPlugin]
@@ -431,7 +431,7 @@ suite('Socket.IO API', function() {
           server     = result.server;
           connection = result.connection;
           backend    = result.backend;
-          socketIoAPI.register(result.application, server, {
+          socketIoAdapter.register(result.application, server, {
             tag:      utils.testTag,
             connection: connection,
             plugins: [testPlugin]

  Modified: test/rest-request-builder.test.js (+2 -2)
===================================================================
--- test/rest-request-builder.test.js    2013-07-22 22:47:33 +0900 (9fbad94)
+++ test/rest-request-builder.test.js    2013-07-22 22:49:40 +0900 (b9509fd)
@@ -3,9 +3,9 @@ var assert = require('chai').assert;
 var utils = require('./test-utils');
 
 var builders =
- require('../lib/api/default-commands/rest-request-builder');
+ require('../lib/adapter/default-commands/rest-request-builder');
 
-suite('building message from REST API request', function() {
+suite('building message from REST adapter request', function() {
   suite('search', function() {
     var outputAll = {
       startTime:   true,
-------------- next part --------------
HTML����������������������������...
Télécharger 

• Previous message: [Groonga-commit] groonga/express-droonga at 79eb9df [master] Remove frontend/ directory and pull the sub directories of it up
• Next message: [Groonga-commit] groonga/express-droonga at e01f3e2 [master] Use "e" for "adapter"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]