Merge pull request #18 from f213/master

URL handling small fix

atom.ejs

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-  <% var url = config.url + config.root %>
   <title><%-: config.title | cdata %></title>
   <% if (config.subtitle){ %><subtitle><%-: config.subtitle | cdata %></subtitle><% } %>
   <link href="<%- encodeURI(feed_url) %>" rel="self"/>

lib/generator.js

@@ -19,9 +19,23 @@ module.exports = function(locals){
   var posts = locals.posts.sort('-date');
   if (feedConfig.limit) posts = posts.limit(feedConfig.limit);
 
+  var url;
+
+  // Sorry for that, it is hexo URL handling way.
+  if (config.root === '/'){
+    url = config.url + config.root;
+  }
+  else
+  {
+    url = config.url + '/';
+  }
+
+  // And sorry for that too.
+  url = url.replace(/([^:])\/\//g, '$1/');
 
   var xml = template({
     config: config,
+    url: url,
     posts: posts,
     feed_url: config.root + feedConfig.path
   });

package.json

@@ -28,6 +28,7 @@
   },
   "devDependencies": {
     "chai": "^1.9.1",
+    "cheerio": "^0.19.0",
     "coveralls": "^2.11.2",
     "gulp": "^3.8.9",
     "gulp-istanbul": "^0.5.0",

rss2.ejs

@@ -3,7 +3,6 @@
   xmlns:atom="http://www.w3.org/2005/Atom"
   xmlns:content="http://purl.org/rss/1.0/modules/content/">
   <channel>
-    <% var url = config.url + config.root %>
     <title><%-: config.title | cdata %></title>
     <link><%- encodeURI(url) %></link>
     <atom:link href="<%- encodeURI(feed_url) %>" rel="self" type="application/rss+xml"/>
@@ -22,7 +21,7 @@
       <% } else {%><%-: post.content.substring(0, 140) | cdata %><% } %>
       </description>
       <content:encoded><%-: post.content | cdata %></content:encoded>
-      <% if (post.comments){ %><comments><%- encodeURI(url + post.path) %>#disqus_comments</comments><% } %>
+      <% if (post.comments){ %><comments><%- encodeURI(url + post.path) %>#disqus_thread</comments><% } %>
     </item>
     <% }) %>
   </channel>

test/index.js

@@ -3,6 +3,8 @@ var Hexo = require('hexo');
 var ejs = require('ejs');
 var pathFn = require('path');
 var fs = require('fs');
+var assign = require('object-assign');
+var cheerio = require('cheerio');
 
 ejs.filters.cdata = function(str){
   return str ? '<![CDATA[' + str + ']]>' : '';
@@ -13,6 +15,11 @@ var atomTmpl = ejs.compile(fs.readFileSync(atomTmplSrc, 'utf8'));
 var rss2TmplSrc = pathFn.join(__dirname, '../rss2.ejs');
 var rss2Tmpl = ejs.compile(fs.readFileSync(rss2TmplSrc, 'utf8'));
 
+var urlConfig = {
+  url:  'http://localhost/',
+  root: '/'
+};
+
 describe('Feed generator', function(){
   var hexo = new Hexo(__dirname, {silent: true});
   var Post = hexo.model('Post');
@@ -37,12 +44,13 @@ describe('Feed generator', function(){
       path: 'atom.xml',
       limit: 2
     };
-
+    hexo.config = assign(hexo.config, urlConfig);
     var result = generator(locals);
 
     result.path.should.eql('atom.xml');
     result.data.should.eql(atomTmpl({
       config: hexo.config,
+      url: urlConfig.url,
       posts: posts.limit(2),
       feed_url: hexo.config.root + 'atom.xml'
     }));
@@ -54,12 +62,13 @@ describe('Feed generator', function(){
       path: 'rss2.xml',
       limit: 2
     };
-
+    hexo.config = assign(hexo.config, urlConfig);
     var result = generator(locals);
 
     result.path.should.eql('rss2.xml');
     result.data.should.eql(rss2Tmpl({
       config: hexo.config,
+      url: urlConfig.url,
       posts: posts.limit(2),
       feed_url: hexo.config.root + 'rss2.xml'
     }));
@@ -71,14 +80,46 @@ describe('Feed generator', function(){
       path: 'atom.xml',
       limit: 0
     };
+    hexo.config = assign(hexo.config, urlConfig);
 
     var result = generator(locals);
 
     result.path.should.eql('atom.xml');
     result.data.should.eql(atomTmpl({
       config: hexo.config,
+      url: urlConfig.url,
       posts: posts,
       feed_url: hexo.config.root + 'atom.xml'
     }));
   });
+
+  it('Relative URL handling', function(){
+    hexo.config.feed = {
+      type: 'atom',
+      path: 'atom.xml'
+    };
+
+    var checkURL = function(root, path, valid){
+      hexo.config.url = root;
+      hexo.config.path = path;
+
+      var result = generator(locals);
+      var $ = cheerio.load(result.data);
+
+      $('feed>id').text().should.eql(valid);
+      $('feed>entry>link').attr('href').should.eql(valid);
+    }
+
+    checkURL('http://localhost/', '/', 'http://localhost/');
+
+    var GOOD = 'http://localhost/blog/';
+
+    checkURL('http://localhost/blog',   '/blog/', GOOD);
+    checkURL('http://localhost/blog',   '/blog',  GOOD);
+    checkURL('http://localhost/blog/',  '/blog/', GOOD);
+    checkURL('http://localhost/blog/',  '/blog',  GOOD);
+
+    checkURL('http://localhost/b/l/o/g', '/', 'http://localhost/b/l/o/g/');
+
+  });
 });