Merge pull request #3917 from curbengh/pretty_urls-util

feat(permalink): pretty_urls.trailing_html

lib/hexo/default_config.js

@@ -14,7 +14,8 @@ module.exports = {
   permalink: ':year/:month/:day/:title/',
   permalink_defaults: {},
   pretty_urls: {
-    trailing_index: true
+    trailing_index: true,
+    trailing_html: true
   },
   // Directory
   source_dir: 'source',

lib/models/category.js

@@ -39,10 +39,7 @@ module.exports = ctx => {
   });
 
   Category.virtual('permalink').get(function() {
-    const { config } = ctx;
-    let url = full_url_for.call(ctx, this.path);
-    if (config.pretty_urls.trailing_index === false) url = url.replace(/index\.html$/, '');
-    return url;
+    return full_url_for.call(ctx, this.path);
   });
 
   Category.virtual('posts').get(function() {

lib/models/page.js

@@ -33,10 +33,7 @@ module.exports = ctx => {
   });
 
   Page.virtual('permalink').get(function() {
-    const { config } = ctx;
-    let url = full_url_for.call(ctx, this.path);
-    if (config.pretty_urls.trailing_index === false) url = url.replace(/index\.html$/, '');
-    return url;
+    return full_url_for.call(ctx, this.path);
   });
 
   Page.virtual('full_source').get(function() {

lib/models/post.js

@@ -51,10 +51,7 @@ module.exports = ctx => {
   });
 
   Post.virtual('permalink').get(function() {
-    const { config } = ctx;
-    let url = full_url_for.call(ctx, this.path);
-    if (config.pretty_urls.trailing_index === false) url = url.replace(/index\.html$/, '');
-    return url;
+    return full_url_for.call(ctx, this.path);
   });
 
   Post.virtual('full_source').get(function() {

lib/models/tag.js

@@ -30,10 +30,7 @@ module.exports = ctx => {
   });
 
   Tag.virtual('permalink').get(function() {
-    const { config } = ctx;
-    let url = full_url_for.call(ctx, this.path);
-    if (config.pretty_urls.trailing_index === false) url = url.replace(/index\.html$/, '');
-    return url;
+    return full_url_for.call(ctx, this.path);
   });
 
   Tag.virtual('posts').get(function() {

package.json

@@ -49,7 +49,7 @@
     "hexo-fs": "^2.0.0",
     "hexo-i18n": "^1.0.0",
     "hexo-log": "^1.0.0",
-    "hexo-util": "^1.6.1",
+    "hexo-util": "^1.7.0",
     "js-yaml": "^3.12.0",
     "lodash": "^4.17.11",
     "micromatch": "^4.0.2",

test/scripts/models/category.js

@@ -116,6 +116,17 @@ describe('Category', () => {
     });
   });
 
+  it('permalink - trailing_html', () => {
+    hexo.config.pretty_urls.trailing_html = false;
+    return Category.insert({
+      name: 'foo'
+    }).then(data => {
+      data.permalink.should.eql(hexo.config.url + '/' + data.path.replace(/\.html$/, ''));
+      hexo.config.pretty_urls.trailing_html = true;
+      return Category.removeById(data._id);
+    });
+  });
+
   it('permalink - should be encoded', () => {
     hexo.config.url = 'http://fôo.com';
     return Category.insert({

test/scripts/models/page.js

@@ -73,6 +73,30 @@ describe('Page', () => {
     });
   });
 
+  it('permalink - trailing_html', () => {
+    hexo.config.pretty_urls.trailing_html = false;
+    return Page.insert({
+      source: 'foo.md',
+      path: 'bar/foo.html'
+    }).then(data => {
+      data.permalink.should.eql(hexo.config.url + '/' + data.path.replace(/\.html$/, ''));
+      hexo.config.pretty_urls.trailing_html = true;
+      return Page.removeById(data._id);
+    });
+  });
+
+  it('permalink - trailing_html - index.html', () => {
+    hexo.config.pretty_urls.trailing_html = false;
+    return Page.insert({
+      source: 'foo.md',
+      path: 'bar/index.html'
+    }).then(data => {
+      data.permalink.should.eql(hexo.config.url + '/' + data.path);
+      hexo.config.pretty_urls.trailing_html = true;
+      return Page.removeById(data._id);
+    });
+  });
+
   it('permalink - should be encoded', () => {
     hexo.config.url = 'http://fôo.com';
     const path = 'bár';

test/scripts/models/post.js

@@ -140,14 +140,38 @@ describe('Post', () => {
     hexo.config.pretty_urls.trailing_index = false;
     return Post.insert({
       source: 'foo.md',
-      slug: 'bar'
+      slug: 'bar/index.html'
     }).then(data => {
       data.permalink.should.eql(hexo.config.url + '/' + data.path.replace(/index\.html$/, ''));
       hexo.config.pretty_urls.trailing_index = true;
       return Post.removeById(data._id);
     });
   });
 
+  it('permalink - trailing_html', () => {
+    hexo.config.pretty_urls.trailing_html = false;
+    return Post.insert({
+      source: 'foo.md',
+      slug: 'bar/foo.html'
+    }).then(data => {
+      data.permalink.should.eql(hexo.config.url + '/' + data.path.replace(/\.html$/, ''));
+      hexo.config.pretty_urls.trailing_html = true;
+      return Post.removeById(data._id);
+    });
+  });
+
+  it('permalink - trailing_html - index.html', () => {
+    hexo.config.pretty_urls.trailing_html = false;
+    return Post.insert({
+      source: 'foo.md',
+      slug: 'bar/index.html'
+    }).then(data => {
+      data.permalink.should.eql(hexo.config.url + '/' + data.path);
+      hexo.config.pretty_urls.trailing_html = true;
+      return Post.removeById(data._id);
+    });
+  });
+
   it('full_source - virtual', () => Post.insert({
     source: 'foo.md',
     slug: 'bar'

test/scripts/models/tag.js

@@ -101,6 +101,17 @@ describe('Tag', () => {
     });
   });
 
+  it('permalink - trailing_html', () => {
+    hexo.config.pretty_urls.trailing_html = false;
+    return Tag.insert({
+      name: 'foo'
+    }).then(data => {
+      data.permalink.should.eql(hexo.config.url + '/' + data.path.replace(/\.html$/, ''));
+      hexo.config.pretty_urls.trailing_html = true;
+      return Tag.removeById(data._id);
+    });
+  });
+
   it('permalink - should be encoded', () => {
     hexo.config.url = 'http://fôo.com';
     return Tag.insert({