Merge pull request #22 from SeyZ/top-level-links-for-single-resource

Fix top level links with single resource

Author: SeyZ

lib/collection-serializer.js

@@ -1,21 +1,8 @@
 'use strict';
-var _ = require('lodash');
 var SerializerUtils = require('./serializer-utils');
 
-function CollectionSerializer(collectionName, records, opts) {
-  var payload = { data: [] };
-
-  function getLinks(links) {
-    return _.mapValues(links, function (value) {
-      if (_.isFunction(value)) {
-        return value(records);
-      } else {
-        return value;
-      }
-    });
-  }
-
-  if (opts.topLevelLinks) { payload.links = getLinks(opts.topLevelLinks); }
+function CollectionSerializer(payload, collectionName, records, opts) {
+  payload.data = [];
 
   records.forEach(function (record) {
     var serializerUtils = new SerializerUtils(collectionName, record, payload,

lib/resource-serializer.js

@@ -1,13 +1,9 @@
 'use strict';
 var SerializerUtils = require('./serializer-utils');
 
-function ResourceSerializer(collectionName, record, opts) {
-  var payload = { data: {} };
-
-  var serializerUtils = new SerializerUtils(collectionName, record, payload,
-    opts);
-  if (opts.links) { payload.links = opts.links; }
-  payload.data = serializerUtils.perform(record);
+function ResourceSerializer(payload, collectionName, record, opts) {
+  payload.data = new SerializerUtils(collectionName, record, payload, opts)
+    .perform(record);
 
   return payload;
 }

lib/serializer.js

@@ -3,10 +3,26 @@ var _ = require('lodash');
 var CollectionSerializer = require('./collection-serializer');
 var ResourceSerializer = require('./resource-serializer');
 
-module.exports = function (collectionName, data, opts) {
-  if (_.isArray(data)) {
-    return new CollectionSerializer(collectionName, data, opts);
+module.exports = function (collectionName, records, opts) {
+  var payload = {};
+
+  function getLinks(links) {
+    return _.mapValues(links, function (value) {
+      if (_.isFunction(value)) {
+        return value(records);
+      } else {
+        return value;
+      }
+    });
+  }
+
+  if (opts.topLevelLinks) { payload.links = getLinks(opts.topLevelLinks); }
+
+  if (_.isArray(records)) {
+    return new CollectionSerializer(payload, collectionName, records, opts);
   } else {
-    return new ResourceSerializer(collectionName, data, opts);
+    return new ResourceSerializer(payload, collectionName, records, opts);
   }
+
+  return payload;
 };

test/serializer.js

@@ -147,8 +147,6 @@ describe('Options', function () {
           address: { 'zip_code': 42912 }
         });
 
-      console.log(require('util').inspect(json, { depth: null }));
-
       done(null, json);
     });
   });
@@ -731,7 +729,7 @@ describe('JSON API Serializer', function () {
     });
   });
 
-  describe('Top level links', function () {
+  describe('Top level links with an array of resources', function () {
     it('should be set', function (done) {
       var dataSet = [{
         id: '54735750e16638ba1eee59cb',
@@ -754,6 +752,29 @@ describe('JSON API Serializer', function () {
     });
   });
 
+  describe('Top level links with a single resource', function () {
+    it('should be set', function (done) {
+      var dataSet = {
+        id: '54735750e16638ba1eee59cb',
+        firstName: 'Sandro',
+        lastName: 'Munda',
+      };
+
+      var json = new JsonApiSerializer('users', dataSet, {
+        topLevelLinks: {
+          self: 'http://localhost:3000/api/users'
+        },
+        attributes: ['firstName', 'lastName'],
+      });
+
+      expect(json).to.have.property('links').eql({
+        self: 'http://localhost:3000/api/users'
+      });
+
+      done(null, json);
+    });
+  });
+
   describe('Top level links (Function)', function () {
     it('should be set', function (done) {
       var dataSet = [{