Merge pull request #178 from apiaryio/v2

Implements v2

Author: artem-zakharchenko

.eslintrc.js

@@ -10,6 +10,7 @@ module.exports = {
     'consistent-return': 'off',
     'class-methods-use-this': 'off',
     'no-plusplus': 'off',
+    'func-names': 'off',
 
     // Temporary overrides. Logic to be rewritten.
     // TODO https://github.com/apiaryio/gavel.js/issues/150

bin/gavel

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
+/* eslint-disable */
 
 var cmd = require('commander');
 var httpParser = require('http-string-parser');
 var curlParser = require('curl-trace-parser');
-var gavel = require('../lib/gavel');
+var gavel = require('../lib');
 var fs = require('fs');
 
 cmd.version('0.0.1');
@@ -23,29 +24,16 @@ process.stdin.on('end', function() {
 
     var realHttp = curlParser.parseBack(stdin);
 
-    var realRequest = httpParser.parseRequest(realHttp['request']);
-    var realResponse = httpParser.parseResponse(realHttp['response']);
+    var realRequest = httpParser.parseRequest(realHttp.request);
+    var realResponse = httpParser.parseResponse(realHttp.response);
 
-    var expectedRequest = httpParser.parseRequest(expectedHttp['request']);
-    var expectedResponse = httpParser.parseResponse(expectedHttp['response']);
+    var expectedRequest = httpParser.parseRequest(expectedHttp.request);
+    var expectedResponse = httpParser.parseResponse(expectedHttp.response);
 
-    var requestResult = false;
-    var responseResult = false;
+    const requestResult = gavel.validate(expectedRequest, realRequest);
+    const responseResult = gavel.validate(expectedResponse, realResponse);
 
-    gavel.isValid(realRequest, expectedRequest, 'request', function(
-      err,
-      result
-    ) {
-      requestResult = result;
-      gavel.isValid(realResponse, expectedResponse, 'response', function(
-        err,
-        result
-      ) {
-        responseResult = result;
-      });
-    });
-
-    if (requestResult && responseResult) {
+    if (requestResult.isValid && responseResult.isValid) {
       process.exit(0);
     } else {
       process.exit(1);

lib/gavel.js

@@ -0,0 +1,5 @@
+const { validate } = require('./validate');
+
+module.exports = {
+  validate
+};