Added protocol path catcher

Author: RichardLitt

cli-index.js

@@ -7,6 +7,7 @@ var argv = require('minimist')(process.argv.slice(2), {
         e: 'exact',
         d: 'declared',
         m: 'match',
+        r: 'resolvePath',
         g: 'groups',
         h: 'help'
     },
@@ -19,13 +20,16 @@ if (argv.h) {
   'Options: \n' +
   '-e, --exact  Find an exact match \n' +
   '-d, --declared   Find a DOI with a `doi:` prefix\n' +
+  '-r, --resolvePath  Find a DOI with a `https://dx.doi.org` prefix\n' +
   '-m, --match  Find all matches within the given string\n' +
   '-g, --groups  Find matches with groupings for extra suffixes')
   process.exit(-1)
 }
 
 var doi = (argv.doi || argv._[0])
 
+// TODO This is not the best way to do this.
+
 if (argv.m) {
   console.log(doi.match(doiRegex()))
   process.exit(-1)
@@ -37,10 +41,14 @@ if (argv.m) {
 if (argv.e && argv.d) {
   console.log('Is this a declared DOI',
     doiRegex.declared({exact: true}).test(doi))
-} else if (argv.e && !argv.d) {
+} else if (argv.e && !argv.d && !argv.r) {
   console.log('Is this a DOI?', doiRegex({exact: true}).test(doi))
 } else if (!argv.e && argv.d) {
   console.log('Is the DOI declared?', doiRegex.declared().test(doi))
+} else if (!argv.e && !argv.d && argv.r) {
+  console.log('Is the DOI declared with an optional path?', doiRegex.resolvePath().test(doi))
+} else if (argv.e && !argv.d && argv.r) {
+  console.log('Is the DOI declared with an mandatory path?', doiRegex.resolvePath({protocol: true}).test(doi))
 } else {
   console.log('Does a DOI exist?', doiRegex().test(doi))
 }

coverage/coverage.json

@@ -18,16 +18,16 @@
     <h1>Code coverage report for <span class="entity">doi-regex/</span></h1>
     <h2>
 
-        Statements: <span class="metric">95% <small>(19 / 20)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Statements: <span class="metric">95.65% <small>(22 / 23)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Branches: <span class="metric">85.71% <small>(12 / 14)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Branches: <span class="metric">88.89% <small>(16 / 18)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Functions: <span class="metric">100% <small>(4 / 4)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Functions: <span class="metric">100% <small>(5 / 5)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Lines: <span class="metric">100% <small>(19 / 19)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Lines: <span class="metric">100% <small>(22 / 22)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
         Ignored: <span class="metric"><span class="ignore-none">none</span></span> &nbsp;&nbsp;&nbsp;&nbsp;
     </h2>
@@ -52,23 +52,23 @@ <h2>
 </thead>
 <tbody><tr>
 	<td class="file high" data-value="index.js"><a href="index.js.html">index.js</a></td>
-	<td data-value="95" class="pic high"><span class="cover-fill" style="width: 95px;"></span><span class="cover-empty" style="width:5px;"></span></td>
-	<td data-value="95" class="pct high">95%</td>
-	<td data-value="20" class="abs high">(19&nbsp;/&nbsp;20)</td>
-	<td data-value="85.71" class="pct high">85.71%</td>
-	<td data-value="14" class="abs high">(12&nbsp;/&nbsp;14)</td>
+	<td data-value="95.65" class="pic high"><span class="cover-fill" style="width: 95px;"></span><span class="cover-empty" style="width:5px;"></span></td>
+	<td data-value="95.65" class="pct high">95.65%</td>
+	<td data-value="23" class="abs high">(22&nbsp;/&nbsp;23)</td>
+	<td data-value="88.89" class="pct high">88.89%</td>
+	<td data-value="18" class="abs high">(16&nbsp;/&nbsp;18)</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="4" class="abs high">(4&nbsp;/&nbsp;4)</td>
+	<td data-value="5" class="abs high">(5&nbsp;/&nbsp;5)</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="19" class="abs high">(19&nbsp;/&nbsp;19)</td>
+	<td data-value="22" class="abs high">(22&nbsp;/&nbsp;22)</td>
 	</tr>
 
 </tbody>
 </table>
 </div>
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Mar 07 2015 21:10:48 GMT-0800 (PST)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Oct 02 2015 13:30:28 GMT-0400 (EDT)</div>
 </div>
 
 <script src="../prettify.js"></script>

coverage/lcov-report/doi-regex/index.html

@@ -18,16 +18,16 @@
     <h1>Code coverage report for <span class="entity">doi-regex/index.js</span></h1>
     <h2>
 
-        Statements: <span class="metric">95% <small>(19 / 20)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Statements: <span class="metric">95.65% <small>(22 / 23)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Branches: <span class="metric">85.71% <small>(12 / 14)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Branches: <span class="metric">88.89% <small>(16 / 18)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Functions: <span class="metric">100% <small>(4 / 4)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Functions: <span class="metric">100% <small>(5 / 5)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Lines: <span class="metric">100% <small>(19 / 19)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Lines: <span class="metric">100% <small>(22 / 22)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
         Ignored: <span class="metric"><span class="ignore-none">none</span></span> &nbsp;&nbsp;&nbsp;&nbsp;
     </h2>
@@ -84,7 +84,13 @@ <h2>
 47
 48
 49
-50</td><td class="line-coverage"><span class="cline-any cline-neutral">&nbsp;</span>
+50
+51
+52
+53
+54
+55
+56</td><td class="line-coverage"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -133,7 +139,13 @@ <h2>
 <span class="cline-any cline-yes">7</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">'use strict';
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1</span>
+<span class="cline-any cline-yes">7</span>
+<span class="cline-any cline-yes">7</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">'use strict'
 &nbsp;
 /**
  * Parts of a DOI:
@@ -177,17 +189,23 @@ <h2>
   return match
 }
 &nbsp;
-doi.declared = function(opts) {
+doi.declared = function (opts) {
   opts = opts || {}
   return opts.exact ? new RegExp('^' + doiTextPrefix + doiRegex + '$') :
                       new RegExp(doiTextPrefix + doiRegex, 'g')
 }
+&nbsp;
+doi.resolvePath = function (opts) {
+  opts = opts || {}
+  return opts.protocol ? new RegExp('^http(s)?\\://dx\\.doi\\.org/' + doiRegex + '$') :
+    new RegExp('^(http(s)?\\://)?dx\\.doi\\.org/' + doiRegex + '$')
+}
 &nbsp;</pre></td></tr>
 </table></pre>
 
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Mar 07 2015 21:10:48 GMT-0800 (PST)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Oct 02 2015 13:30:28 GMT-0400 (EDT)</div>
 </div>
 
 <script src="../prettify.js"></script>

coverage/lcov-report/doi-regex/index.js.html

@@ -18,16 +18,16 @@
     <h1>Code coverage report for <span class="entity">doi-regex/spec/</span></h1>
     <h2>
 
-        Statements: <span class="metric">100% <small>(50 / 50)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Statements: <span class="metric">100% <small>(68 / 68)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
         Branches: <span class="metric">50% <small>(1 / 2)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Functions: <span class="metric">100% <small>(21 / 21)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Functions: <span class="metric">100% <small>(28 / 28)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Lines: <span class="metric">100% <small>(50 / 50)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Lines: <span class="metric">100% <small>(68 / 68)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
         Ignored: <span class="metric"><span class="ignore-none">none</span></span> &nbsp;&nbsp;&nbsp;&nbsp;
     </h2>
@@ -54,21 +54,21 @@ <h2>
 	<td class="file high" data-value="test.js"><a href="test.js.html">test.js</a></td>
 	<td data-value="100" class="pic high"><span class="cover-fill cover-full" style="width: 100px;"></span><span class="cover-empty" style="width:0px;"></span></td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="50" class="abs high">(50&nbsp;/&nbsp;50)</td>
+	<td data-value="68" class="abs high">(68&nbsp;/&nbsp;68)</td>
 	<td data-value="50" class="pct medium">50%</td>
 	<td data-value="2" class="abs medium">(1&nbsp;/&nbsp;2)</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="21" class="abs high">(21&nbsp;/&nbsp;21)</td>
+	<td data-value="28" class="abs high">(28&nbsp;/&nbsp;28)</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="50" class="abs high">(50&nbsp;/&nbsp;50)</td>
+	<td data-value="68" class="abs high">(68&nbsp;/&nbsp;68)</td>
 	</tr>
 
 </tbody>
 </table>
 </div>
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Mar 07 2015 21:10:48 GMT-0800 (PST)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Oct 02 2015 13:30:28 GMT-0400 (EDT)</div>
 </div>
 
 <script src="../../prettify.js"></script>