feat: meta array for markdown datasources

addresses #139

dadi/lib/providers/markdown.js

@@ -20,6 +20,7 @@ const MarkdownProvider = function () {}
 MarkdownProvider.prototype.initialise = function initialise (datasource, schema) {
   this.datasource = datasource
   this.schema = schema
+  this.extension = schema.datasource.source.extension ? schema.datasource.source.extension : 'md'
 }
 
 /**
@@ -52,9 +53,13 @@ MarkdownProvider.prototype.processSortParameter = function processSortParameter
 MarkdownProvider.prototype.load = function load (requestUrl, done) {
   try {
     const sourcePath = path.normalize(this.schema.datasource.source.path)
-    const filenames = fs.readdirSync(sourcePath)
-    const filepaths = filenames.map(i => path.join(sourcePath, i)).filter(item => !/(^|\/)\.[^/.]/g.test(item))
 
+    // Only get files that match the extension provided, or the default set above
+    const extFilter = new RegExp('.' + this.extension + '$', 'g')
+    const filenames = fs.readdirSync(sourcePath).filter(i => extFilter.test(i))
+    const filepaths = filenames.map(i => path.join(sourcePath, i))
+
+    // Process each file
     async.map(filepaths, this.readFileAsync, (err, readResults) => {
       if (err) return done(err, null)
 
@@ -122,22 +127,33 @@ MarkdownProvider.prototype.load = function load (requestUrl, done) {
 }
 
 MarkdownProvider.prototype.readFileAsync = function readFileAsync (filename, callback) {
-  fs.readFile(filename, 'utf8', callback)
+  fs.readFile(filename, 'utf8', function(err, data){
+    return callback(err, {_name: filename, _contents: data})
+  })
 }
 
 MarkdownProvider.prototype.parseRawDataAsync = function parseRawDataAsync (data, callback) {
   const yamlRegex = /---[\n\r]+([\s\S]*)[\n\r]+---[\n\r]+([\s\S]*)/
   const posts = []
 
   for (let i = 0; i < data.length; i++) {
-    const bits = yamlRegex.exec(data[i])
+    const bits = yamlRegex.exec(data[i]._contents)
     const attributes = yaml.safeLoad(bits[1] || '')
     const contentText = bits[2] || ''
     const contentHtml = marked(contentText)
+    const parsedPath = path.parse(data[i]._name)
+
+    // Some info about the file
+    const meta = {
+      location: data[i]._name,
+      extension: parsedPath.ext,
+      handle: parsedPath.name
+    }
 
     posts.push({
-      original: data[i],
+      meta,
       attributes,
+      original: data[i]._contents,
       contentText,
       contentHtml
     })

workspace/partials/post.dust

@@ -1,6 +1,6 @@
 <article>
 	<header>
-		<h2><a href="/post/{attributes.handle}">{attributes.title}</a></h2>
+		<h2><a href="/post/{meta.handle}">{attributes.title}</a></h2>
 		<p>
 			By <strong>{attributes.author}</strong>
 
@@ -15,5 +15,5 @@
 		</p>
 	</header>	
 
-	{@markdown}{contentText|s}{/markdown}
+	{contentHtml|s}
 </article>

workspace/posts/assets.md

@@ -1,7 +1,6 @@
 ---
 date: 2016-02-17
 title: How to serve static assets
-handle: assets
 author: The DADI Team
 ---
 

workspace/posts/image.md

@@ -1,7 +1,6 @@
 ---
 date: 2015-04-17
 title: Look, a post with an image in
-handle: images
 author: The DADI Team
 ---
 

workspace/posts/pages.md

@@ -1,7 +1,6 @@
 ---
 date: 2016-04-17
 title: How to create a new page
-handle: pages
 author: The DADI Team
 ---
 

workspace/posts/paginated.md

@@ -1,7 +1,6 @@
 ---
 date: 2014-04-17
 title: We can handle pagination too...
-handle: pagination
 author: The DADI Team
 ---
 

workspace/posts/site-name.md

@@ -1,7 +1,6 @@
 ---
 date: 2016-04-05
 title: How to change the site name in the header
-handle: site-name
 author: The DADI Team
 ---
 

workspace/posts/welcome.md

@@ -1,7 +1,6 @@
 ---
 date: 2016-05-10
 title: Successfully installed and running!
-handle: welcome
 author: The DADI Team
 ---