From 3907ea81cd83e4ed8b01cffc8e3127960f4f3ce9 Mon Sep 17 00:00:00 2001 From: Anthony Short Date: Wed, 30 Jul 2014 10:37:46 -0700 Subject: [PATCH] Using load-metadata --- lib/index.js | 15 ++++----------- package.json | 4 ++-- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/lib/index.js b/lib/index.js index 71aaa92..5f53728 100644 --- a/lib/index.js +++ b/lib/index.js @@ -4,7 +4,7 @@ var extend = require('extend'); var Matcher = require('minimatch').Minimatch; var unique = require('uniq'); var read = require('fs').readFileSync; -var yaml = require('yaml-js'); +var loadMetadata = require('load-metadata').sync; /** * Expose `plugin`. @@ -100,16 +100,9 @@ function plugin(opts){ debug('adding metadata: %s', key); var settings = opts[key]; var col = metadata[key]; - var fileName = settings.metadata; - if (!fileName) return; - if (typeof fileName === 'string') { - var data = read(fileName, 'utf-8'); - var ext = fileName.substr(fileName.lastIndexOf('.') + 1); - col.metadata = ext === 'json' ? JSON.parse(data) : yaml.load(data); - } - else { - col.metadata = settings.metadata; - } + col.metadata = (typeof settings.metadata === 'string') ? + loadMetadata(settings.metadata) : + settings.metadata; }); /** diff --git a/package.json b/package.json index 33fb125..f5a047f 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "extend": "~1.2.1", "minimatch": "^0.2.14", "uniq": "0.0.2", - "yaml-js": "0.0.7" + "load-metadata": "0.0.1" }, "devDependencies": { "metalsmith": "0.x", "mocha": "1.x" } -} \ No newline at end of file +}