json api model adaptation to new usage

es5/lib/jsonApiModelFormatter.js

@@ -11,17 +11,26 @@ var _dovima = require("dovima");
 
 var _dovima2 = _interopRequireDefault(_dovima);
 
-function JsonApiModelFormatter(model) {
+function convertModel(model) {
 	if (model instanceof _dovima2["default"]) {
-		var attributes = model.attributes;
+		var attributes = model.toJSON();
+		var id = attributes.id;
 		delete attributes.id; //so it's just on the root
 		return {
 			type: model.constructor.name,
-			id: model.id,
+			id: id,
 			attributes: attributes
 		};
 	} else {
-		throw new Error("The object provided to be formatted as json is not a model.");
+		throw new Error("The object provided to be formatted as json is not a dovima Model / Collection.");
+	}
+}
+
+function JsonApiModelFormatter(models) {
+	if (Array.isArray(models) || models instanceof _dovima.Collection) {
+		return models.map(convertModel);
+	} else {
+		return convertModel(models);
 	}
 }
 

es5/spec/jsonApiModelFormatter.spec.js

@@ -16,7 +16,7 @@ var _dovima = require("dovima");
 
 var _dovima2 = _interopRequireDefault(_dovima);
 
-describe("JsonApiModelFormatter", function () {
+describe("jsonApiModelFormatter", function () {
 	var User = (function (_Model) {
 		function User() {
 			_classCallCheck(this, User);
@@ -51,9 +51,15 @@ describe("JsonApiModelFormatter", function () {
 		(0, _libJsonApiModelFormatterJs2["default"])(user).attributes.should.eql(jsonApiUserAttributes);
 	});
 
+	it("should support a model array", function () {
+		var jsonApiUserAttributes = userAttributes;
+		delete jsonApiUserAttributes.id;
+		(0, _libJsonApiModelFormatterJs2["default"])([user])[0].attributes.should.eql(jsonApiUserAttributes);
+	});
+
 	it("should throw an exception if the provided object is not an instance of Model", function () {
 		(function () {
 			(0, _libJsonApiModelFormatterJs2["default"])(userAttributes);
-		}).should["throw"]("The object provided to be formatted as json is not a model.");
+		}).should["throw"]("The object provided to be formatted as json is not a dovima Model / Collection.");
 	});
 });

es6/lib/jsonApiModelFormatter.js

@@ -1,15 +1,25 @@
 import Model from "dovima";
+import {Collection} from "dovima";
 
-export default function JsonApiModelFormatter(model) {
+function convertModel(model) {
 	if(model instanceof Model) {
-		let attributes = model.attributes;
+		let attributes = model.toJSON();
+		const id = attributes.id;
 		delete attributes.id; //so it's just on the root
 		return {
 			type: model.constructor.name,
-			id: model.id,
+			id: id,
 			attributes: attributes
 		};
 	} else {
-		throw new Error(`The object provided to be formatted as json is not a model.`);
+		throw new Error(`The object provided to be formatted as json is not a dovima Model / Collection.`);
+	}
+}
+
+export default function JsonApiModelFormatter(models) {
+	if(Array.isArray(models) || (models instanceof Collection)) {
+		return models.map(convertModel);
+	} else {
+		return convertModel(models);
 	}
 }

es6/spec/jsonApiModelFormatter.spec.js

@@ -1,7 +1,7 @@
-import JsonApiModelFormatter from "../lib/jsonApiModelFormatter.js";
+import jsonApiModelFormatter from "../lib/jsonApiModelFormatter.js";
 import Model from "dovima";
 
-describe("JsonApiModelFormatter", () => {
+describe("jsonApiModelFormatter", () => {
 	class User extends Model {}
 
 	let user,
@@ -13,22 +13,28 @@ describe("JsonApiModelFormatter", () => {
 	});
 
 	it("should add the model type to the root", () => {
-		JsonApiModelFormatter(user).type.should.equal("User");
+		jsonApiModelFormatter(user).type.should.equal("User");
 	});
 
 	it("should add the model id to the root", () => {
-		JsonApiModelFormatter(user).id.should.equal(user.id);
+		jsonApiModelFormatter(user).id.should.equal(user.id);
 	});
 
 	it("should add the model's attributes on the attributes element", () => {
 		let jsonApiUserAttributes = userAttributes;
 		delete jsonApiUserAttributes.id;
-		JsonApiModelFormatter(user).attributes.should.eql(jsonApiUserAttributes);
+		jsonApiModelFormatter(user).attributes.should.eql(jsonApiUserAttributes);
+	});
+
+	it("should support a model array", () => {
+		let jsonApiUserAttributes = userAttributes;
+		delete jsonApiUserAttributes.id;
+		jsonApiModelFormatter([user])[0].attributes.should.eql(jsonApiUserAttributes);
 	});
 
 	it("should throw an exception if the provided object is not an instance of Model", () => {
 		() => {
-			JsonApiModelFormatter(userAttributes);
-		}.should.throw("The object provided to be formatted as json is not a model.");
+			jsonApiModelFormatter(userAttributes);
+		}.should.throw("The object provided to be formatted as json is not a dovima Model / Collection.");
 	});
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsonapi-model-formatter",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "JSON API formatter for dovima models.",
   "main": "index.js",
   "scripts": {
@@ -38,20 +38,22 @@
   },
   "devDependencies": {
     "babel": "^5.5.6",
+    "babel-eslint": "^3.1.26",
     "chai": "^3.0.0",
     "coveralls": "^2.11.2",
+    "eslint": "^0.24.1",
     "gulp": "^3.9.0",
     "gulp-babel": "^5.1.0",
     "gulp-istanbul": "^0.10.0",
     "gulp-mocha": "^2.1.1",
     "karma": "^0.12.36",
     "karma-browserify": "^4.2.1",
     "karma-chai": "^0.1.0",
-    "karma-mocha": "^0.1.10",
-    "karma-detect-browsers": "^2.0.0",
     "karma-chrome-launcher": "^0.2.0",
+    "karma-detect-browsers": "^2.0.0",
     "karma-firefox-launcher": "^0.1.6",
     "karma-ie-launcher": "^0.2.0",
+    "karma-mocha": "^0.1.10",
     "karma-phantomjs-launcher": "^0.2.0",
     "karma-safari-launcher": "^0.1.1",
     "karma-sauce-launcher": "^0.2.11",