Merge pull request #54 from suprMax/master

fixing drafts showing up when searching for posts by tags/categories, also fixes #33
jsantell · Sep 19, 2013 · c0b13b2 · c0b13b2
2 parents 56eabc2 + 3c18aa6
commit c0b13b2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/lib/poet/helpers.js b/lib/poet/helpers.js
@@ -36,11 +36,23 @@ function createHelpers (poet) {
       return Math.ceil(getPosts(poet).length / options.postsPerPage);
     },
     postsWithTag: function (tag) {
+      if (!options.showDrafts) {
+        return getPosts(poet).filter(function (post) {
+          return post.tags && ~post.tags.indexOf(tag) && !post.draft;
+        });
+      }
+
       return getPosts(poet).filter(function (post) {
         return post.tags && ~post.tags.indexOf(tag);
       });
     },
     postsWithCategory: function (category) {
+      if (!options.showDrafts) {
+        return getPosts(poet).filter(function (post) {
+          return post.category === category && !post.draft;
+        });
+      }
+
       return getPosts(poet).filter(function (post) {
         return post.category === category;
       });

diff --git a/test/helpers.test.js b/test/helpers.test.js
@@ -110,6 +110,17 @@ describe('helpers.postsWithTag()', function () {
   });
 });
 
+describe('helpers.postsWithTag()', function () {
+  it('should not see drafts on production', function (done) {
+    setup(function (poet) {
+      poet.options.showDrafts = false;
+      var posts = poet.helpers.postsWithTag('d');
+      (posts.length).should.equal(1);
+      done();
+    }, done);
+  });
+});
+
 describe('helpers.postsWithCategories()', function () {
   it('should return posts ordered by date, newest first', function (done) {
     setup(function (poet) {
@@ -121,6 +132,17 @@ describe('helpers.postsWithCategories()', function () {
   });
 });
 
+describe('helpers.postsWithCategories()', function () {
+  it('should not see drafts on production', function (done) {
+    setup(function (poet) {
+      poet.options.showDrafts = false;
+      var posts = poet.helpers.postsWithCategory('other cat');
+      (posts.length).should.equal(1);
+      done();
+    }, done);
+  });
+});
+
 function setup (callback, done) {
   var app = express();
   var poet = Poet(app, {