Merge branch 'dev'

README.md

@@ -1,6 +1,6 @@
 # Hexo
 
-[![Build Status](https://travis-ci.org/hexojs/hexo.svg?branch=master)](https://travis-ci.org/hexojs/hexo)  [![NPM version](https://badge.fury.io/js/hexo.svg)](http://badge.fury.io/js/hexo) [![Coverage Status](https://img.shields.io/coveralls/hexojs/hexo.svg)](https://coveralls.io/r/hexojs/hexo?branch=master) [![Build status](https://ci.appveyor.com/api/projects/status/hpx3lduqjj2t6uqq/branch/master?svg=true)](https://ci.appveyor.com/project/tommy351/hexo/branch/master)
+[![Build Status](https://travis-ci.org/hexojs/hexo.svg?branch=master)](https://travis-ci.org/hexojs/hexo)  [![NPM version](https://badge.fury.io/js/hexo.svg)](http://badge.fury.io/js/hexo) [![Coverage Status](https://coveralls.io/repos/hexojs/hexo/badge.svg?branch=master)](https://coveralls.io/r/hexojs/hexo?branch=master) [![Build status](https://ci.appveyor.com/api/projects/status/hpx3lduqjj2t6uqq/branch/master?svg=true)](https://ci.appveyor.com/project/tommy351/hexo/branch/master)
 
 A fast, simple & powerful blog framework, powered by [Node.js](http://nodejs.org).
 

lib/box/index.js

@@ -4,7 +4,6 @@ var _ = require('lodash');
 var File = require('./file');
 var util = require('hexo-util');
 var fs = require('hexo-fs');
-var prettyHrtime = require('pretty-hrtime');
 var crypto = require('crypto');
 var chalk = require('chalk');
 
@@ -291,7 +290,6 @@ Box.prototype._dispatch = function(item){
   var self = this;
   var ctx = this.context;
   var base = this.base;
-  var start = process.hrtime();
 
   // Skip processing files
   if (this.processingFiles[path]) return;
@@ -317,8 +315,7 @@ Box.prototype._dispatch = function(item){
     return Promise.method(processor.process).call(ctx, file).thenReturn(count + 1);
   }, 0).then(function(count){
     if (count){
-      var interval = prettyHrtime(process.hrtime(start));
-      ctx.log.debug('Processed in %s: %s', chalk.cyan(interval), chalk.magenta(path));
+      ctx.log.debug('Processed: %s', chalk.magenta(path));
     }
   }, function(err){
     ctx.log.error({err: err}, 'Process failed: %s', chalk.magenta(path));

lib/extend/filter.js

@@ -38,6 +38,21 @@ Filter.prototype.register = function(type, fn, priority){
   });
 };
 
+Filter.prototype.unregister = function(type, fn){
+  if (!type) throw new TypeError('type is required');
+  if (typeof fn !== 'function') throw new TypeError('fn must be a function');
+
+  var list = this.list(type);
+  if (!list || !list.length) return;
+
+  for (var i = 0, len = list.length; i < len; i++){
+    if (list[i] === fn){
+      list.splice(i, 1);
+      break;
+    }
+  }
+};
+
 Filter.prototype.exec = function(type, data, options){
   options = options || {};
 

lib/hexo/create_logger.js

@@ -43,7 +43,8 @@ ConsoleStream.prototype.write = function(data){
 
   // Error
   if (data.err){
-    msg += chalk.gray(data.err.stack || data.err.message) + '\n';
+    var err = data.err.stack || data.err.message;
+    if (err) msg += chalk.gray(err) + '\n';
   }
 
   process.stdout.write(msg);

lib/hexo/index.js

@@ -20,7 +20,6 @@ var Router = require('./router');
 var Theme = require('../theme');
 var defaultConfig = require('./default_config');
 var loadDatabase = require('./load_database');
-var prettyHrtime = require('pretty-hrtime');
 
 var libDir = pathFn.dirname(__dirname);
 var sep = pathFn.sep;
@@ -301,20 +300,17 @@ Hexo.prototype._generate = function(options){
     // Run generators
     return Promise.reduce(keys, function(result, key){
       var generator = generators[key];
-      var start = process.hrtime();
 
       return generator.call(self, siteLocals).then(function(data){
-        var interval = prettyHrtime(process.hrtime(start));
+        log.debug('Generator: %s', chalk.magenta(key));
 
-        log.debug('Generator in %s: %s', chalk.cyan(interval), chalk.magenta(key));
-
-        return data ? result.concat(data) : data;
+        return data ? result.concat(data) : result;
       });
     }, []);
   })
+  // Add routes
   .each(function(item){
-    // Add routes
-    if (item.path == null) return;
+    if (typeof item !== 'object' || item.path == null) return;
 
     var path = route.format(item.path);
     var data = item.data;

lib/hexo/post.js

@@ -62,18 +62,32 @@ Post.prototype.create = function(data, replace, callback){
     // Get the scaffold
     this._getScaffold(data.layout)
   ]).spread(function(path, scaffold){
-    // Wrap title with quotations
-    data.title = '"' + data.title + '"';
     data.date = data.date.format('YYYY-MM-DD HH:mm:ss');
 
     // Split data part from the raw scaffold
     var split = yfm.split(scaffold);
+    var separator = split.separator || '---';
+    var jsonMode = separator[0] === ';';
+
+    var frontMatter;
+
+    if (jsonMode){
+      frontMatter = prepareJFM(_.clone(data));
+    } else {
+      frontMatter = prepareYFM(_.clone(data));
+    }
 
     // Compile front-matter with data
-    var content = swig.compile(split.data)(data) + '\n';
+    var content = swig.compile(split.data)(frontMatter) + '\n';
 
     // Parse front-matter
-    var compiled = yaml.load(content);
+    var compiled;
+
+    if (jsonMode){
+      compiled = JSON.parse('{' + content + '}');
+    } else {
+      compiled = yaml.load(content);
+    }
 
     // Add data which are not in the front-matter
     var keys = Object.keys(data);
@@ -89,10 +103,26 @@ Post.prototype.create = function(data, replace, callback){
     }
 
     if (Object.keys(obj).length){
-      content += yaml.dump(obj);
+      if (jsonMode){
+        if (content){
+          content = content.trim() + ',\n';
+        }
+
+        content += JSON.stringify(obj, null, '  ')
+          // Remove indention
+          .replace(/\n {2}/g, function(){
+            return '\n';
+          })
+          // Remove prefixing and trailing braces
+          .replace(/^{\n|}$/g, '');
+      } else {
+        content += yaml.dump(obj);
+      }
     }
 
-    content += '---\n';
+    // Add separators
+    if (split.prefixSeparator) content = separator + '\n' + content;
+    content += separator + '\n';
 
     // Concat content
     content += split.content;
@@ -117,6 +147,31 @@ Post.prototype.create = function(data, replace, callback){
   }).nodeify(callback);
 };
 
+// Prepare data for JSON front-matter:
+// - Add quotations for strings
+function prepareJFM(data){
+  var keys = Object.keys(data);
+  var key = '';
+  var item;
+
+  for (var i = 0, len = keys.length; i < len; i++){
+    key = keys[i];
+    item = data[key];
+
+    if (typeof item === 'string'){
+      data[key] = '"' + item + '"';
+    }
+  }
+
+  return data;
+}
+
+function prepareYFM(data){
+  data.title = '"' + data.title + '"';
+
+  return data;
+}
+
 Post.prototype._getScaffold = function(layout){
   var ctx = this.context;
 

lib/hexo/render.js

@@ -32,6 +32,7 @@ Render.prototype.render = function(data, options, callback){
 
   var ctx = this.context;
   var self = this;
+  var ext = '';
 
   return new Promise(function(resolve, reject){
     if (!data) return reject(new TypeError('No input file or string!'));
@@ -40,13 +41,20 @@ Render.prototype.render = function(data, options, callback){
 
     fs.readFile(data.path).then(resolve, reject);
   }).then(function(text){
-    var ext = data.engine || getExtname(data.path);
+    data.text = text;
+    ext = data.engine || getExtname(data.path);
     if (!ext || !self.isRenderable(ext)) return text;
 
     var renderer = self.renderer.get(ext);
-    return renderer.call(ctx, {path: data.path, text: text}, options);
+    return renderer.call(ctx, data, options);
   }).then(function(result){
-    return toString(result, data);
+    var output = self.getOutput(ext) || ext;
+    result = toString(result, data);
+
+    return ctx.execFilter('after_render:' + output, result, {
+      context: ctx,
+      args: [data]
+    });
   }).nodeify(callback);
 };
 
@@ -56,23 +64,31 @@ Render.prototype.renderSync = function(data, options){
   options = options || {};
 
   var ctx = this.context;
-  var text = '';
 
-  if (data.text != null){
-    text = data.text;
-  } else if (data.path){
-    text = fs.readFileSync(data.path);
+  if (data.text == null){
+    if (!data.path) throw new TypeError('No input file or string!');
+    data.text = fs.readFileSync(data.path);
   }
 
-  if (text == null) throw new TypeError('No input file or string!');
+  if (data.text == null) throw new TypeError('No input file or string!');
 
   var ext = data.engine || getExtname(data.path);
-  if (!ext || !this.isRenderableSync(ext)) return text;
+  var result;
+
+  if (ext && this.isRenderableSync(ext)){
+    var renderer = this.renderer.get(ext, true);
+    result = renderer.call(ctx, data, options);
+  } else {
+    result = data.text;
+  }
 
-  var renderer = this.renderer.get(ext, true);
-  var result = renderer.call(ctx, {path: data.path, text: text}, options);
+  var output = this.getOutput(ext) || ext;
+  result = toString(result, data);
 
-  return toString(result, data);
+  return ctx.execFilterSync('after_render:' + output, result, {
+    context: ctx,
+    args: [data]
+  });
 };
 
 function toString(result, options){

lib/plugins/console/generate.js

@@ -15,14 +15,12 @@ function generateConsole(args){
   function generateFile(path){
     var data = route.get(path);
     var dest = pathFn.join(publicDir, path);
-    var start = process.hrtime();
 
     // TODO: Retry when EMFILE error occurred
     return fs.ensureWriteStream(dest).then(function(stream){
       return pipeStream(data, stream);
     }).then(function(){
-      var interval = prettyHrtime(process.hrtime(start));
-      log.info('Generated in %s: %s', chalk.cyan(interval), chalk.magenta(path));
+      log.info('Generated: %s', chalk.magenta(path));
     });
   }
 

lib/plugins/renderer/index.js

@@ -1,17 +1,19 @@
 module.exports = function(ctx){
   var renderer = ctx.extend.renderer;
 
-  var html = require('./html');
+  var plain = require('./plain');
 
-  renderer.register('htm', 'html', html, true);
-  renderer.register('html', 'html', html, true);
+  renderer.register('htm', 'html', plain, true);
+  renderer.register('html', 'html', plain, true);
+  renderer.register('css', 'css', plain, true);
+  renderer.register('js', 'js', plain, true);
 
   renderer.register('json', 'json', require('./json'), true);
 
   renderer.register('swig', 'html', require('./swig'), true);
 
-  var yml = require('./yaml');
+  var yaml = require('./yaml');
 
-  renderer.register('yml', 'json', yml, true);
-  renderer.register('yaml', 'json', yml, true);
+  renderer.register('yml', 'json', yaml, true);
+  renderer.register('yaml', 'json', yaml, true);
 };

lib/plugins/renderer/plain.js

@@ -0,0 +1,5 @@
+function planRenderer(data){
+  return data.text;
+}
+
+module.exports = planRenderer;

lib/plugins/renderer/yaml.js

@@ -1,8 +1,8 @@
 var yaml = require('js-yaml');
-var escape = require('hexo-front-matter').escape;
+var escapeYAML = require('hexo-front-matter').escape;
 
 function yamlHelper(data){
-  return yaml.load(escape(data.text));
+  return yaml.load(escapeYAML(data.text));
 }
 
 module.exports = yamlHelper;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.4",
   "description": "A fast, simple & powerful blog framework, powered by Node.js.",
   "main": "lib/hexo",
   "bin": {
@@ -34,7 +34,7 @@
     "bunyan": "^1.2.3",
     "chalk": "^0.5.1",
     "cheerio": "^0.18.0",
-    "hexo-front-matter": "^0.1.0",
+    "hexo-front-matter": "^0.2.1",
     "hexo-fs": "^0.1.0",
     "hexo-i18n": "^0.2.0",
     "hexo-util": "^0.1.0",
@@ -49,7 +49,7 @@
     "swig": "1.4.2",
     "tildify": "^1.0.0",
     "titlecase": "^1.0.2",
-    "warehouse": "1.0.0-rc.4"
+    "warehouse": "1.0.0-rc.5"
   },
   "devDependencies": {
     "chai": "^1.9.1",
@@ -62,6 +62,7 @@
     "gulp-mocha": "^2.0.0",
     "hexo-renderer-marked": "^0.2.3",
     "jshint-stylish": "^1.0.0",
-    "mocha": "^2.0.1"
+    "mocha": "^2.0.1",
+    "sinon": "^1.12.2"
   }
 }