droonga/express-droonga at 73926f5 [master] Use meaningful name (Groonga-commit) - Groonga - fulltext search engine.

YUKI Hiroshi	2013-12-16 12:04:14 +0900 (Mon, 16 Dec 2013)

  New Revision: 73926f5b4aeb122dee611f35e1605d6f50c254f5
  https://github.com/droonga/express-droonga/commit/73926f5b4aeb122dee611f35e1605d6f50c254f5

  Message:
    Use meaningful name
    
    envelope (bad, phisical analogy) =>
    message (better, logical analogy)

  Modified files:
    lib/adapter/http.js
    lib/adapter/socket.io.js

  Modified: lib/adapter/http.js (+3 -3)
===================================================================

--- lib/adapter/http.js    2013-12-16 12:01:52 +0900 (47a4f1e)
+++ lib/adapter/http.js    2013-12-16 12:04:14 +0900 (76ffbfd)
@@ -18,15 +18,15 @@ function createRequestResponseHandler(params) {
       dataset: definition.dataset,
       timeout: timeout
     };
-    var callback = function(error, envelope) {
+    var callback = function(error, message) {
         debug('adapter.http.createRequestResponseHandler.handle.response');
         if (error) {
           debug('adapter.http.createRequestResponseHandler.handle.response.error:', error);
-          var body = envelope && envelope.body || null;
+          var body = message && message.body || null;
           response.jsonp(body, error);
         } else {
           debug('adapter.http.createRequestResponseHandler.handle.response.success');
-          var body = envelope.body;
+          var body = message.body;
           if (definition.onResponse) {
             definition.onResponse(body, response);
           } else {

  Modified: lib/adapter/socket.io.js (+10 -10)
===================================================================
--- lib/adapter/socket.io.js    2013-12-16 12:01:52 +0900 (b31c98b)
+++ lib/adapter/socket.io.js    2013-12-16 12:04:14 +0900 (cd5d470)
@@ -16,10 +16,10 @@ function deepClone(base) {
   return cloned;
 }
 
-function sanitizeBackendMessage(envelope) {
+function sanitizeBackendMessage(message) {
   return {
-    statusCode: envelope.statusCode,
-    body: deepClone(envelope.body)
+    statusCode: message.statusCode,
+    body: deepClone(message.body)
   };
 }
 exports.sanitizeBackendMessage = sanitizeBackendMessage;
@@ -59,14 +59,14 @@ exports.register = function(application, server, params) {
     return (function(data, clientOptions) {
       clientOptions = clientOptions || {};
 
-      var callback = function(error, envelope) {
+      var callback = function(error, message) {
         if (error) {
           socket.emit('error', error);
           return;
         }
 
-        var responseEvent = envelope.type;
-        var responseData = envelope.body;
+        var responseEvent = message.type;
+        var responseData = message.body;
         var options = {};
         if (clientOptions.responseEvent) {
           responseEvent = clientOptions.responseEvent;
@@ -111,8 +111,8 @@ exports.register = function(application, server, params) {
 
   var allSubscribers = {};
   function createNotificationHandler(notificationEvent, commandDefinition) {
-    return (function(envelope) {
-      var subscriberIds = envelope.to;
+    return (function(message) {
+      var subscriberIds = message.to;
       if (!Array.isArray(subscriberIds))
         subscriberIds = [subscriberIds];
 
@@ -125,12 +125,12 @@ exports.register = function(application, server, params) {
         try {
           if (commandDefinition.onNotify) {
             try {
-              commandDefinition.onNotify(envelope.body, subscriberSocket);
+              commandDefinition.onNotify(message.body, subscriberSocket);
             } catch(error) {
               subscriberSocket.emit('error', error.message || error);
             }
           } else {
-            subscriberSocket.emit(notificationEvent, envelope.body);
+            subscriberSocket.emit(notificationEvent, message.body);
           }
         } catch(exception) {
           console.log(exception + '\n' + exception.stack);
-------------- next part --------------
HTML����������������������������...
Download 


Groonga - fulltext search engine.

[Groonga-commit] droonga/express-droonga at 73926f5 [master] Use meaningful name