fix(validator): convert message field to snake_case

all rules are referenced as snake_case wherease their corresponding messages are saved as camelCase

Closes #76

Author: thetutlage

src/Parser/index.js

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
 */
 
-const snakeCaseRegex = /_(\w)/g
 const arrayExpressionRegex = /(\w[^\.\*]+)(\.\*\.?)(.+)?/
 const _ = require('lodash')
 
@@ -61,19 +60,6 @@ Parser.parse = function (validations) {
   return _parseValidations(validationsArray)
 }
 
-/**
- * convert a snake case string to camelcase.
- *
- * @param  {String} string
- *
- * @return {String}
- */
-Parser.toCamelCase = function (string) {
-  return string.replace(snakeCaseRegex, function (m, $1) {
-    return $1.toUpperCase()
-  })
-}
-
 /**
  * parses an array expression to a consumable object
  *
@@ -90,7 +76,6 @@ Parser.expressionCurryFor = function (field, whenMatched, otherwise) {
   return whenMatched(expression[1], expression[3])
 }
 
-
 /**
  * parses a rule and returns an object with
  * field name and parsed rule.

src/Sanitization/index.js

@@ -27,7 +27,7 @@ const filters = require('./filters')
  * @private
  */
 function _getSanitizationMethod (filter) {
-  return _.get(filters, Parser.toCamelCase(filter), function () {
+  return _.get(filters, _.camelCase(filter), function () {
     throw new Error(`${filter} is not defined as a filter`)
   })
 }

src/Validator/engine.js

@@ -10,7 +10,6 @@
 */
 
 const Validations = require('../Validations')
-const Parser = require('../Parser')
 const Messages = require('../Messages')
 const _ = require('lodash')
 const Q = require('q')
@@ -74,7 +73,7 @@ ValidationEngine.runValidationOnField = function (data, field, validation, messa
  * @throws {Error} If validation is not found
  */
 ValidationEngine.getValidationMethod = function (validation) {
-  return _.get(Validations, Parser.toCamelCase(validation), function () {
+  return _.get(Validations, _.camelCase(validation), function () {
     throw new Error(`${validation} is not defined as a validation`)
   })
 }

src/Validator/index.js

@@ -122,7 +122,7 @@ Validator.extend = function (name, method, message) {
     throw new Error('Invalid arguments, extend expects a method to execute')
   }
   Validations[name] = method
-  Messages.set(name, message)
+  Messages.set(_.snakeCase(name), message)
 }
 
 Validator.is = require('../Raw')

test/parser.spec.js

@@ -122,22 +122,4 @@ describe('Parser', function() {
     const parsed = {password:Parser.parse(rules.password)}
     expect(parsed).deep.equal(parsedRules)
   })
-
-  //////////////////
-  // test suite 5 //
-  //////////////////
-  it('should convert snake case values to camelcase', function () {
-    const rule = 'alpha_numeric'
-    const convertedRule = Parser.toCamelCase(rule)
-    expect(convertedRule).to.equal('alphaNumeric')
-  })
-
-  //////////////////
-  // test suite 6 //
-  //////////////////
-  it('should convert multiple snake case values to camelcase', function () {
-    const rule = 'before_offset_of'
-    const convertedRule = Parser.toCamelCase(rule)
-    expect(convertedRule).to.equal('beforeOffsetOf')
-  })
 })

test/validator.spec.js

@@ -746,4 +746,27 @@ describe('Validator', function() {
     const passed = yield Validator.validate(data, rules)
     expect(passed).deep.equal(data)
   })
+
+  it('should be able to add it\'s own validation messages to validation store', function * () {
+    const phone = function (data, field, message, args, get) {
+      return new Promise(function (resolve, reject) {
+        reject(message)
+      })
+    }
+    Validator.extend('isPhone', phone, 'Enter valid phone number')
+
+    const rules = {
+      contact_no: 'is_phone'
+    }
+    const body = {}
+
+    try {
+      const validated = yield Validator.validate(body, rules)
+      expect(validated).not.to.exist()
+    } catch (e) {
+      expect(e).to.be.an('array')
+      expect(e[0].validation).to.equal('is_phone')
+      expect(e[0].message).to.equal('Enter valid phone number')
+    }
+  })
 })