Merge branch 'release/v0.1.11'

.eslintrc

@@ -32,7 +32,7 @@
         "no-duplicate-case": 2,
         "no-else-return": 0,
         "no-empty": 2,
-        "no-empty-class": 2,
+        "no-empty-character-class": 2,
         "no-empty-label": 2,
         "no-eq-null": 0,
         "no-eval": 2,
@@ -42,7 +42,7 @@
         "no-extra-boolean-cast": 2,
         "no-extra-parens": 0,
         "no-extra-semi": 2,
-        "no-extra-strict": 2,
+        "strict": 2,
         "no-fallthrough": 2,
         "no-floating-decimal": 0,
         "no-func-assign": 2,
@@ -108,7 +108,6 @@
         "no-var": 0,
         "no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
         "no-with": 2,
-        "no-wrap-func": 2,
 
         "block-scoped-var": 0,
         "brace-style": [0, "1tbs"],
@@ -172,4 +171,4 @@
         "wrap-regex": 0,
         "yoda": [2, "never"]
     }
-}
+}

es5/lib/jsonApiModelFormatter.js

@@ -11,13 +11,17 @@ var _dovima = require("dovima");
 
 var _dovima2 = _interopRequireDefault(_dovima);
 
+var _jargon = require("jargon");
+
+var _jargon2 = _interopRequireDefault(_jargon);
+
 function convertModel(model) {
 	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
 		return {
-			type: model.constructor.name,
+			type: (0, _jargon2["default"])(model.constructor.name).camel.toString(),
 			id: id,
 			attributes: attributes
 		};

es5/spec/jsonApiModelFormatter.spec.js

@@ -40,7 +40,7 @@ describe("jsonApiModelFormatter", function () {
 	});
 
 	it("should add the model type to the root", function () {
-		(0, _libJsonApiModelFormatterJs2["default"])(user).type.should.equal("User");
+		(0, _libJsonApiModelFormatterJs2["default"])(user).type.should.equal("user");
 	});
 
 	it("should add the model id to the root", function () {

es6/lib/jsonApiModelFormatter.js

@@ -1,5 +1,5 @@
 import Model from "dovima";
-import {Collection} from "dovima";
+import inflect from "jargon";
 
 function convertModel(model) {
 	if((model && typeof (model.toJSON) === "function")
@@ -8,7 +8,7 @@ function convertModel(model) {
 		const id = attributes.id;
 		delete attributes.id; //so it's just on the root
 		return {
-			type: model.constructor.name,
+			type: inflect(model.constructor.name).camel.toString(),
 			id: id,
 			attributes: attributes
 		};

es6/spec/jsonApiModelFormatter.spec.js

@@ -13,7 +13,7 @@ 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", () => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsonapi-model-formatter",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "JSON API formatter for dovima models.",
   "main": "index.js",
   "scripts": {
@@ -33,8 +33,9 @@
     "url": "https://github.com/FreeAllMedia/jsonapi-model-formatter/issues"
   },
   "homepage": "https://github.com/FreeAllMedia/jsonapi-model-formatter",
-	"dependencies": {
-    "dovima": "^0.3.0"
+  "dependencies": {
+    "dovima": "^0.3.0",
+    "jargon": "^0.1.22"
   },
   "devDependencies": {
     "babel": "^5.5.6",