Fixed tests

lib/index.js

@@ -22,13 +22,13 @@ module.exports = plugin;
  * Metalsmith plugin that renames files so that they're permalinked properly
  * for a static site, aka that `about.html` becomes `about/index.html`.
  *
- * @param {Object} options
+ * @param  {Object} options
  *   @property {String} pattern
- *   @property {String or Function} date
+ *   @property {String/Function} date
+ *
  * @return {Function}
  */
-
-function plugin(options){
+function plugin(options) {
   options = normalize(options);
 
   var linksets = options.linksets;
@@ -40,7 +40,8 @@ function plugin(options){
     defaultLinkset = {
       pattern: options.pattern,
       relative: options.relative,
-      date: options.date
+      date: options.date,
+      slug: options.slug || { mode: 'rfc3986' }
     };
   }
 
@@ -67,14 +68,13 @@ function plugin(options){
     return set || defaultLinkset;
   }
 
-  return function(files, metalsmith, done){
+  return function(files, metalsmith, done) {
     setImmediate(done);
-    Object.keys(files).forEach(function(file){
+    Object.keys(files).forEach(function(file) {
       var data = files[file];
       debug('checking file: %s', file);
 
       if (!html(file)) return;
-      var data = files[file];
       if (data['permalink'] === false) return;
 
       var linkset = merge({}, findLinkset(data), defaultLinkset);
@@ -105,7 +105,7 @@ function plugin(options){
 
     // add duplicates for relative files after processing to avoid double-dipping
     // note: `dupes` will be empty if `options.relative` is false
-    Object.keys(dupes).forEach(function(dupe){
+    Object.keys(dupes).forEach(function(dupe) {
       files[dupe] = dupes[dupe];
     });
   };
@@ -114,11 +114,11 @@ function plugin(options){
 /**
  * Normalize an options argument.
  *
- * @param {String or Object} options
+ * @param  {String/Object} options
+ *
  * @return {Object}
  */
-
-function normalize(options){
+function normalize(options) {
   if ('string' == typeof options) options = { pattern: options };
   options = options || {};
   options.date =
@@ -129,7 +129,7 @@ function normalize(options){
     ? options.relative
     : true;
   options.linksets = options.linksets || [];
-  options.slug = options.hasOwnProperty('slug') ? options.slug : { mode: 'rfc3986' };
+  options.slug = options.slug || { mode: 'rfc3986' };
   return options;
 }
 
@@ -140,8 +140,8 @@ function normalize(options){
  * @return {Function}
  */
 
-function format(string){
-  return function(date){
+function format(string) {
+  return function(date) {
     return moment(date)
       .utc()
       .format(string);
@@ -156,7 +156,7 @@ function format(string){
  * @return {Object}
  */
 
-function family(file, files){
+function family(file, files) {
   var dir = dirname(file);
   var ret = {};
 
@@ -180,7 +180,7 @@ function family(file, files){
  * @return {String}
  */
 
-function resolve(path){
+function resolve(path) {
   var ret = dirname(path);
   var base = basename(path, extname(path));
   if (base != 'index') ret = join(ret, base).replace('\\', '/');
@@ -196,7 +196,7 @@ function resolve(path){
  * @return {String or Null}
  */
 
-function replace(pattern, data, options){
+function replace(pattern, data, options) {
   if (!pattern) return null;
   var keys = params(pattern);
   var ret = {};
@@ -221,7 +221,7 @@ function replace(pattern, data, options){
  * @return {Array}
  */
 
-function params(pattern){
+function params(pattern) {
   var matcher = /:(\w+)/g;
   var ret = [];
   var m;
@@ -236,6 +236,6 @@ function params(pattern){
  * @return {Boolean}
  */
 
-function html(path){
+function html(path) {
   return '.html' === extname(path);
 }

test/index.js

@@ -212,20 +212,24 @@ describe('metalsmith-permalinks', function() {
       });
   });
 
-  it('should accept options for slug module', function(done){
+  it('should accept options for slug module', function(done) {
     Metalsmith('test/fixtures/slug-options')
-      .use(permalinks({
-        pattern: ':title',
-        slug: {
-          remove: /[.]/g,
-          lower: false
-        }
-      }))
-      .build(function(err){
+      .use(
+        permalinks({
+          pattern: ':title',
+          slug: {
+            remove: /[.]/g,
+            lower: false
+          }
+        })
+      )
+      .build(function(err) {
         if (err) return done(err);
-        equal('test/fixtures/slug-options/expected', 'test/fixtures/slug-options/build');
+        equal(
+          'test/fixtures/slug-options/expected',
+          'test/fixtures/slug-options/build'
+        );
         done();
       });
   });
-
 });