Merge branch 'hotfix/fix_instanceOf' into develop

es5/lib/jsonApiModelFormatter.js

@@ -12,8 +12,7 @@ var _dovima = require("dovima");
 var _dovima2 = _interopRequireDefault(_dovima);
 
 function convertModel(model) {
-	//HACK: this is a temporal hack to work around version issues with dovima
-	if (model && typeof model.toJSON === "function" && model.constructor.name === "Model" || model instanceof _dovima2["default"]) {
+	if (model && typeof model.toJSON === "function" || model instanceof _dovima2["default"]) {
 		var attributes = model.toJSON();
 		var id = attributes.id;
 		delete attributes.id; //so it's just on the root
@@ -28,7 +27,7 @@ function convertModel(model) {
 }
 
 function JsonApiModelFormatter(models) {
-	if (Array.isArray(models) || models.constructor.name === "Array"
+	if (Array.isArray(models) || models && models.length >= 0
 	//HACK: this is a temporal hack to work around version issues with dovima
 	 || models.constructor.name === "Collection") {
 		return models.map(convertModel);

es5/spec/jsonApiModelFormatter.spec.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
 var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -62,4 +64,45 @@ describe("jsonApiModelFormatter", function () {
 			(0, _libJsonApiModelFormatterJs2["default"])(userAttributes);
 		}).should["throw"]("The object provided to be formatted as json is not a dovima Model / Collection.");
 	});
+
+	describe("function object conflicts", function () {
+		it("should work correctly if the object has a toJSON function", function () {
+			var result = "some result";
+
+			var Apple = (function () {
+				function Apple() {
+					_classCallCheck(this, Apple);
+				}
+
+				_createClass(Apple, [{
+					key: "toJSON",
+					value: function toJSON() {
+						return result;
+					}
+				}]);
+
+				return Apple;
+			})();
+
+			var apple = new Apple();
+			(0, _libJsonApiModelFormatterJs2["default"])(apple).attributes.should.equal(result);
+		});
+
+		it("should work correctly with a unknown collection that extends the array", function () {
+			var Apples = (function (_Array) {
+				function Apples() {
+					_classCallCheck(this, Apples);
+
+					_get(Object.getPrototypeOf(Apples.prototype), "constructor", this).apply(this, arguments);
+				}
+
+				_inherits(Apples, _Array);
+
+				return Apples;
+			})(Array);
+
+			var apples = new Apples();
+			(0, _libJsonApiModelFormatterJs2["default"])(apples).should.eql([]);
+		});
+	});
 });

es6/lib/jsonApiModelFormatter.js

@@ -2,8 +2,7 @@ import Model from "dovima";
 import {Collection} from "dovima";
 
 function convertModel(model) {
-	//HACK: this is a temporal hack to work around version issues with dovima
-	if((model && typeof (model.toJSON) === "function" && model.constructor.name === "Model")
+	if((model && typeof (model.toJSON) === "function")
 		|| model instanceof Model) {
 		let attributes = model.toJSON();
 		const id = attributes.id;
@@ -20,7 +19,7 @@ function convertModel(model) {
 
 export default function JsonApiModelFormatter(models) {
 	if(Array.isArray(models)
-		|| (models.constructor.name === "Array")
+		|| (models && models.length >= 0)
 		//HACK: this is a temporal hack to work around version issues with dovima
 		|| (models.constructor.name === "Collection")) {
 		return models.map(convertModel);

es6/spec/jsonApiModelFormatter.spec.js

@@ -37,4 +37,25 @@ describe("jsonApiModelFormatter", () => {
 			jsonApiModelFormatter(userAttributes);
 		}.should.throw("The object provided to be formatted as json is not a dovima Model / Collection.");
 	});
+
+	describe("function object conflicts", () => {
+		it("should work correctly if the object has a toJSON function", () => {
+			const result = "some result";
+			class Apple {
+				toJSON() {
+					return result;
+				}
+			}
+
+			const apple = new Apple();
+			jsonApiModelFormatter(apple).attributes.should.equal(result);
+		});
+
+		it("should work correctly with a unknown collection that extends the array", () => {
+			class Apples extends Array {}
+
+			const apples = new Apples();
+			jsonApiModelFormatter(apples).should.eql([]);
+		});
+	});
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsonapi-model-formatter",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "JSON API formatter for dovima models.",
   "main": "index.js",
   "scripts": {