Merge pull request #2 from mobilusoss/issue-1

close #1
mobilusoss · Nov 12, 2019 · b92def5 · b92def5
2 parents d82c204 + 2732eaa
commit b92def5
Show file tree

Hide file tree

Showing 16 changed files with 523 additions and 21 deletions.
diff --git a/index.js b/index.js
@@ -2,9 +2,9 @@
  * Module dependencies
  */
 
-var util = require('@sailshq/lodash');
+var util = require('lodash');
 var sanitize = require('validator').sanitize;
-var _ = require('@sailshq/lodash');
+var _ = require('lodash');
 
 
 

diff --git a/lib/match/errorFactory.js b/lib/match/errorFactory.js
@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('@sailshq/lodash');
+var _ = require('lodash');
 var util = require('util');
 
 
@@ -48,7 +48,7 @@ module.exports = function errorFactory(value, ruleName, keyName, customMessage)
         // Default to just saying 'Value' if we don't have the property name of the value.
         keyName ? ('`' + keyName + '`') : 'Value',
         // Adjust the article ("a" or "an") based on whether the next word starts with a vowel.
-        _.contains(['a','e','i','o','u'], ruleName[0]) ? 'n' : '',
+        _.includes(['a','e','i','o','u'], ruleName[0]) ? 'n' : '',
         // Output the name of the expected data type (e.g. "string" or "boolean").
         ruleName
       );
@@ -75,13 +75,13 @@ module.exports = function errorFactory(value, ruleName, keyName, customMessage)
         // Default to just saying 'Value' if we don't have the property name of the value.
         keyName ? ('`' + keyName + '`') : 'Value',
         // Adjust the article ("a" or "an") based on whether the next word starts with a vowel.
-        _.contains(['a','e','i','o','u'], ruleName[0]) ? 'n' : '',
+        _.includes(['a','e','i','o','u'], ruleName[0]) ? 'n' : '',
         // Output the name of the expected data type (e.g. "string" or "boolean").
         ruleName,
         // Output the actual value that was passed in here.
         stringifiedValue,
         // Adjust the article ("a" or "an") based on whether the next word starts with a vowel.
-        _.contains(['a','e','i','o','u'], actualType[0]) ? 'n' : '',
+        _.includes(['a','e','i','o','u'], actualType[0]) ? 'n' : '',
         // Output the type of the value that was passed in.
         actualType
       );

diff --git a/lib/match/matchRule.js b/lib/match/matchRule.js
@@ -3,7 +3,7 @@
  */
 
 var util = require('util');
-var _ = require('@sailshq/lodash');
+var _ = require('lodash');
 var rules = require('./rules');
 
 

diff --git a/lib/match/matchType.js b/lib/match/matchType.js
@@ -3,7 +3,7 @@
  */
 
 var util = require('util');
-var _ = require('@sailshq/lodash');
+var _ = require('lodash');
 var rules = require('./rules');
 var errorFactory = require('./errorFactory');
 

diff --git a/lib/match/rules.js b/lib/match/rules.js
@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var _ = require('@sailshq/lodash');
+var _ = require('lodash');
 var validator = require('validator');
 var geojsonhint = require('@mapbox/geojsonhint');