.gitignore

@@ -10,4 +10,5 @@ coverage.html
 .idea
 lib-cov
 
-node_modules
+node_modules
+.nyc_output

.travis.yml

@@ -1,7 +1,6 @@
 language: node_js
-before_install:
-- npm install -g npm@latest
 sudo: false
 node_js:
-  - "0.8"
-  - "0.10"
+  - "6"
+  - "7"
+  - "4"

npm-user-validate.js

@@ -1,19 +1,24 @@
 exports.email = email
 exports.pw = pw
 exports.username = username
-
 var requirements = exports.requirements = {
   username: {
     length: 'Name length must be less than or equal to 214 characters long',
     lowerCase: 'Name must be lowercase',
     urlSafe: 'Name may not contain non-url-safe chars',
-    dot: 'Name may not start with "."'
+    dot: 'Name may not start with "."',
+    illegal: 'Name may not contain illegal character'
   },
   password: {},
   email: {
+    length: 'Email length must be less then or equal to 254 characters long',
     valid: 'Email must be an email address'
   }
-};
+}
+
+var illegalCharacterRe = new RegExp('([' + [
+  "'"
+].join() + '])')
 
 function username (un) {
   if (un !== un.toLowerCase()) {
@@ -32,11 +37,19 @@ function username (un) {
     return new Error(requirements.username.length)
   }
 
+  var illegal = un.match(illegalCharacterRe)
+  if (illegal) {
+    return new Error(requirements.username.illegal + ' "' + illegal[0] + '"')
+  }
+
   return null
 }
 
 function email (em) {
-  if (!em.match(/^.+@.+\..+$/)) {
+  if (em.length > 254) {
+    return new Error(requirements.email.length)
+  }
+  if (!em.match(/^[^@]+@.+\..+$/)) {
     return new Error(requirements.email.valid)
   }
 

package.json

@@ -1,13 +1,16 @@
 {
   "name": "npm-user-validate",
-  "version": "0.1.5",
+  "version": "1.0.1",
   "description": "User validations for npm",
   "main": "npm-user-validate.js",
   "devDependencies": {
-    "tap": "^1.2.0"
+    "standard": "^8.4.0",
+    "standard-version": "^3.0.0",
+    "tap": "^7.1.2"
   },
   "scripts": {
-    "test": "tap test/*.js"
+    "pretest": "standard",
+    "test": "tap --100 test/*.js"
   },
   "repository": {
     "type": "git",
@@ -19,5 +22,8 @@
     "registry"
   ],
   "author": "Robert Kowalski <rok@kowalski.gd>",
-  "license": "BSD-2-Clause"
+  "license": "BSD-2-Clause",
+  "files": [
+    "npm-user-validate.js"
+  ]
 }

test/email.test.js

@@ -2,25 +2,32 @@ var test = require('tap').test
 var v = require('../npm-user-validate.js').email
 
 test('email misses an @', function (t) {
-  err = v('namedomain')
+  var err = v('namedomain')
+  t.type(err, 'object')
+  t.end()
+})
+
+test('email is longer then 254 characters', function (t) {
+  var str = '@'.repeat(255)
+  var err = v(str)
   t.type(err, 'object')
   t.end()
 })
 
 test('email misses a dot', function (t) {
-  err = v('name@domain')
+  var err = v('name@domain')
   t.type(err, 'object')
   t.end()
 })
 
 test('email misses a string before the @', function (t) {
-  err = v('@domain')
+  var err = v('@domain')
   t.type(err, 'object')
   t.end()
 })
 
 test('email is ok', function (t) {
-  err = v('name@domain.com')
+  var err = v('name@domain.com')
   t.type(err, 'null')
   t.end()
-})
+})

test/pw.test.js

@@ -2,31 +2,31 @@ var test = require('tap').test
 var v = require('../npm-user-validate.js').pw
 
 test('pw contains a \'', function (t) {
-  err = v('\'')
+  var err = v('\'')
   t.type(err, 'null')
   t.end()
 })
 
 test('pw contains a :', function (t) {
-  err = v(':')
+  var err = v(':')
   t.type(err, 'null')
   t.end()
 })
 
 test('pw contains a @', function (t) {
-  err = v('@')
+  var err = v('@')
   t.notOk(err, 'null')
   t.end()
 })
 
 test('pw contains a "', function (t) {
-  err = v('"')
+  var err = v('"')
   t.type(err, 'null')
   t.end()
 })
 
 test('pw is ok', function (t) {
-  err = v('duck')
+  var err = v('duck')
   t.type(err, 'null')
   t.end()
 })

test/username.test.js

@@ -15,6 +15,13 @@ test('username may not contain non-url-safe chars', function (t) {
   t.end()
 })
 
+test('username may not contain illegal characters', function (t) {
+  var err = v("ben's")
+  t.type(err, 'object')
+  t.match(err.message, /illegal character "'"/)
+  t.end()
+})
+
 test('username may not start with "."', function (t) {
   var err = v('.username')
   t.type(err, 'object')
@@ -27,13 +34,13 @@ test('username may not be longer than 214 characters', function (t) {
   t.type(err, 'object')
   t.match(err.message, /less than or equal to 214/)
   t.end()
-});
+})
 
 test('username may be as long as 214 characters', function (t) {
   var err = v('bacon-ipsum-dolor-amet-tongue-short-loin-landjaeger-tenderloin-ball-tip-pork-loin-porchetta-pig-pork-chop-beef-ribs-pork-belly--shankle-t-bone-turducken-tongue-landjaeger-pork-loin-beef-chicken-short-loin-porchetta')
   t.type(err, 'null')
   t.end()
-});
+})
 
 test('username is ok', function (t) {
   var err = v('ente')