change keywords names

epoberezkin · epoberezkin · commit b2b79301e602 · 2016-02-15T19:03:36.000Z
diff --git a/lib/evaluation_keywords.js b/lib/evaluation_keywords.js
@@ -6,7 +6,7 @@ var definitions = getFile('definitions.def');
 
 module.exports = {
   inlineInstruction: getJst('instruction_keyword'),
-  thenValidate: getJst('then_validate'),
+  validateAsync: getJst('validate_async'),
   itemsSerial: getJst('items_serial')
 };
 
diff --git a/lib/jsonscript.js b/lib/jsonscript.js
@@ -72,10 +72,10 @@ function addExecutor(name, executor) {
 
 function addAjvKeywords() {
   var self = this;
-  addAjvKeyword.call(this, 'thenValidate', undefined);
+  addAjvKeyword.call(this, 'validateAsync', undefined);
   addAjvKeyword.call(this, 'itemsSerial', 'array');
-  this._evalKeywords.objectToPromise = util.objectToPromise;
-  addAjvKeyword.call(this, 'objectToPromise', 'object', true);
+  this._evalKeywords.objectToAsync = util.objectToPromise;
+  addAjvKeyword.call(this, 'objectToAsync', 'object', true);
 }
 
 
diff --git a/lib/jst/validate_async.jst b/lib/jst/validate_async.jst
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsonscript-js",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "JavaScript interpreter for JSONScript",
   "main": "lib/jsonscript.js",
   "scripts": {
@@ -26,7 +26,7 @@
   "dependencies": {
     "ajv": "^3.6.2",
     "dot": "^1.0.3",
-    "jsonscript": "^0.1.1"
+    "jsonscript": "^0.1.2"
   },
   "devDependencies": {
     "istanbul": "^0.4.2",
diff --git a/spec/evaluation_keywords.spec.js b/spec/evaluation_keywords.spec.js
@@ -12,14 +12,14 @@ describe('evaluation keywords', function() {
     js = JSONScript();
   });
 
-  describe('keyword thenValidate', function() {
+  describe('keyword validateAsync', function() {
     var validate;
 
     beforeEach(function() {
       var schema = {
         properties: {
           foo: {
-            thenValidate: {
+            validateAsync: {
               type: 'string'
             }
           }
@@ -70,13 +70,13 @@ describe('evaluation keywords', function() {
   });
 
 
-  describe('keyword objectToPromise', function() {
+  describe('keyword objectToAsync', function() {
     var validate;
 
     beforeEach(function() {
       var schema = {
         properties: {
-          obj: { objectToPromise: true }
+          obj: { objectToAsync: true }
         }
       };
 
@@ -115,7 +115,7 @@ describe('evaluation keywords', function() {
       var schema = {
         properties: {
           arr: {
-            itemsSerial: { objectToPromise: true }
+            itemsSerial: { objectToAsync: true }
           }
         }
       };
@@ -143,7 +143,7 @@ describe('evaluation keywords', function() {
       var schema = {
         properties: {
           arr: {
-            objectToPromise: true,
+            objectToAsync: true,
             itemsSerial: { $ref: '#/properties/arr' }
           }
         }
