Merge pull request #24 from digitalsadhu/patch

Basic test for remote method

Author: digitalsadhu

lib/deserialize.js

@@ -3,21 +3,30 @@
 module.exports = function (app) {
   var remotes = app.remotes();
 
-  //register a handler to run before all remote methods so that we can
-  //transform JSON API structured JSON payload into something loopback
-  //can work with.
-  remotes.before('**', function (ctx, next) {
+  function deserializeJSONAPIPayload (ctx, next) {
 
-    //JSON api doesn't support PUT so we only need to apply our changes to
-    //POST and PATCH operations.
-    if (ctx.req.method === 'POST' || ctx.req.method === 'PATCH') {
+    var regexs = [
+      /\.create/,
+      /prototype\.updateAttributes/,
+      /prototype\.__createRelationships__/,
+      /prototype\.__updateRelationships__/
+    ];
+
+    var matches = regexs.filter(function (regex) {
+      return ctx.methodString.match(regex);
+    });
+
+    if (matches.length > 0) {
 
       //set the JSON API Content-Type response header
       ctx.res.set({'Content-Type': 'application/vnd.api+json'});
 
       //check the incoming payload data to ensure it is valid according to the
       //JSON API spec.
       var data = ctx.args.data;
+
+      if (!data) return next();
+
       if (!data.data) return next(new Error('JSON API resource object must contain `data` property'));
       if (!data.data.type) return next(new Error('JSON API resource object must contain `data.type` property'));
       if (ctx.req.method === 'PATCH') {
@@ -29,5 +38,10 @@ module.exports = function (app) {
     }
 
     next();
-  });
+  }
+
+  //register a handler to run before all remote methods so that we can
+  //transform JSON API structured JSON payload into something loopback
+  //can work with.
+  remotes.before('**', deserializeJSONAPIPayload);
 };

lib/serialize.js

@@ -86,6 +86,25 @@ module.exports = function (app, options) {
   var remotes = app.remotes();
 
   remotes.after('**', function (ctx, next) {
+
+    var regexs = [
+      /\.find/,
+      /\.create/,
+      /\.deleteById/,
+      /\.findById/,
+      /prototype\.__get__/,
+      /prototype\.updateAttributes/,
+      /prototype\.__findRelationships__/,
+      /prototype\.__createRelationships__/,
+      /prototype\.__updateRelationships__/
+    ];
+
+    var matches = regexs.filter(function (regex) {
+      return ctx.methodString.match(regex);
+    });
+
+    if (matches.length === 0) return next();
+
     ctx.res.set({'Content-Type': 'application/vnd.api+json'});
     //housekeeping, just skip verbs we definitely aren't
     //interested in handling.

test/remoteMethods.test.js

@@ -0,0 +1,45 @@
+var request = require('supertest');
+var loopback = require('loopback');
+var expect = require('chai').expect;
+var JSONAPIComponent = require('../');
+var app, Post;
+
+describe('loopback json api remote methods', function () {
+  beforeEach(function () {
+    app = loopback();
+    app.set('legacyExplorer', false);
+    var ds = loopback.createDataSource('memory');
+    Post = ds.createModel('post', {
+      id: {type: Number, id: true},
+      title: String,
+      content: String
+    });
+    Post.greet = function (msg, cb) {
+      cb(null, 'Greetings... ' + msg);
+    };
+    Post.remoteMethod(
+        'greet',
+      {
+        accepts: {arg: 'msg', type: 'string'},
+        returns: {arg: 'greeting', type: 'string'}
+      }
+    );
+    app.model(Post);
+    app.use(loopback.rest());
+    JSONAPIComponent(app);
+  });
+
+  describe('remote method for application/json', function () {
+    it('POST /posts/greet should return remote method message', function (done) {
+      request(app).post('/posts/greet')
+        .send({'msg': 'John'})
+        .set('Content-Type', 'application/json')
+        .expect(200)
+        .end(function (err, res) {
+          expect(err).to.equal(null);
+          expect(res.body.greeting).to.equal('Greetings... John');
+          done();
+        });
+    });
+  });
+});