Fix regex to match only lines starting with whitespace (#10)

Adds test; also updates travis to no longer test on unsupported node versions, and removes the test build output from the repository (and adds it to gitignore)

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-npm-debug.log
+npm-debug.log
+test/fixure/build

lib/index.js

@@ -37,34 +37,37 @@ function plugin(options) {
  if (!markdown(file)) { return; }
  var data = files[file],
  str = data.contents.toString(),
- end = /```(.*)/,
+ end = /^(\s*)```(.*)/m,
  remainder = str,
  pos = 0,
  endpos = 0,
  replacements = [];
 
  while (end.test(remainder)) {
- var match = remainder.match(end),
- candidate = match[1].trim(),
- lang = candidate.length > 0 ? candidate : null,
+ var match = end.exec(remainder),
+ candidate = match[2] && match[2].trim(),
+ lang = (candidate && candidate.length) > 0 ? candidate : null,
  prev = pos,
- buff = 3 + (lang ? match[1].length : 0);
+ buff = match[0].length,
+ leadingSpaceLength = match[1] ? match[1].length : 0;
 
  pos = pos + match.index + buff;
  remainder = str.substring(pos);
 
- var ends = remainder.match(end);
- if (ends === null || ends[0] === null) {
+ var ends = end.exec(remainder);
+ if (ends === null) {
  break;
  }
 
  endpos = ends.index;
- replacements.push(str.substring(prev, pos - buff));
+ replacements.push(str.substring(prev, pos - buff + leadingSpaceLength));
 
- remainder = str.substring(pos + endpos + 3);
+ var fencePrefixLength = (ends[1] ? ends[1].length : 0) + 3;
+ var nextPos = pos + endpos + fencePrefixLength;
+ remainder = str.substring(nextPos);
  var code = str.substring(pos, pos + endpos);
  code = code.trim('(\r\n|\n)');
- pos = pos + endpos + 3;
+ pos = nextPos;
  if (lang === null) {
  replacements.push('<pre><code class="hljs">' + hljs.highlightAuto(code).value + '</code></pre>');
  } else {
@@ -87,4 +90,4 @@ function plugin(options) {
  debug(files[file].contents.toString());
  });
  };
-}
+}

test/fixture/expected/embedded-markers.md

@@ -0,0 +1,8 @@
+The following syntax should work using this plugin:
+
+<pre><code class="hljs javascript"><span class="hljs-keyword">var</span> myCodeBlock = <span class="hljs-string">'```'</span> +
+ <span class="hljs-string">'some-code'</span> +
+ <span class="hljs-string">'```'</span>;
+done();</code></pre>
+
+And be a single js code block

test/fixture/src/embedded-markers.md

@@ -0,0 +1,10 @@
+The following syntax should work using this plugin:
+
+```javascript
+var myCodeBlock = '```' +
+ 'some-code' +
+ '```';
+done();
+```
+
+And be a single js code block

test/index.js

@@ -60,4 +60,19 @@ describe('metalsmith-metallic', function(){
  });
  });
  });
+
+ it('should handle embedded fences correctly', function(done){
+ fs.readFile('test/fixture/expected/embedded-markers.md', 'utf8', function (err,data) {
+ if (err) {
+ return console.log(err)
+ }
+ Metalsmith('test/fixture')
+ .use(metallic())
+ .build(function(err, files){
+ if (err) { return done(err); }
+ assert.equal(files['embedded-markers.md'].contents.toString(), data.toString());
+ done();
+ });
+ });
+ });
 });