Fixes #120: default linkset options should be overwritten by other li…

…nksets

Credit to @depuits for fixing this issue

lib/index.js

@@ -283,7 +283,7 @@ const plugin = options => {
       if (!html(file)) return;
       if (data.permalink === false) return;
 
-      const linkset = Object.assign({}, findLinkset(data), defaultLinkset);
+      const linkset = Object.assign({}, defaultLinkset, findLinkset(data));
       debug('applying pattern: %s to file: %s', linkset.pattern, file);
 
       let ppath = replace(linkset.pattern, data, linkset) || resolve(file);

test/fixtures/linkset-overwrite-default/expected/overwritten/one-post/index.html

@@ -0,0 +1 @@
+one

test/fixtures/linkset-overwrite-default/expected/test/index.html

@@ -0,0 +1 @@
+other

test/fixtures/linkset-overwrite-default/src/index.html

@@ -0,0 +1,4 @@
+---
+title: test
+---
+other

test/fixtures/linkset-overwrite-default/src/one.html

@@ -0,0 +1,5 @@
+---
+title: one post
+overwrite: true
+---
+one

test/fixtures/linkset-rule-precedence/expected/first/one/index.html

@@ -0,0 +1 @@
+one

test/fixtures/linkset-rule-precedence/expected/first/two/index.html

@@ -0,0 +1 @@
+two

test/fixtures/linkset-rule-precedence/src/first.html

@@ -0,0 +1,5 @@
+---
+title: one
+bothFilesHaveThisProperty: true
+---
+one

test/fixtures/linkset-rule-precedence/src/second.html

@@ -0,0 +1,5 @@
+---
+title: two
+bothFilesHaveThisProperty: true
+---
+two

test/index.js

@@ -171,7 +171,40 @@ const fixtures = [
       },
       pattern: ':title'
     }
-  }
+  },
+  {
+    message:
+      'should overwrite default linkset options with specific linkset options',
+    folder: 'linkset-overwrite-default',
+    options: {
+      pattern: ':title',
+      linksets: [
+        {
+          match: { overwrite: true },
+          pattern: 'overwritten/:title'
+        }
+      ]
+    }
+  },
+  {
+    message:
+      'should apply the first linkset when multiple linksets match the same file',
+    folder: 'linkset-rule-precedence',
+    options: {
+      pattern: ':title',
+      linksets: [
+        {
+          match: { bothFilesHaveThisProperty: true },
+          pattern: 'first/:title'
+        },
+        {
+          match: { bothFilesHaveThisProperty: true },
+          pattern: 'second/:title'
+        }
+      ]
+    }
+  },
+
 ];
 
 describe('@metalsmith/permalinks', () => {