use better escaping in console/new

assets/init/scaffolds/page.md

@@ -1,3 +1,3 @@
-title: {{ title }}
+title: {{ title|raw }}
 date: {{ date }}
 ---

assets/init/scaffolds/post.md

@@ -1,4 +1,4 @@
-title: {{ title }}
+title: {{ title|raw }}
 date: {{ date }}
 tags:
 ---

lib/plugins/console/new.js

@@ -6,19 +6,13 @@ var moment = require('moment'),
  swig = require('swig'),
  extend = require('../../extend'),
  util = require('../../util'),
+ escape = util.escape,
  file = util.file;
 
-// http://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
-var escape = function(str){
- return str.toString().toLowerCase()
- .replace(/\s/g, '-')
- .replace(/\/|\\|\?|%|\*|:|\||"|<|>|\.|#/g, '');
-};
-
 // Default scaffolds
 var scaffolds = {
  post: [
- 'title: {{ title }}',
+ 'title: {{ title|raw }}',
  'date: {{ date }}',
  'tags:',
  '---'

lib/plugins/processor/index.js

@@ -57,20 +57,8 @@ var getInfoFromFilename = function(str){
  return result;
 };
 
-// http://tools.ietf.org/html/rfc3986#section-2.2
-// http://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
-var escape = function(str){
- var str = str.toString()
- .replace(/\s/g, '-')
- .replace(/:|\/|\?|#|\[|\]|@|!|\$|&|'|\(|\)|\*|\+|,|;|=|\\|%|<|>|\./g, '');
-
- if (filenameCaps == 1){
- str = str.toLowerCase();
- } else if (filenameCaps == 2){
- str = str.toUpperCase();
- }
-
- return str;
+var escape = function(str) {
+ return util.escape(str, filenameCaps);
 };
 
 var load = function(file, stat, extname, callback){

lib/util/escape.js

@@ -0,0 +1,17 @@
+// http://tools.ietf.org/html/rfc3986#section-2.2
+// http://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
+module.exports = function(str, changeCase){
+ changeCase = changeCase || 0;
+
+ var str = str.toString().toLowerCase()
+ .replace(/\s/g, '-')
+ .replace(/:|\/|\?|#|\[|\]|@|!|\$|&|'|"|\(|\)|\*|\+|,|;|=|\\|%|<|>|\./g, '');
+
+ if (changeCase == 1){
+ str = str.toLowerCase();
+ } else if (changeCase == 2){
+ str = str.toUpperCase();
+ }
+
+ return str;
+};

lib/util/index.js

@@ -5,5 +5,6 @@ module.exports = {
  exec: require('./exec'),
  highlight: require('./highlight'),
  titlecase: require('./titlecase'),
- Timer: require('./timer')
+ Timer: require('./timer'),
+ escape: require('./escape')
 };