Merge pull request #268 from apiaryio/body-unparsable-json

Removes "jju", always uses JSON.parse() for expected/actual bodies

Author: artem-zakharchenko

README.md

@@ -8,9 +8,6 @@
   <a href="https://ci.appveyor.com/project/Apiary/gavel-js/branch/master" target="_blank">
     <img src="https://ci.appveyor.com/api/projects/status/0cpnaoakhs8q58tn/branch/master?svg=true" alt="Build Status" />
   </a>
-  <a href="https://coveralls.io/r/apiaryio/gavel.js?branch=master" target="_blank">
-    <img src="https://coveralls.io/repos/apiaryio/gavel.js/badge.svg?branch=master" alt="Coverage Status" />
-  </a>
   <a href="https://snyk.io/test/npm/gavel" target="_blank">
     <img src="https://snyk.io/test/npm/gavel/badge.svg" alt="Known Vulnerabilities" />
   </a>

lib/units/validateBody.js

@@ -70,6 +70,7 @@ function getBodyType(body, contentType, httpMessageOrigin) {
 
   try {
     parseJson(body);
+
     const bodyMediaType = parseContentType(
       hasJsonContentType ? contentType : 'application/json'
     );

lib/utils/parseJson.js

@@ -1,11 +1,12 @@
-const { parse } = require('jju/lib/parse');
-
+/**
+ * Parses JSON.
+ *
+ * Previously we've used jsonlint and jju for parsing. While we've stepped
+ * back to use plain JSON.parse(), we keep our doors open to switch the parser
+ * - which is the reason why this is abstracted into parseJson()
+ */
 const parseJson = (json, revivew) => {
-  try {
-    return parse(json, revivew);
-  } catch (error) {
-    throw error;
-  }
+  return JSON.parse(json, revivew);
 };
 
 module.exports = parseJson;

lib/utils/schema-v4-generator.js

@@ -1,4 +1,5 @@
 const getType = require('./get-type');
+const parseJson = require('./parseJson');
 
 const SCHEMA_VERSION = 'http://json-schema.org/draft-04/schema#';
 
@@ -30,7 +31,7 @@ class SchemaV4Generator {
    * @option {SchemaProperties} properties
    */
   constructor({ json, properties }) {
-    this.json = typeof json === 'string' ? JSON.parse(json) : json;
+    this.json = typeof json === 'string' ? parseJson(json) : json;
 
     this.schema = undefined;
     this.properties = properties || new SchemaV4Properties({});

lib/validators/json-schema.js

@@ -3,6 +3,7 @@ const deepEqual = require('deep-equal');
 const tv4 = require('tv4');
 const jsonPointer = require('json-pointer');
 
+const parseJson = require('../utils/parseJson');
 const metaSchemaV3 = require('../meta-schema-v3');
 const metaSchemaV4 = require('../meta-schema-v4');
 const errors = require('../errors');
@@ -89,7 +90,7 @@ class JsonSchema {
 
     if (typeof this.data === 'string') {
       try {
-        this.data = JSON.parse(this.data);
+        this.data = parseJson(this.data);
       } catch (error) {
         const outError = new errors.DataNotJsonParsableError(
           `JSON validator: body: ${error.message}`
@@ -101,7 +102,7 @@ class JsonSchema {
 
     if (typeof this.schema === 'string') {
       try {
-        this.schema = JSON.parse(this.schema);
+        this.schema = parseJson(this.schema);
       } catch (error) {
         const outError = new errors.SchemaNotJsonParsableError(
           `JSON validator: schema: ${error.message}`