klemek/GitBlog.md
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code formatting with 2 space indent

Browse Source
This commit is contained in:
Clément GOUIN
2019-06-20 14:24:34 +02:00
parent 3df43b4872
commit 92021164c9
11 changed files with 676 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config.default.json
+3 -1
View File
@@ -10,7 +10,9 @@
"home": { "home": {
"index": "index.ejs", "index": "index.ejs",
"error": "error.ejs", "error": "error.ejs",
"hidden": [".ejs"] "hidden": [
".ejs"
]
}, },
"article": { "article": {
"index": "index.md", "index": "index.md",
src/config.js
+3 -3
View File
@@ -12,7 +12,7 @@ const merge = (ref, src) => {
return ref; return ref;
} else if (typeof ref === 'object') { } else if (typeof ref === 'object') {
const out = {}; const out = {};
Object.keys(ref).forEach((key) =>out[key] = merge(ref[key], src[key])); Object.keys(ref).forEach((key) => out[key] = merge(ref[key], src[key]));
return out; return out;
} else { } else {
return src; return src;
@@ -21,11 +21,11 @@ const merge = (ref, src) => {
module.exports = () => { module.exports = () => {
try { try {
let configData = fs.readFileSync('config.json', {encoding:'UTF-8'}); let configData = fs.readFileSync('config.json', {encoding: 'UTF-8'});
let config = JSON.parse(configData); let config = JSON.parse(configData);
return merge(refConfig, config); return merge(refConfig, config);
} catch (error) { } catch (error) {
console.error('Failed to load config.json : '+error); console.error('Failed to load config.json : ' + error);
return refConfig; return refConfig;
} }
}; };
src/postinstall.js
+3 -3
View File
@@ -16,9 +16,9 @@ copy(path.join('src', 'config.default.json'), 'config.example.json');
if (!fs.existsSync('data')) { if (!fs.existsSync('data')) {
fs.mkdirSync('data'); fs.mkdirSync('data');
copy(path.join('sample_data','home'), 'data'); copy(path.join('sample_data', 'home'), 'data');
const pad0 = (n) =>('0' + n).substr(-2); const pad0 = (n) => ('0' + n).substr(-2);
const datetime = new Date(); const datetime = new Date();
const dir = path.join('data', datetime.getFullYear().toString(), pad0(datetime.getMonth() + 1), pad0(datetime.getDate())); const dir = path.join('data', datetime.getFullYear().toString(), pad0(datetime.getMonth() + 1), pad0(datetime.getDate()));
@@ -26,5 +26,5 @@ if (!fs.existsSync('data')) {
if (!fs.existsSync(dir)) if (!fs.existsSync(dir))
fs.mkdirSync(dir, {recursive: true}); fs.mkdirSync(dir, {recursive: true});
copy(path.join('sample_data','article'), dir); copy(path.join('sample_data', 'article'), dir);
} }
src/renderer.js
+4 -4
View File
@@ -4,12 +4,12 @@ const showdown = require('showdown');
module.exports = (config) => { module.exports = (config) => {
const converter = new showdown.Converter(config['showdown']); const converter = new showdown.Converter(config['showdown']);
return { return {
render : (file, cb) => { render: (file, cb) => {
fs.readFile(file, {encoding:'UTF-8'}, (err, data) => { fs.readFile(file, {encoding: 'UTF-8'}, (err, data) => {
if(err) if (err)
return cb(err); return cb(err);
const html = converter.makeHtml(data); const html = converter.makeHtml(data);
cb(null,html); cb(null, html);
}); });
} }
}; };
test/app.test.js
+46 -46
View File
@@ -16,16 +16,16 @@ const config = {
'home': { 'home': {
'index': testIndex, 'index': testIndex,
'error': testError, 'error': testError,
'hidden': ['.ejs','.test'] 'hidden': ['.ejs', '.test']
}, },
'article': { 'article': {
'index': 'index.md', 'index': 'index.md',
'template' : testTemplate, 'template': testTemplate,
'thumbnail_tag': 'thumbnail', 'thumbnail_tag': 'thumbnail',
'default_title': 'Untitled', 'default_title': 'Untitled',
'default_thumbnail': null 'default_thumbnail': null
}, },
'showdown' : {} 'showdown': {}
}; };
const app = require('../src/app')(config); const app = require('../src/app')(config);
@@ -42,41 +42,41 @@ afterAll(() => {
}); });
describe('Test root path', () => { describe('Test root path', () => {
test('404 no index no error', (done) =>{ test('404 no index no error', (done) => {
request(app).get('/').then((response) =>{ request(app).get('/').then((response) => {
expect(response.statusCode).toBe(404); expect(response.statusCode).toBe(404);
done(); done();
}); });
}); });
test('404 no index but error page', (done) =>{ test('404 no index but error page', (done) => {
fs.writeFileSync(path.join(dataDir,testError), 'error <%= error %> at <%= path %>'); fs.writeFileSync(path.join(dataDir, testError), 'error <%= error %> at <%= path %>');
request(app).get('/').then((response) =>{ request(app).get('/').then((response) => {
expect(response.statusCode).toBe(404); expect(response.statusCode).toBe(404);
expect(response.text).toBe('error 404 at /'); expect(response.text).toBe('error 404 at /');
done(); done();
}); });
}); });
test('200 no articles', (done) =>{ test('200 no articles', (done) => {
fs.writeFileSync(path.join(dataDir,testIndex), 'articles <%= articles.length %>'); fs.writeFileSync(path.join(dataDir, testIndex), 'articles <%= articles.length %>');
request(app).get('/').then((response) =>{ request(app).get('/').then((response) => {
expect(response.statusCode).toBe(200); expect(response.statusCode).toBe(200);
expect(response.text).toBe('articles 0'); expect(response.text).toBe('articles 0');
done(); done();
}); });
}); });
test('200 2 articles', (done) =>{ test('200 2 articles', (done) => {
utils.createEmptyDirs([ utils.createEmptyDirs([
path.join(dataDir, '2019', '05', '05'), path.join(dataDir, '2019', '05', '05'),
path.join(dataDir, '2018', '05', '05') path.join(dataDir, '2018', '05', '05')
]); ]);
utils.createEmptyFiles([ utils.createEmptyFiles([
path.join(dataDir, '2019', '05', '05','index.md'), path.join(dataDir, '2019', '05', '05', 'index.md'),
path.join(dataDir, '2018', '05', '05','index.md') path.join(dataDir, '2018', '05', '05', 'index.md')
]); ]);
fs.writeFileSync(path.join(dataDir,testIndex), 'articles <%= articles.length %>'); fs.writeFileSync(path.join(dataDir, testIndex), 'articles <%= articles.length %>');
app.reload((res) => { app.reload((res) => {
expect(res).toBe(true); expect(res).toBe(true);
request(app).get('/').then((response) =>{ request(app).get('/').then((response) => {
expect(response.statusCode).toBe(200); expect(response.statusCode).toBe(200);
expect(response.text).toBe('articles 2'); expect(response.text).toBe('articles 2');
done(); done();
@@ -87,32 +87,32 @@ describe('Test root path', () => {
}); });
describe('Test articles rendering', () => { describe('Test articles rendering', () => {
test('404 article not found', (done) =>{ test('404 article not found', (done) => {
request(app).get('/2019/05/06/untitled/').then((response) =>{ request(app).get('/2019/05/06/untitled/').then((response) => {
expect(response.statusCode).toBe(404); expect(response.statusCode).toBe(404);
done(); done();
}); });
}); });
test('500 no template', (done) =>{ test('500 no template', (done) => {
utils.createEmptyDirs([path.join(dataDir, '2019', '05', '05'),]); utils.createEmptyDirs([path.join(dataDir, '2019', '05', '05'),]);
fs.writeFileSync(path.join(dataDir, '2019', '05', '05','index.md'), '# Hello'); fs.writeFileSync(path.join(dataDir, '2019', '05', '05', 'index.md'), '# Hello');
app.reload((res) => { app.reload((res) => {
expect(res).toBe(true); expect(res).toBe(true);
request(app).get('/2019/05/05/hello/').then((response) =>{ request(app).get('/2019/05/05/hello/').then((response) => {
expect(response.statusCode).toBe(500); expect(response.statusCode).toBe(500);
done(); done();
}); });
}); });
}); });
test('200 rendered article', (done) =>{ test('200 rendered article', (done) => {
utils.createEmptyDirs([path.join(dataDir, '2019', '05', '05'),]); utils.createEmptyDirs([path.join(dataDir, '2019', '05', '05'),]);
fs.writeFileSync(path.join(dataDir, '2019', '05', '05','index.md'), '# Hello'); fs.writeFileSync(path.join(dataDir, '2019', '05', '05', 'index.md'), '# Hello');
fs.writeFileSync(path.join(dataDir, testTemplate), '<%- article.content %><%- `<a href="${article.url}">reload</a>` %>'); fs.writeFileSync(path.join(dataDir, testTemplate), '<%- article.content %><%- `<a href="${article.url}">reload</a>` %>');
app.reload((res) => { app.reload((res) => {
expect(res).toBe(true); expect(res).toBe(true);
request(app).get('/2019/05/05/hello/').then((response) =>{ request(app).get('/2019/05/05/hello/').then((response) => {
expect(response.statusCode).toBe(200); expect(response.statusCode).toBe(200);
expect(response.text).toBe('<h1 id="hello">Hello</h1><a href="/2019/05/05/hello/">reload</a>'); expect(response.text).toBe('<h1 id="hello">Hello</h1><a href="/2019/05/05/hello/">reload</a>');
done(); done();
@@ -120,30 +120,30 @@ describe('Test articles rendering', () => {
}); });
}); });
test('200 other url', (done) =>{ test('200 other url', (done) => {
utils.createEmptyDirs([path.join(dataDir, '2019', '05', '05'),]); utils.createEmptyDirs([path.join(dataDir, '2019', '05', '05'),]);
utils.createEmptyFiles([ utils.createEmptyFiles([
path.join(dataDir, '2019', '05', '05','index.md'), path.join(dataDir, '2019', '05', '05', 'index.md'),
path.join(dataDir, testTemplate) path.join(dataDir, testTemplate)
]); ]);
app.reload((res) => { app.reload((res) => {
expect(res).toBe(true); expect(res).toBe(true);
request(app).get('/2019/05/05/anything/').then((response) =>{ request(app).get('/2019/05/05/anything/').then((response) => {
expect(response.statusCode).toBe(200); expect(response.statusCode).toBe(200);
done(); done();
}); });
}); });
}); });
test('200 other url 2', (done) =>{ test('200 other url 2', (done) => {
utils.createEmptyDirs([path.join(dataDir, '2019', '05', '05'),]); utils.createEmptyDirs([path.join(dataDir, '2019', '05', '05'),]);
utils.createEmptyFiles([ utils.createEmptyFiles([
path.join(dataDir, '2019', '05', '05','index.md'), path.join(dataDir, '2019', '05', '05', 'index.md'),
path.join(dataDir, testTemplate) path.join(dataDir, testTemplate)
]); ]);
app.reload((res) => { app.reload((res) => {
expect(res).toBe(true); expect(res).toBe(true);
request(app).get('/2019/05/05/').then((response) =>{ request(app).get('/2019/05/05/').then((response) => {
expect(response.statusCode).toBe(200); expect(response.statusCode).toBe(200);
done(); done();
}); });
@@ -153,30 +153,30 @@ describe('Test articles rendering', () => {
describe('Test static files', () => { describe('Test static files', () => {
test('404 invalid file no error page', (done) =>{ test('404 invalid file no error page', (done) => {
request(app).get('/somefile.txt').then((response) =>{ request(app).get('/somefile.txt').then((response) => {
expect(response.statusCode).toBe(404); expect(response.statusCode).toBe(404);
done(); done();
}); });
}); });
test('404 invalid file but error page', (done) =>{ test('404 invalid file but error page', (done) => {
fs.writeFileSync(path.join(dataDir,testError), 'error <%= error %> at <%= path %>'); fs.writeFileSync(path.join(dataDir, testError), 'error <%= error %> at <%= path %>');
request(app).get('/somefile.txt').then((response) =>{ request(app).get('/somefile.txt').then((response) => {
expect(response.statusCode).toBe(404); expect(response.statusCode).toBe(404);
expect(response.text).toBe('error 404 at /somefile.txt'); expect(response.text).toBe('error 404 at /somefile.txt');
done(); done();
}); });
}); });
test('404 hidden file', (done) =>{ test('404 hidden file', (done) => {
fs.writeFileSync(path.join(dataDir,'somefile.test'), ''); fs.writeFileSync(path.join(dataDir, 'somefile.test'), '');
request(app).get('/somefile.test').then((response) =>{ request(app).get('/somefile.test').then((response) => {
expect(response.statusCode).toBe(404); expect(response.statusCode).toBe(404);
done(); done();
}); });
}); });
test('200 valid file', (done) =>{ test('200 valid file', (done) => {
fs.writeFileSync(`${dataDir}/somefile.txt`, 'filecontent'); fs.writeFileSync(`${dataDir}/somefile.txt`, 'filecontent');
request(app).get('/somefile.txt').then((response) =>{ request(app).get('/somefile.txt').then((response) => {
expect(response.statusCode).toBe(200); expect(response.statusCode).toBe(200);
expect(response.text).toBe('filecontent'); expect(response.text).toBe('filecontent');
done(); done();
@@ -185,20 +185,20 @@ describe('Test static files', () => {
}); });
describe('Test other requests', () => { describe('Test other requests', () => {
test('400 POST', (done) =>{ test('400 POST', (done) => {
request(app).post('/').then((response) =>{ request(app).post('/').then((response) => {
expect(response.statusCode).toBe(400); expect(response.statusCode).toBe(400);
done(); done();
}); });
}); });
test('400 PUT', (done) =>{ test('400 PUT', (done) => {
request(app).put('/').then((response) =>{ request(app).put('/').then((response) => {
expect(response.statusCode).toBe(400); expect(response.statusCode).toBe(400);
done(); done();
}); });
}); });
test('400 DELETE', (done) =>{ test('400 DELETE', (done) => {
request(app).delete('/').then((response) =>{ request(app).delete('/').then((response) => {
expect(response.statusCode).toBe(400); expect(response.statusCode).toBe(400);
done(); done();
}); });
test/file_walker.test.js
+4 -4
View File
@@ -230,11 +230,11 @@ describe('Test article fetching', () => {
year: 2019, year: 2019,
month: 5, month: 5,
day: 5, day: 5,
date : new Date(2019,5,5), date: new Date(2019, 5, 5),
title: 'Untitled', title: 'Untitled',
thumbnail: 'default.png', thumbnail: 'default.png',
escapedTitle: 'untitled', escapedTitle: 'untitled',
url: '/'+path.join('2019', '05', '05', 'untitled')+'/', url: '/' + path.join('2019', '05', '05', 'untitled') + '/',
}); });
done(); done();
}); });
@@ -258,11 +258,11 @@ describe('Test article fetching', () => {
year: 2019, year: 2019,
month: 5, month: 5,
day: 5, day: 5,
date : new Date(2019,5,5), date: new Date(2019, 5, 5),
title: 'Title with : info !', title: 'Title with : info !',
thumbnail: path.join('2019', '05', '05', './thumbnail.jpg'), thumbnail: path.join('2019', '05', '05', './thumbnail.jpg'),
escapedTitle: 'title_with___info', escapedTitle: 'title_with___info',
url: '/'+path.join('2019', '05', '05', 'title_with___info')+'/', url: '/' + path.join('2019', '05', '05', 'title_with___info') + '/',
}); });
done(); done();
}); });
test/test_utils.js
+4 -4
View File
@@ -6,15 +6,15 @@ const deleteFolderSync = (dir) => {
return; return;
fs.readdirSync(dir, {withFileTypes: true}).forEach((item) => { fs.readdirSync(dir, {withFileTypes: true}).forEach((item) => {
if (item.isDirectory()) if (item.isDirectory())
deleteFolderSync(path.join(dir,item.name)); deleteFolderSync(path.join(dir, item.name));
else else
fs.unlinkSync(path.join(dir,item.name)); fs.unlinkSync(path.join(dir, item.name));
}); });
fs.rmdirSync(dir); fs.rmdirSync(dir);
}; };
module.exports = { module.exports = {
deleteFolderSync: deleteFolderSync, deleteFolderSync: deleteFolderSync,
createEmptyDirs: (list) =>list.forEach((path) =>fs.mkdirSync(path, {recursive: true})), createEmptyDirs: (list) => list.forEach((path) => fs.mkdirSync(path, {recursive: true})),
createEmptyFiles: (list) =>list.forEach((file) =>fs.writeFileSync(file, '')), createEmptyFiles: (list) => list.forEach((file) => fs.writeFileSync(file, '')),
}; };