Tested against the DOI spec, closes #2

Author: RichardLitt

index.js

@@ -1,8 +1,20 @@
 'use strict';
 
+/**
+ * Parts of a DOI:
+ * Directory Identifier: 10
+ * Registrant code: . + [0-9]{4,}
+ * Registrant subdivision (optional): . + [0-9]+
+ * Suffix: / + any character, case insensitive for ASCII chars (but capitalised
+ * 	in the registry), with some characters that _should_ be escaped.
+ * 	Recommended encoding: "{}^[]`|\\&\/\'<>
+ * 	Mandatory encoding: %"#? (and space)
+ * From: http://www.doi.org/doi_handbook/2_Numbering.html#2.2
+ */
+
 // TODO Capture final segment for fragments
 // (\\.[a-zA-Z]{1}[0-9]{3})?
-var doiRegex = '(10[.][0-9]{4,}(?:[.][0-9]+)*/(?:(?!["&\/\'<>])\\S)+)'
+var doiRegex = '(10[.][0-9]{4,}(?:[.][0-9]+)*/(?:(?![%"#? ])\\S)+)'
 var doiTextPrefix = 'doi\\:'
 
 var doi = module.exports = function (opts) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "doi-regex",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Regular expression for matching DOIs",
   "main": "index.js",
   "scripts": {

readme.md

@@ -2,6 +2,17 @@
 
 > Regular expression for matching DOIs
 
+Parts of a DOI:
+ * Directory Identifier: 10
+ * Registrant code: . + [0-9]{4,}
+ * Registrant subdivision (optional): . + [0-9]+
+ * Suffix: / + any character, case insensitive for ASCII chars (but capitalised
+	in the registry), with some characters that _should_ be escaped
+	Recommended encoding: ```"{}^[]`|\\&\/\'<>```
+ 	Mandatory encoding: ```%"#? ```(and space)
+
+From: http://www.doi.org/doi_handbook/2_Numbering.html#2.2
+
 
 ## Install
 
@@ -62,18 +73,17 @@ Useful with `RegExp#test` to check if a string is an DOI.
 A CLI file has been provided. Run any of the examples provided above using your own DOI. For instance: 
 
 ```sh
-$ node cli-index.js -e `10.000/xyz1000`
-true
+$ node cli-index.js -e 10.000/xyz1000
+//=> true
 ```
 
-Run it without arguments to see all possible flags.
-
 Possible Flags:
 
 * `-e`, `--exact`	Find an exact match
 * `-d`, `--declared` 	Find a DOI with a 'doi:' prefix
 * `-m`, `--match`	Find all matches within the given string
 * `-g`, `--groups` Find the stripped DOI and any suffix it might have
+* `-h`, `--help` Display usage
 
 ## License
 

test.js

@@ -4,13 +4,17 @@ var _ = require('lodash')
 var doiRegex = require('./');
 
 var doi = [
-	'10.1371/journal.pone.0077056'
+	'10.0001/journal.pone.000001',
+	'10.0001/journal/pone.0011111',
+	'10.0001.112/journal.pone.0011021',
+	'10.0001/issn.10001'
 ];
 
 var doiNot = [
-	'10.1000//journal.pone.0011111',
 	'10..1000/journal.pone.0011111',
-	'1.1/1.1'
+	'1.1/1.1',
+	'10/134980',
+	'10.001/001#00'
 ];
 
 var doiDeclared = [