grunt-pages
Advanced tools
Comparing version 0.4.0 to 0.4.1
@@ -1,1 +0,1 @@ | ||
{"posts":[{"title":"Post 1","date":"2013-05-12T00:00:00.000Z","tags":["JavaScript","Tutorial"],"sourcePath":"test/fixtures/posts/post1.md","lastModified":"2013-08-01T03:06:51.000Z","content":"<p>This is a JavaScript object:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"p\">{</span>\n <span class=\"nx\">myString</span><span class=\"o\">:</span> <span class=\"s1\">''</span><span class=\"p\">,</span>\n <span class=\"nx\">num</span><span class=\"o\">:</span> <span class=\"mi\">4</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/post-1/","dest":"dev/blog/posts/post-1/index.html"},{"title":"Post 2","date":"2013-05-13T00:00:00.000Z","tags":["JavaScript","Tips"],"sourcePath":"test/fixtures/posts/post2.md","lastModified":"2013-07-20T23:45:51.000Z","content":"<p>Here's some alerts:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"k\">for</span> <span class=\"p\">(</span><span class=\"kd\">var</span> <span class=\"nx\">i</span> <span class=\"o\">=</span> <span class=\"mi\">0</span><span class=\"p\">;</span> <span class=\"nx\">i</span> <span class=\"o\"><</span> <span class=\"nx\">i</span><span class=\"o\">++</span><span class=\"p\">)</span> <span class=\"p\">{</span>\n <span class=\"nx\">alert</span><span class=\"p\">(</span><span class=\"nx\">i</span><span class=\"p\">);</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/post-2/","dest":"dev/blog/posts/post-2/index.html"}],"data":{"test":1}} | ||
{"posts":[{"title":"Post 1","date":"2013-05-12T00:00:00.000Z","tags":["JavaScript","Tutorial"],"sourcePath":"test/fixtures/integration/input/posts/post1.md","lastModified":"2013-08-08T05:33:07.000Z","content":"<p>This is a JavaScript object:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"p\">{</span>\n <span class=\"nx\">myString</span><span class=\"o\">:</span> <span class=\"s1\">''</span><span class=\"p\">,</span>\n <span class=\"nx\">num</span><span class=\"o\">:</span> <span class=\"mi\">4</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/post-1/","dest":"dev/blog/posts/post-1/index.html"},{"title":"Post 2","date":"2013-05-13T00:00:00.000Z","tags":["JavaScript","Tips"],"sourcePath":"test/fixtures/integration/input/posts/post2.md","lastModified":"2013-08-08T05:33:07.000Z","content":"<p>Here's some alerts:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"k\">for</span> <span class=\"p\">(</span><span class=\"kd\">var</span> <span class=\"nx\">i</span> <span class=\"o\">=</span> <span class=\"mi\">0</span><span class=\"p\">;</span> <span class=\"nx\">i</span> <span class=\"o\"><</span> <span class=\"nx\">i</span><span class=\"o\">++</span><span class=\"p\">)</span> <span class=\"p\">{</span>\n <span class=\"nx\">alert</span><span class=\"p\">(</span><span class=\"nx\">i</span><span class=\"p\">);</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/post-2/","dest":"dev/blog/posts/post-2/index.html"}],"data":{"test":1}} |
@@ -1,1 +0,1 @@ | ||
{"posts":[{"title":"Post 2","date":"2013-05-13T00:00:00.000Z","tags":["JavaScript","Tips"],"sourcePath":"test/fixtures/posts/post2.md","lastModified":"2013-07-20T23:45:51.000Z","content":"<p>Here's some alerts:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"k\">for</span> <span class=\"p\">(</span><span class=\"kd\">var</span> <span class=\"nx\">i</span> <span class=\"o\">=</span> <span class=\"mi\">0</span><span class=\"p\">;</span> <span class=\"nx\">i</span> <span class=\"o\"><</span> <span class=\"nx\">i</span><span class=\"o\">++</span><span class=\"p\">)</span> <span class=\"p\">{</span>\n <span class=\"nx\">alert</span><span class=\"p\">(</span><span class=\"nx\">i</span><span class=\"p\">);</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/Post_2/","dest":"dev/blog/posts/Post_2/index.html"},{"title":"Post 1","date":"2013-05-12T00:00:00.000Z","tags":["JavaScript","Tutorial"],"sourcePath":"test/fixtures/posts/post1.md","lastModified":"2013-08-01T03:06:51.000Z","content":"<p>This is a JavaScript object:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"p\">{</span>\n <span class=\"nx\">myString</span><span class=\"o\">:</span> <span class=\"s1\">''</span><span class=\"p\">,</span>\n <span class=\"nx\">num</span><span class=\"o\">:</span> <span class=\"mi\">4</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/Post_1/","dest":"dev/blog/posts/Post_1/index.html"}],"data":{"test":0}} | ||
{"posts":[{"title":"Post 2","date":"2013-05-13T00:00:00.000Z","tags":["JavaScript","Tips"],"sourcePath":"test/fixtures/integration/input/posts/post2.md","lastModified":"2013-08-08T05:33:07.000Z","content":"<p>Here's some alerts:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"k\">for</span> <span class=\"p\">(</span><span class=\"kd\">var</span> <span class=\"nx\">i</span> <span class=\"o\">=</span> <span class=\"mi\">0</span><span class=\"p\">;</span> <span class=\"nx\">i</span> <span class=\"o\"><</span> <span class=\"nx\">i</span><span class=\"o\">++</span><span class=\"p\">)</span> <span class=\"p\">{</span>\n <span class=\"nx\">alert</span><span class=\"p\">(</span><span class=\"nx\">i</span><span class=\"p\">);</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/Post_2/","dest":"dev/blog/posts/Post_2/index.html"},{"title":"Post 1","date":"2013-05-12T00:00:00.000Z","tags":["JavaScript","Tutorial"],"sourcePath":"test/fixtures/integration/input/posts/post1.md","lastModified":"2013-08-08T05:33:07.000Z","content":"<p>This is a JavaScript object:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"p\">{</span>\n <span class=\"nx\">myString</span><span class=\"o\">:</span> <span class=\"s1\">''</span><span class=\"p\">,</span>\n <span class=\"nx\">num</span><span class=\"o\">:</span> <span class=\"mi\">4</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/Post_1/","dest":"dev/blog/posts/Post_1/index.html"}],"data":{"test":0}} |
@@ -1,1 +0,1 @@ | ||
{"posts":[{"title":"Post 2","date":"2013-05-13T00:00:00.000Z","tags":["JavaScript","Tips"],"sourcePath":"test/fixtures/posts/post2.md","lastModified":"2013-07-20T23:45:51.000Z","content":"<p>Here's some alerts:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"k\">for</span> <span class=\"p\">(</span><span class=\"kd\">var</span> <span class=\"nx\">i</span> <span class=\"o\">=</span> <span class=\"mi\">0</span><span class=\"p\">;</span> <span class=\"nx\">i</span> <span class=\"o\"><</span> <span class=\"nx\">i</span><span class=\"o\">++</span><span class=\"p\">)</span> <span class=\"p\">{</span>\n <span class=\"nx\">alert</span><span class=\"p\">(</span><span class=\"nx\">i</span><span class=\"p\">);</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/post-2/","dest":"dev/blog/posts/post-2/index.html"},{"title":"Post 1","date":"2013-05-12T00:00:00.000Z","tags":["JavaScript","Tutorial"],"sourcePath":"test/fixtures/posts/post1.md","lastModified":"2013-08-01T03:06:51.000Z","content":"<p>This is a JavaScript object:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"p\">{</span>\n <span class=\"nx\">myString</span><span class=\"o\">:</span> <span class=\"s1\">''</span><span class=\"p\">,</span>\n <span class=\"nx\">num</span><span class=\"o\">:</span> <span class=\"mi\">4</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/post-1/","dest":"dev/blog/posts/post-1/index.html"}],"data":{"test":0}} | ||
{"posts":[{"title":"Post 2","date":"2013-05-13T00:00:00.000Z","tags":["JavaScript","Tips"],"sourcePath":"test/fixtures/integration/input/posts/post2.md","lastModified":"2013-08-08T05:33:07.000Z","content":"<p>Here's some alerts:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"k\">for</span> <span class=\"p\">(</span><span class=\"kd\">var</span> <span class=\"nx\">i</span> <span class=\"o\">=</span> <span class=\"mi\">0</span><span class=\"p\">;</span> <span class=\"nx\">i</span> <span class=\"o\"><</span> <span class=\"nx\">i</span><span class=\"o\">++</span><span class=\"p\">)</span> <span class=\"p\">{</span>\n <span class=\"nx\">alert</span><span class=\"p\">(</span><span class=\"nx\">i</span><span class=\"p\">);</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/post-2/","dest":"dev/blog/posts/post-2/index.html"},{"title":"Post 1","date":"2013-05-12T00:00:00.000Z","tags":["JavaScript","Tutorial"],"sourcePath":"test/fixtures/integration/input/posts/post1.md","lastModified":"2013-08-08T05:33:07.000Z","content":"<p>This is a JavaScript object:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"p\">{</span>\n <span class=\"nx\">myString</span><span class=\"o\">:</span> <span class=\"s1\">''</span><span class=\"p\">,</span>\n <span class=\"nx\">num</span><span class=\"o\">:</span> <span class=\"mi\">4</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/post-1/","dest":"dev/blog/posts/post-1/index.html"}],"data":{"test":0}} |
@@ -1,1 +0,1 @@ | ||
{"posts":[{"title":"Post 2","date":"2013-05-13T00:00:00.000Z","tags":["JavaScript","Tips"],"sourcePath":"test/fixtures/posts/post2.md","lastModified":"2013-07-20T23:45:51.000Z","content":"<p>Here's some alerts:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"k\">for</span> <span class=\"p\">(</span><span class=\"kd\">var</span> <span class=\"nx\">i</span> <span class=\"o\">=</span> <span class=\"mi\">0</span><span class=\"p\">;</span> <span class=\"nx\">i</span> <span class=\"o\"><</span> <span class=\"nx\">i</span><span class=\"o\">++</span><span class=\"p\">)</span> <span class=\"p\">{</span>\n <span class=\"nx\">alert</span><span class=\"p\">(</span><span class=\"nx\">i</span><span class=\"p\">);</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/post-2/","dest":"dev/blog/posts/post-2/index.html"},{"title":"Post 1","date":"2013-05-12T00:00:00.000Z","tags":["JavaScript","Tutorial"],"sourcePath":"test/fixtures/posts/post1.md","lastModified":"2013-08-01T03:06:51.000Z","content":"<p>This is a JavaScript object:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"p\">{</span>\n <span class=\"nx\">myString</span><span class=\"o\">:</span> <span class=\"s1\">''</span><span class=\"p\">,</span>\n <span class=\"nx\">num</span><span class=\"o\">:</span> <span class=\"mi\">4</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/post-1/","dest":"dev/blog/posts/post-1/index.html"}],"data":{"test":0}} | ||
{"posts":[{"title":"Post 2","date":"2013-05-13T00:00:00.000Z","tags":["JavaScript","Tips"],"sourcePath":"test/fixtures/integration/input/posts/post2.md","lastModified":"2013-08-08T05:33:07.000Z","content":"<p>Here's some alerts:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"k\">for</span> <span class=\"p\">(</span><span class=\"kd\">var</span> <span class=\"nx\">i</span> <span class=\"o\">=</span> <span class=\"mi\">0</span><span class=\"p\">;</span> <span class=\"nx\">i</span> <span class=\"o\"><</span> <span class=\"nx\">i</span><span class=\"o\">++</span><span class=\"p\">)</span> <span class=\"p\">{</span>\n <span class=\"nx\">alert</span><span class=\"p\">(</span><span class=\"nx\">i</span><span class=\"p\">);</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/post-2/","dest":"dev/blog/posts/post-2/index.html"},{"title":"Post 1","date":"2013-05-12T00:00:00.000Z","tags":["JavaScript","Tutorial"],"sourcePath":"test/fixtures/integration/input/posts/post1.md","lastModified":"2013-08-08T05:33:07.000Z","content":"<p>This is a JavaScript object:</p>\n<pre><code class=\"lang-js\"><div class=\"highlight\"><pre><span class=\"p\">{</span>\n <span class=\"nx\">myString</span><span class=\"o\">:</span> <span class=\"s1\">''</span><span class=\"p\">,</span>\n <span class=\"nx\">num</span><span class=\"o\">:</span> <span class=\"mi\">4</span>\n<span class=\"p\">}</span>\n</pre></div>\n</code></pre>\n","url":"blog/posts/post-1/","dest":"dev/blog/posts/post-1/index.html"}],"data":{"test":0}} |
{ | ||
"name": "grunt-pages", | ||
"version": "0.4.0", | ||
"version": "0.4.1", | ||
"description": "Grunt task to create pages using markdown and templates", | ||
@@ -5,0 +5,0 @@ "main": "Gruntfile.js", |
@@ -85,3 +85,3 @@ # grunt-pages | ||
The url of each post. The url string takes variables as parameters using the `:variable` syntax. Variable(s) specified in the url are required in each post's metadata. | ||
The url of each post. The url string takes variables as parameters using the `:variable` syntax. Variable(s) specified in the url are required in each post's metadata. Urls ending with a trailing `/` will generate posts as index.html files inside of the url's folder. | ||
@@ -332,2 +332,8 @@ ### Options | ||
**0.4.0** - Altered post url to *not* automatically add `.html` to urls. | ||
**Breaking changes:** | ||
- Post urls will now require .html to be listed explicitly to be in the url. The recommended convention is to put each post in its own folder, like `posts/:title/` so that a post with the title `hello` would be generated at posts/hello/index.html. | ||
**0.3.3** - Added lodash as a hard dependency. | ||
@@ -343,3 +349,3 @@ | ||
- Paginated pages no longer have a `currentPage` as a property of the current page in the `pages` array, rather it is exposed as a global variable called `currentIndex` for easier accesibility. | ||
- Paginated pages no longer have a `currentPage` as a property of the current page in the `pages` array, rather it is exposed as a global variable called `currentIndex` for easier accessibility. | ||
@@ -346,0 +352,0 @@ **0.2.5** - Fixed metadata parsing bug, added `formatPostUrl` option & added `pagination.url` option. |
@@ -152,8 +152,7 @@ /* | ||
} else if (fileString.indexOf('----') === 0) { | ||
postData = jsYAML.load(fileString.split('----')[1]); | ||
var sections = fileString.split('----'); | ||
postData = jsYAML.load(sections[1]); | ||
// Extract the content by removing the metadata section | ||
var sections = fileString.split('----') | ||
.slice(2); | ||
postData.markdown = sections.join('----'); | ||
postData.markdown = sections.slice(2).join('----'); | ||
} else { | ||
@@ -236,4 +235,11 @@ grunt.fail.fatal('the metadata for the following post is formatted incorrectly: ' + postPath.red); | ||
var postStart = new Date().getTime(); | ||
lib.generatePosts(templateData); | ||
var message = ''; | ||
if (grunt.option('bench')) { | ||
message = '\nPosts'.blue + ' took ' + (new Date().getTime() - postStart) / 1000 + ' seconds.\n'; | ||
console.log(message); | ||
} | ||
var pageStart = new Date().getTime(); | ||
if (options.pageSrc) { | ||
@@ -252,2 +258,6 @@ lib.generatePages(templateData); | ||
} | ||
if (grunt.option('bench')) { | ||
message = '\nPages'.magenta + ' took ' + (new Date().getTime() - pageStart) / 1000 + ' seconds.\n'; | ||
console.log(message); | ||
} | ||
@@ -261,4 +271,4 @@ if (options.rss) { | ||
if (grunt.option('bench')) { | ||
var message = 'Took ' + (new Date().getTime() - start) / 1000 + ' seconds.'; | ||
console.log(message.green); | ||
message = 'Task'.yellow + ' took ' + (new Date().getTime() - start) / 1000 + ' seconds.'; | ||
console.log(message); | ||
} | ||
@@ -308,3 +318,5 @@ done(); | ||
.forEach(function (urlSegment) { | ||
if (urlSegment.indexOf('.html') !== -1) { | ||
urlSegment = urlSegment.slice(0, - '.html'.length); | ||
} | ||
// Make sure the post has the dynamic segment as a metadata property | ||
@@ -311,0 +323,0 @@ if (urlSegment in post) { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
503
365
52047
21