Fixed tests

lib/index.js

@@ -38,7 +38,6 @@ function plugin(opts){
       match(file, data).forEach(function(key){
         metadata[key] = metadata[key] || [];
         metadata[key].push(data);
-        // data.collection = key;
       });
     });
 
@@ -154,20 +153,22 @@ function matcher(cols){
 
   return function(file, data){
     var matches = [];
-    var collections = data.collection || [];
 
-    if (!Array.isArray(collections)) {
-      collections = [collections];
+    if (data.collection) {
+      var collection = data.collection;
+      if (!Array.isArray(collection)) collection = [collection];
+      collection.forEach(function(key){
+        if (key && ~keys.indexOf(key)) matches.push(key);
+      });
     }
-
-    collections.forEach(function(key){
-      if (key && ~keys.indexOf(key)) matches.push(key);
-      for (key in matchers){
+    else {
+      for (var key in matchers){
         var m = matchers[key];
         if (m && m.match(file)) matches.push(key);
       }
-    });
+    }
 
-    return unique(matches);
+    data.collection = unique(matches);
+    return data.collection;
   };
 }

test/fixtures/multi/build/one.md

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

test/fixtures/multi/build/three.md

@@ -0,0 +1 @@
+three

test/fixtures/multi/build/two.md

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

test/fixtures/multi/src/one.md

@@ -0,0 +1,5 @@
+---
+collection: articles
+---
+
+one

test/fixtures/multi/src/three.md

@@ -0,0 +1 @@
+three

test/fixtures/multi/src/two.md

@@ -0,0 +1,8 @@
+---
+collection: 
+    - articles
+    - posts
+    - drafts
+---
+
+two

test/index.js

@@ -194,4 +194,21 @@ describe('metalsmith-collections', function(){
       });
   });
 
+  it('should allow multiple collections', function (done) {
+    var metalsmith = Metalsmith('test/fixtures/multi');
+    metalsmith
+      .use(collections({ articles: {}, posts: {}, drafts: {} }))
+      .build(function(err){
+        if (err) return done(err);
+        var m = metalsmith.metadata();
+        assert.equal(2, m.articles.length);
+        assert.equal(1, m.drafts.length);
+        assert.equal(1, m.posts.length);
+        assert.equal(m.collections.articles, m.articles);
+        assert.equal(m.collections.drafts, m.drafts);
+        assert.equal(m.collections.posts, m.posts);
+        done();
+      });
+  });
+
 });