Merge pull request #26 from igorshubovych/replace-unhtml

Correctly process Unix redirect characters

Author: rprieto

lib/parser.js

@@ -1,13 +1,17 @@
 var _      = require('lodash');
 var marked = require('marked');
-var unhtml = require('unhtml');
+var S = require('string');
 
 var allElements = [
   'blockquote', 'html', 'strong', 'em', 'br', 'del',
   'heading', 'hr', 'image', 'link', 'list', 'listitem',
   'paragraph', 'strikethrough', 'table', 'tablecell', 'tablerow'
 ];
 
+function unhtml(text){
+  return S(text).unescapeHTML().stripTags().s;
+}
+
 exports.parse = function(markdown) {
 
   var page = {

package.json

@@ -44,7 +44,7 @@
     "ms": "~0.6.2",
     "request": "~2.44.0",
     "rimraf": "~2.2.6",
-    "unhtml": "~0.1.0",
+    "string": "^3.3.1",
     "unzip2": "^0.2.5",
     "wrench": "~1.5.8"
   },

test/parser.spec.js

@@ -112,4 +112,28 @@ describe('Parser', function() {
     page.examples[1].description.should.eql('example 2, see inline_cmd2 for details');
   });
 
+  it('should parse code examples with unix redirects ">", "<", ">>" and "<<<"', function() {
+    var page = parser.parse(
+      '\n- Concatenate several files into the target file.' +
+      '\n' +
+      '\n`cat {{file1}} {{file2}} > {{target-file}}`' +
+      '\n' +
+      '\n- Concatenate several files into the target file.' +
+      '\n' +
+      '\n`wc -l < {{users-file}}`' +
+      '\n' +
+      '\n- Output one file into the target file.' +
+      '\n' +
+      '\n`cat {{file}} >> {{target-file}}`' +
+      '\n' +
+      '\n- Calculate the result of expression' +
+      '\n' +
+      '\n`bc <<< "1 + 1"`'
+    );
+    page.examples[0].code.should.eql('cat {{file1}} {{file2}} > {{target-file}}');
+    page.examples[1].code.should.eql('wc -l < {{users-file}}');
+    page.examples[2].code.should.eql('cat {{file}} >> {{target-file}}');
+    page.examples[3].code.should.eql('bc <<< "1 + 1"');
+  });
+
 });