Merge pull request #195 from strongloop/fix_generator_error

Fix generator prompt validate error

Author: 0candy

lib/helpers.js

@@ -74,7 +74,7 @@ exports.validateRemoteMethodName = function(name) {
     return 'Name cannot contain "." characters except' +
       ' the dot in "prototype." prefix';
   }
-  var result = exports.validateOptionalName(name, /[\/@\s\+%:]/);
+  var result = validateValue(name, /[\/@\s\+%:]/);
   if (result !== true) return result;
   if (RESERVED_PROPERTY_NAMES.indexOf(name) !== -1) {
     return name + ' is a reserved keyword. Please use another name';
@@ -92,7 +92,7 @@ exports.validateRequiredName = function (name) {
   if (!name) {
     return 'Name is required';
   }
-  return exports.validateOptionalName(name);
+  return validateValue(name, /[\/@\s\+%:\.]/);
 };
 
 /**
@@ -101,7 +101,11 @@ exports.validateRequiredName = function (name) {
  * @param {String} name The user input
  * @returns {String|Boolean}
  */
-exports.validateOptionalName = function (name, unallowedCharacters) {
+exports.validateOptionalName = function (name) {
+  return validateValue(name, /[\/@\s\+%:\.]/);
+};
+
+function validateValue(name, unallowedCharacters) {
   if (!unallowedCharacters) {
     unallowedCharacters = /[\/@\s\+%:\.]/;
   }
@@ -114,7 +118,7 @@ exports.validateOptionalName = function (name, unallowedCharacters) {
       'encodeURIComponent: ' + name;
   }
   return true;
-};
+}
 
 /**
  * Check if relation has a different name from properties