Merge differences of slug creation and overrides per post

jsantell · Feb 2, 2014 · 73712ba · 73712ba
1 parent 0bbae82
commit 73712ba
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 6 deletions.
diff --git a/lib/poet/utils.js b/lib/poet/utils.js
@@ -161,7 +161,7 @@ exports.getTemplate = getTemplate;
 function convertStringToSlug(str){
  return str
  .toLowerCase()
- .replace(/[^\w ]+/g,'')
+ .replace(/[^\w- ]+/g,'')
  .replace(/ +/g,'-');
 }
 
@@ -185,7 +185,7 @@ function createPost (filePath, options) {
  post.date = new Date(post.date);
  post.content = body;
  // url slug for post
- post.slug = convertStringToSlug(post.title);
+ post.slug = convertStringToSlug(post.slug || post.title);
  post.url = createURL(getRoute(options.routes, 'post'), post.slug);
  post.preview = getPreview(post, body, options);
  return post;

diff --git a/test/_postsJson/test1.md b/test/_postsJson/test1.md
@@ -3,8 +3,7 @@
  "tags" : [ "a", "b" ],
  "category" : "testing",
  "date" : "7-10-2012",
- "arbitrary" : "arbitrary content",
- "slug": "test-one"
+ "arbitrary" : "arbitrary content"
 }}}
 
 *Lorem ipsum* dolor sit amet, consectetur adipisicing elit.

diff --git a/test/_postsYaml/test1.md b/test/_postsYaml/test1.md
@@ -6,7 +6,6 @@ tags:
 category: testing
 date: 7-10-2012
 arbitrary: arbitrary content
-slug: test-one
 ---
 
 *Lorem ipsum* dolor sit amet, consectetur adipisicing elit.

diff --git a/test/posts.test.js b/test/posts.test.js
@@ -148,7 +148,7 @@ describe('Posts', function () {
  var
  app = express(),
  poet = Poet(app, {
- posts: './test/test.posts'
+ posts: './test/test-posts/period.path'
  });
 
  poet.init().then(function () {
@@ -158,4 +158,21 @@ describe('Posts', function () {
  }).then(null, done);
  });
  });
+
+ describe('Post Attributes', function () {
+ it('slug attribute overrides default slug and changes URL', function (done) {
+ var
+ app = express(),
+ poet = Poet(app, {
+ posts: './test/test-posts/slug'
+ });
+
+ poet.init().then(function () {
+ var posts = poet.helpers.getPosts();
+ posts[0].slug.should.be.equal('custom-slug');
+ posts[0].url.should.be.equal('/post/custom-slug');
+ done();
+ }).then(null, done);
+ });
+ });
 });
diff --git a/test/test.posts/test1.md → test/test-posts/period.path/test1.md b/test/test.posts/test1.md → test/test-posts/period.path/test1.md
diff --git a/test/test-posts/slug/test1.md b/test/test-posts/slug/test1.md
@@ -0,0 +1,12 @@
+{{{
+ "title" : "Test Post One",
+ "tags" : [ "a", "b" ],
+ "category" : "testing",
+ "date" : "7-10-2012",
+ "arbitrary" : "arbitrary content",
+ "slug": "custom-slug"
+}}}
+
+*Lorem ipsum* dolor sit amet, consectetur adipisicing elit.
+
+# Header 1 #