From 16aa1ebf2cb99e69b43f18fdec5edeefa6389542 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 27 Oct 2016 17:13:15 +0300 Subject: [PATCH] chore(markdown) rm iife --- lib/server/markdown.js | 126 ++++++++++++++++++++--------------------- package.json | 1 + 2 files changed, 63 insertions(+), 64 deletions(-) diff --git a/lib/server/markdown.js b/lib/server/markdown.js index 89b0a177..fc37bdd3 100644 --- a/lib/server/markdown.js +++ b/lib/server/markdown.js @@ -1,71 +1,69 @@ -(function() { - 'use strict'; +'use strict'; + +var DIR = './', + DIR_LIB = '../', + DIR_ROOT = __dirname + '/' + DIR_LIB + '../', - var DIR = './', - DIR_LIB = '../', - DIR_ROOT = __dirname + '/' + DIR_LIB + '../', - - fs = require('fs'), - - root = require(DIR + 'root'), - pipe = require('pipe-io'), - ponse = require('ponse'), - markdown = require('markdown-it')(); + fs = require('fs'), - function check(name, request, callback) { - if (typeof name !== 'string') - throw Error('name should be string!'); - - else if (!request) - throw Error('request could not be empty!'); - - else if (typeof callback !== 'function') - throw Error('callback should be function!'); - } + root = require(DIR + 'root'), + pipe = require('pipe-io'), + ponse = require('ponse'), + markdown = require('markdown-it')(); + +function check(name, request, callback) { + if (typeof name !== 'string') + throw Error('name should be string!'); - module.exports = function(name, request, callback) { - var query, - method = request.method; - - check(name, request, callback); - - switch(method) { - case 'GET': - name = name.replace('/markdown', ''); - query = ponse.getQuery(request); - - if (query === 'relative') - name = DIR_ROOT + name; + else if (!request) + throw Error('request could not be empty!'); + + else if (typeof callback !== 'function') + throw Error('callback should be function!'); +} + +module.exports = function(name, request, callback) { + var query, + method = request.method; + + check(name, request, callback); + + switch(method) { + case 'GET': + name = name.replace('/markdown', ''); + query = ponse.getQuery(request); + + if (query === 'relative') + name = DIR_ROOT + name; + else + name = root(name); + + fs.readFile(name, 'utf8', function(error, data) { + if (error) + callback(error); else - name = root(name); - - fs.readFile(name, 'utf8', function(error, data) { - if (error) - callback(error); - else - parse(data, callback); - }); - break; - - case 'PUT': - pipe.getBody(request, function(error, data) { - if (error) - callback(error); - else - parse(data, callback); - }); - break; - } - }; - - function parse(data, callback) { - var md; + parse(data, callback); + }); + break; - process.nextTick(function() { - md = markdown.render(data); - - callback(null, md); - }); + case 'PUT': + pipe.getBody(request, function(error, data) { + if (error) + callback(error); + else + parse(data, callback); + }); + break; } +}; + +function parse(data, callback) { + var md; -})(); + process.nextTick(function() { + md = markdown.render(data); + + callback(null, md); + }); +} + diff --git a/package.json b/package.json index 17b001f2..d47919d6 100644 --- a/package.json +++ b/package.json @@ -114,6 +114,7 @@ "package-json": "^2.3.0", "pipe-io": "^1.2.0", "ponse": "^1.4.0", + "pullout": "^1.0.1", "readjson": "^1.1.0", "remedy": "^1.5.0", "rendy": "^1.1.0",