droonga/express-droonga at a813125 [master] Swap order of arguments for response.jsonp (Groonga-commit) - Groonga - fulltext search engine.

Yoji Shidara	2014-05-15 10:00:02 +0900 (Thu, 15 May 2014)

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

  Message:
    Swap order of arguments for response.jsonp

  Modified files:
    lib/adapter/api/groonga/loader.js
    lib/adapter/http.js
    test/adapter/http.test.js
    test/express-adapter.test.js

  Modified: lib/adapter/api/groonga/loader.js (+1 -1)
===================================================================

--- lib/adapter/api/groonga/loader.js    2014-05-04 19:03:54 +0900 (cb44219)
+++ lib/adapter/api/groonga/loader.js    2014-05-15 10:00:02 +0900 (e1a4b0f)
@@ -141,7 +141,7 @@ Loader.prototype._sendResponse = function _sendResponse(body) {
   } else {
     httpStatusCode = httpStatusCodes.BAD_REQUEST;
   }
-  this._response.jsonp(groongaResponse, httpStatusCode);
+  this._response.jsonp(httpStatusCode, groongaResponse);
 };
 
 module.exports = Loader;

  Modified: lib/adapter/http.js (+6 -6)
===================================================================
--- lib/adapter/http.js    2014-05-04 19:03:54 +0900 (7819497)
+++ lib/adapter/http.js    2014-05-15 10:00:02 +0900 (51326dc)
@@ -23,14 +23,14 @@ function createRequestResponseHandler(params) {
         if (error) {
           debug('adapter.http.createRequestResponseHandler.handle.response.error:', error);
           var body = message && message.body || null;
-          response.jsonp(body, error);
+          response.jsonp(error, body);
         } else {
           debug('adapter.http.createRequestResponseHandler.handle.response.success');
           var body = message.body;
           if (definition.onResponse) {
             definition.onResponse(body, response);
           } else {
-            response.jsonp(body, 200);
+            response.jsonp(200, body);
           }
         }
       }
@@ -42,7 +42,7 @@ function createRequestResponseHandler(params) {
         };
         if (error.detail)
           errorBody.detail = error.detail;
-        response.jsonp(errorBody, error.code || 500);
+        response.jsonp(error.code || 500, errorBody);
         return;
       }
       var wrappedConnection = new wrapper.DroongaProtocolConnectionWrapper(connection, callback, options);
@@ -51,7 +51,7 @@ function createRequestResponseHandler(params) {
           definition.onRequest(request, wrappedConnection, response);
         } catch(error) {
           wrappedConnection.destroy();
-          response.jsonp({ error: error.message }, 500);
+          response.jsonp(500, { error: error.message });
         }
       } else {
         wrappedConnection.emit(commandName, request.query);
@@ -85,7 +85,7 @@ function createGenericHandler(params) {
         };
         if (error.detail)
           errorBody.detail = error.detail;
-        response.jsonp(errorBody, error.code || 500);
+        response.jsonp(error.code || 500, errorBody);
         return;
       }
       var wrappedConnection = new wrapper.DroongaProtocolConnectionWrapper(connection, options);
@@ -93,7 +93,7 @@ function createGenericHandler(params) {
         definition.onHandle(request, response, wrappedConnection);
       } catch(error) {
         wrappedConnection.destroy();
-        response.jsonp({ error: error.message }, 500);
+        response.jsonp(500, { error: error.message });
       }
     };
     if (typeof definition.authorize == 'function')

  Modified: test/adapter/http.test.js (+1 -1)
===================================================================
--- test/adapter/http.test.js    2014-05-04 19:03:54 +0900 (b71bd8f)
+++ test/adapter/http.test.js    2014-05-15 10:00:02 +0900 (fb86fc0)
@@ -53,7 +53,7 @@ suite('HTTP Adapter', function() {
           connection.emit('adapter', 'adapter requested');
         },
         onResponse: function(data, response) {
-          response.jsonp('adapter OK', 200);
+          response.jsonp(200, 'adapter OK');
         }
       })
     };

  Modified: test/express-adapter.test.js (+1 -1)
===================================================================
--- test/express-adapter.test.js    2014-05-04 19:03:54 +0900 (5c3c470)
+++ test/express-adapter.test.js    2014-05-15 10:00:02 +0900 (4a118cc)
@@ -16,7 +16,7 @@ suite('Adaption for express application', function() {
         connection.emit('api', 'api requested');
       },
       onResponse: function(data, response) {
-        response.jsonp('api OK', 200);
+        response.jsonp(200, 'api OK');
       }
     })
   };
-------------- next part --------------
HTML����������������������������...
Download 


Groonga - fulltext search engine.

[Groonga-commit] droonga/express-droonga at a813125 [master] Swap order of arguments for response.jsonp