From 83445398fb0d76a26cf1a803a0ca3f43ea3e4b2c Mon Sep 17 00:00:00 2001 From: "xohozu (Ching-Hua Hung)" Date: Thu, 19 Mar 2015 11:32:28 +0800 Subject: [PATCH 1/2] fix issue#63: make dependency `markit` upgrade to 0.2.0 and fixed post title parsing problem `markit` v0.2.0 does generate head tag code snippet with id attribute which leads to `html.match(/

(.*?)<\/h1>/);` can not match anything. --- lib/sdk/post.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sdk/post.js b/lib/sdk/post.js index 89b5eff..8155623 100644 --- a/lib/sdk/post.js +++ b/lib/sdk/post.js @@ -284,7 +284,7 @@ exports.parse = parseContent; function parseMeta(content) { var html = md.markdown(content); - var m = html.match(/

(.*?)<\/h1>/); + var m = html.match(/

(.*?)<\/h1>/); var meta = {}; if (!m) { meta.title = null; diff --git a/package.json b/package.json index 7deb43d..71ed210 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "dependencies": { "colorful": "~2.1.0", "highlight.js": "~7.5.0", - "markit": "~0.1.0", + "markit": "~0.2.0", "swig": "~0.14.0", "underscore": "~1.5.2", "rimraf": "~2.2.2", From d891c9be1e1df3df3896e80d65cd695c6926fb8e Mon Sep 17 00:00:00 2001 From: "xohozu (Ching-Hua Hung)" Date: Thu, 19 Mar 2015 16:44:27 +0800 Subject: [PATCH 2/2] replace the obsolete `include` method of `shouldjs` to `containEql` --- tests/sdk.file.test.js | 2 +- tests/sdk.filters.test.js | 6 +++--- tests/sdk.highlight.test.js | 2 +- tests/sdk.markdown.test.js | 4 ++-- tests/sdk.post.test.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/sdk.file.test.js b/tests/sdk.file.test.js index 4d854cc..111c066 100644 --- a/tests/sdk.file.test.js +++ b/tests/sdk.file.test.js @@ -32,7 +32,7 @@ describe('file', function() { }); it('can list files', function() { var datafiles = file.list(__dirname + '/data'); - datafiles.should.include(__dirname + '/data/year/2012-1.md'); + datafiles.should.containEql(__dirname + '/data/year/2012-1.md'); }); it('can read json', function() { var data = file.readJSON(__dirname + '/../package.json'); diff --git a/tests/sdk.filters.test.js b/tests/sdk.filters.test.js index 3c559f5..cc05a1c 100644 --- a/tests/sdk.filters.test.js +++ b/tests/sdk.filters.test.js @@ -4,11 +4,11 @@ var filters = require('..').sdk.filters; describe('filters', function() { it('can render markdown', function() { var markdown = filters.filters.markdown; - markdown('# header').should.include('header

'); + markdown('# header').should.containEql('header'); }); it('can render xmldatetime', function() { var xmldatetime = filters.filters.xmldatetime; - xmldatetime('2012-12-25').should.include('2012-12-25T00:00:00'); + xmldatetime('2012-12-25').should.containEql('2012-12-25T00:00:00'); var d = new Date(); xmldatetime(d).should.equal(d.toISOString()); @@ -132,6 +132,6 @@ describe('highlight', function() { it('can highlight code', function() { var code = 'var foo = "bar";'; var func = filters.filters.highlight; - func(code, 'js').should.include('highlight'); + func(code, 'js').should.containEql('highlight'); }); }); diff --git a/tests/sdk.highlight.test.js b/tests/sdk.highlight.test.js index 75ed68a..9b4f63a 100644 --- a/tests/sdk.highlight.test.js +++ b/tests/sdk.highlight.test.js @@ -23,6 +23,6 @@ describe('highlight.render', function() { }); it('should render highlight code', function() { - hl.render('var a', 'js').should.include('highlight'); + hl.render('var a', 'js').should.containEql('highlight'); }); }); diff --git a/tests/sdk.markdown.test.js b/tests/sdk.markdown.test.js index ecd41b6..eae65e7 100644 --- a/tests/sdk.markdown.test.js +++ b/tests/sdk.markdown.test.js @@ -26,10 +26,10 @@ var text = [ describe('markdown.render', function() { it('should have injected code', function() { - md.render(text).should.include('nico-insert-code'); + md.render(text).should.containEql('nico-insert-code'); }); it('should have iframe code', function() { - md.render(text).should.include('allowtransparency'); + md.render(text).should.containEql('allowtransparency'); }); }); diff --git a/tests/sdk.post.test.js b/tests/sdk.post.test.js index e291a4f..5175ffe 100644 --- a/tests/sdk.post.test.js +++ b/tests/sdk.post.test.js @@ -40,7 +40,7 @@ describe('post', function() { it('has toc', function() { var data = post.read(__dirname + '/data/unicode-post.md'); - data.toc.should.include('