fix: encode permalink by default

lib/hexo/index.js

@@ -25,6 +25,7 @@ const defaultConfig = require('./default_config');
 const loadDatabase = require('./load_database');
 const multiConfigPath = require('./multi_config_path');
 const resolve = require('resolve');
+const full_url_for = require('../plugins/helper/full_url_for');
 
 const { cloneDeep, debounce } = _;
 
@@ -285,13 +286,14 @@ function stopWatcher(box) {
 
 Hexo.prototype._generateLocals = function() {
   const { config, theme } = this;
+  const ctx = { config: { url: this.config.url } };
 
   function Locals(path, locals) {
     this.page = typeof locals === 'object' ? locals : {};
     if (this.page.path == null) this.page.path = path;
 
     this.path = path;
-    this.url = `${config.url}/${path}`;
+    this.url = full_url_for.call(ctx, path);
   }
 
   Locals.prototype.config = config;

lib/models/category.js

@@ -2,6 +2,7 @@
 
 const { Schema } = require('warehouse');
 const { slugize } = require('hexo-util');
+const full_url_for = require('../plugins/helper/full_url_for');
 
 module.exports = ctx => {
   const Category = new Schema({
@@ -39,9 +40,9 @@ module.exports = ctx => {
 
   Category.virtual('permalink').get(function() {
     const { config } = ctx;
-    let partial_url = this.path;
-    if (config.pretty_urls.trailing_index === false) partial_url = partial_url.replace(/index\.html$/, '');
-    return `${ctx.config.url}/${partial_url}`;
+    let url = full_url_for.call(ctx, this.path);
+    if (config.pretty_urls.trailing_index === false) url = url.replace(/index\.html$/, '');
+    return url;
   });
 
   Category.virtual('posts').get(function() {

lib/models/page.js

@@ -4,6 +4,7 @@ const { Schema } = require('warehouse');
 const { join } = require('path');
 const Moment = require('./types/moment');
 const moment = require('moment');
+const full_url_for = require('../plugins/helper/full_url_for');
 
 module.exports = ctx => {
   const Page = new Schema({
@@ -33,9 +34,9 @@ module.exports = ctx => {
 
   Page.virtual('permalink').get(function() {
     const { config } = ctx;
-    let partial_url = this.path;
-    if (config.pretty_urls.trailing_index === false) partial_url = partial_url.replace(/index\.html$/, '');
-    return `${ctx.config.url}/${partial_url}`;
+    let url = full_url_for.call(ctx, this.path);
+    if (config.pretty_urls.trailing_index === false) url = url.replace(/index\.html$/, '');
+    return url;
   });
 
   Page.virtual('full_source').get(function() {

lib/models/post.js

@@ -5,6 +5,7 @@ const moment = require('moment');
 const { extname, join, sep } = require('path');
 const Promise = require('bluebird');
 const Moment = require('./types/moment');
+const full_url_for = require('../plugins/helper/full_url_for');
 
 function pickID(data) {
   return data._id;
@@ -50,12 +51,10 @@ module.exports = ctx => {
   });
 
   Post.virtual('permalink').get(function() {
-    const self = Object.assign({}, ctx.extend.helper.list(), ctx);
     const { config } = ctx;
-    let partial_url = self.url_for(this.path);
-    if (config.relative_link) partial_url = `/${partial_url}`;
-    if (config.pretty_urls.trailing_index === false) partial_url = partial_url.replace(/index\.html$/, '');
-    return config.url + partial_url.replace(config.root, '/');
+    let url = full_url_for.call(ctx, this.path);
+    if (config.pretty_urls.trailing_index === false) url = url.replace(/index\.html$/, '');
+    return url;
   });
 
   Post.virtual('full_source').get(function() {

lib/models/tag.js

@@ -3,6 +3,7 @@
 const { Schema } = require('warehouse');
 const { slugize } = require('hexo-util');
 const { hasOwnProperty: hasOwn } = Object.prototype;
+const full_url_for = require('../plugins/helper/full_url_for');
 
 module.exports = ctx => {
   const Tag = new Schema({
@@ -30,9 +31,9 @@ module.exports = ctx => {
 
   Tag.virtual('permalink').get(function() {
     const { config } = ctx;
-    let partial_url = this.path;
-    if (config.pretty_urls.trailing_index === false) partial_url = partial_url.replace(/index\.html$/, '');
-    return `${ctx.config.url}/${partial_url}`;
+    let url = full_url_for.call(ctx, this.path);
+    if (config.pretty_urls.trailing_index === false) url = url.replace(/index\.html$/, '');
+    return url;
   });
 
   Tag.virtual('posts').get(function() {

lib/plugins/helper/url_for.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const url = require('url');
+const relative_url = require('./relative_url');
 
 function urlForHelper(path = '/', options) {
   if (path[0] === '#' || path.startsWith('//')) {
@@ -22,7 +23,7 @@ function urlForHelper(path = '/', options) {
 
   // Resolve relative url
   if (options.relative) {
-    return this.relative_url(this.path, path);
+    return relative_url(this.path, path);
   }
 
   // Prepend root path

test/scripts/hexo/hexo.js

@@ -425,6 +425,20 @@ describe('Hexo', () => {
     ].join('\n')));
   });
 
+  it('_generate() - should encode url', () => {
+    hexo.config.url = 'http://fôo.com';
+
+    hexo.theme.setView('test.swig', '{{ url }}');
+
+    hexo.extend.generator.register('test', () => ({
+      path: 'bár',
+      layout: 'test'
+    }));
+
+    return hexo._generate().then(() => checkStream(route.get('bár'),
+      'http://xn--fo-8ja.com/b%C3%A1r'));
+  });
+
   it('_generate() - do nothing if it\'s generating', () => {
     const spy = sinon.spy();
     hexo.extend.generator.register('test', spy);

test/scripts/models/category.js

@@ -115,6 +115,17 @@ describe('Category', () => {
     });
   });
 
+  it('permalink - should be encoded', () => {
+    hexo.config.url = 'http://fôo.com';
+    return Category.insert({
+      name: 'bár'
+    }).then(data => {
+      data.permalink.should.eql('http://xn--fo-8ja.com/' + data.path);
+      hexo.config.url = 'http://yoursite.com';
+      return Category.removeById(data._id);
+    });
+  });
+
   it('posts - virtual', () => Post.insert([
     {source: 'foo.md', slug: 'foo'},
     {source: 'bar.md', slug: 'bar'},

test/scripts/models/page.js

@@ -72,6 +72,18 @@ describe('Page', () => {
     });
   });
 
+  it('permalink - should be encoded', () => {
+    hexo.config.url = 'http://fôo.com';
+    return Page.insert({
+      source: 'foo',
+      path: 'bár'
+    }).then(data => {
+      data.permalink.should.eql('http://xn--fo-8ja.com/b%C3%A1r');
+      hexo.config.url = 'http://yoursite.com';
+      return Page.removeById(data._id);
+    });
+  });
+
   it('full_source - virtual', () => Page.insert({
     source: 'foo',
     path: 'bar'

test/scripts/models/post.js

@@ -84,6 +84,18 @@ describe('Post', () => {
     });
   });
 
+  it('permalink - should be encoded', () => {
+    hexo.config.url = 'http://fôo.com';
+    return Post.insert({
+      source: 'foo.md',
+      slug: 'bár'
+    }).then(data => {
+      data.permalink.should.eql('http://xn--fo-8ja.com/b%C3%A1r');
+      hexo.config.url = 'http://yoursite.com';
+      return Post.removeById(data._id);
+    });
+  });
+
   it('permalink - virtual - when set relative_link', () => {
     hexo.config.root = '/';
     hexo.config.relative_link = true;
@@ -92,6 +104,7 @@ describe('Post', () => {
       slug: 'bar'
     }).then(data => {
       data.permalink.should.eql(hexo.config.url + '/' + data.path);
+      hexo.config.relative_link = false;
       return Post.removeById(data._id);
     });
   });

test/scripts/models/tag.js

@@ -100,6 +100,17 @@ describe('Tag', () => {
     });
   });
 
+  it('permalink - should be encoded', () => {
+    hexo.config.url = 'http://fôo.com';
+    return Tag.insert({
+      name: 'bár'
+    }).then(data => {
+      data.permalink.should.eql('http://xn--fo-8ja.com/' + data.path);
+      hexo.config.url = 'http://yoursite.com';
+      return Tag.removeById(data._id);
+    });
+  });
+
   it('posts - virtual', () => Post.insert([
     {source: 'foo.md', slug: 'foo'},
     {source: 'bar.md', slug: 'bar'},