From 94a09d18f8a363d7cfe73d21711cb445b582745f Mon Sep 17 00:00:00 2001
From: tatsy <tatsy.mail@gmail.com>
Date: Sat, 7 Feb 2015 13:15:45 +0900
Subject: [PATCH] Revising code format.

---
 app.js                       |   2 +
 lib/article-manager.js       |   8 +-
 lib/connect.js               |   4 +-
 lib/en-utils.js              |   6 +-
 lib/md-video.js              |  46 +++---
 routes/index.js              | 271 ++++++++++++++++++-----------------
 test/.eslintrc               |   3 +
 test/test_article_manager.js |  29 ++--
 test/test_connect.js         |   4 +-
 test/test_date_formatter.js  |  32 +++--
 test/test_en_utils.js        |  26 ++--
 test/test_md_video.js        |  33 +++--
 test/test_server.js          |  52 +++----
 13 files changed, 267 insertions(+), 249 deletions(-)
 create mode 100644 test/.eslintrc

diff --git a/app.js b/app.js
index c5ed6fa..af86654 100644
--- a/app.js
+++ b/app.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var express = require('express');
 var app  = express();
 var http = require('http').Server(app);
diff --git a/lib/article-manager.js b/lib/article-manager.js
index a123066..5817481 100644
--- a/lib/article-manager.js
+++ b/lib/article-manager.js
@@ -7,15 +7,15 @@ var articleDir = './public/articles/';
 exports.dir = articleDir;
 
 /*
- * get information text from ARTICLE_DIR/info.txt
- */
+* get information text from ARTICLE_DIR/info.txt
+*/
 exports.getInfo = function(id) {
   return JSON.parse(fs.readFileSync(articleDir + id + '/info.txt'));
 };
 
 /*
- * get article list categorized its post month and day
- */
+* get article list categorized its post month and day
+*/
 exports.getList = function(callback) {
   var i;
 
diff --git a/lib/connect.js b/lib/connect.js
index 521d901..4095013 100644
--- a/lib/connect.js
+++ b/lib/connect.js
@@ -110,7 +110,7 @@ function onConnection(socket) {
 
   socket.on('connected', function(articleInfo) {
     var uploadDir = 'articles/' + articleInfo.id + '/upload';
-    uploadedFiles = getFilesWithCreatedOrder('./public/' + uploadDir);
+    var uploadedFiles = getFilesWithCreatedOrder('./public/' + uploadDir);
     socket.emit('file list update', uploadedFiles);
 
     socket.on('code update', function(code) {
@@ -134,7 +134,7 @@ function onConnection(socket) {
       var uploadDir = 'articles/' + articleInfo.id + '/upload';
       var noteStore = enutils.getNoteStore();
       var rendered = renderCode(articleInfo.code, uploadDir, uploadDir);
-      var evData = enutils.ENMLize(rendered);
+      var evData = enutils.enmlize(rendered);
       enutils.makeNote(noteStore, articleInfo.title, evData.enml, evData.resources, null, function() { socket.emit('save evernote success') });
     });
 
diff --git a/lib/en-utils.js b/lib/en-utils.js
index 98a8966..9b4778a 100644
--- a/lib/en-utils.js
+++ b/lib/en-utils.js
@@ -138,7 +138,7 @@ function removeIdClass(code) {
   return code;
 }
 
-function ENMLize(code) {
+function enmlize(code) {
   var i, after;
 
   var enData = {
@@ -184,7 +184,7 @@ function ENMLize(code) {
   do {
     matchCode = regexCode.exec(code);
     if(!matchCode) break;
-    
+
     var lineno = matchCode[1].split('\n').length;
     var linenoStr = '';
     for (i = 1; i <= lineno; i++) {
@@ -213,5 +213,5 @@ function ENMLize(code) {
   return enData;
 }
 
-exports.ENMLize = ENMLize;
+exports.enmlize = enmlize;
 exports.removeIdClass = removeIdClass;
diff --git a/lib/md-video.js b/lib/md-video.js
index 4cf0818..72a39ec 100644
--- a/lib/md-video.js
+++ b/lib/md-video.js
@@ -1,33 +1,35 @@
+'use strict';
+
 var regex = {
-    link: new RegExp(/\$\[([\s\S]*?)\]\(([\s\S]*?)\)/)
+  link: new RegExp(/\$\[([\s\S]*?)\]\(([\s\S]*?)\)/)
 };
 
 function render(href, text) {
-    var imsizeReg = /([\s\S]+) =([0-9]*)x([0-9]*)/;
-    var match = imsizeReg.exec(href);
-    if(match) href = match[1];
-    var out = '<video src="' + href + '"';
+  var imsizeReg = /([\s\S]+) =([0-9]*)x([0-9]*)/;
+  var match = imsizeReg.exec(href);
+  if(match) href = match[1];
+  var out = '<video src="' + href + '"';
 
-    if(match) {
-        if(match[2] != '') {
-            out += ' width="' + match[2] + '"';
-        }
-        if(match[3] != '') {
-            out += ' height="' + match[3] + '"';
-        }
+  if(match) {
+    if(match[2] != '') {
+      out += ' width="' + match[2] + '"';
     }
-    out += ' controls>';
-    if (text) {
-        out += text;
+    if(match[3] != '') {
+      out += ' height="' + match[3] + '"';
     }
-    out += '</video>';
-    return out;
+  }
+  out += ' controls>';
+  if (text) {
+    out += text;
+  }
+  out += '</video>';
+  return out;
 }
 
 exports.marked = function(code) {
-    var match = null;
-    while(match = regex.link.exec(code)) {
-        code = code.replace(regex.link, render(match[2], match[1]));
-    }
-    return code;
+  var match = null;
+  while(match = regex.link.exec(code)) {
+    code = code.replace(regex.link, render(match[2], match[1]));
+  }
+  return code;
 }
diff --git a/routes/index.js b/routes/index.js
index 1a94f56..40cf2e1 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var fs = require('fs');
 var mp = require('multiparty');
 var path = require('path');
@@ -7,146 +9,147 @@ var childProc = require('child_process');
 var am = require('../lib/article-manager');
 var df = require('../lib/date-formatter');
 
-var articleDir = './public/articles/';
-
 exports.index = function(req, res) {
-    am.getList(function(err, articles) {
-        if(err) {
-            throw err;
-        }
+  am.getList(function(err, articles) {
+    if (err) {
+      throw err;
+    }
 
-        if(!articles) {
-            articles = [];
-        }
-        
-        res.render('index', { articles: articles });
-    });
-}
+    if (!articles) {
+      articles = [];
+    }
+
+    res.render('index', { articles: articles });
+  });
+};
 
 exports.edit = function(req, res) {
-    var config = module.parent.exports.get('config');
-    var form    = new mp.Form();
-    form.parse(req, function(err, fields, files) {
-        if(fields.from == "index") {
-            if(fields.articleId === undefined) {
-                var md5 = crypto.createHash('md5');
-                var datetime = (new Date()).getTime();
-                var orgText = fields.title + datetime.toString();
-                md5.update(orgText);
-                var articleId = md5.digest('hex');
-                var folder = am.dir + articleId;
-
-                fs.mkdir(folder, function(err) {
-                    if(err) {
-                        console.log('Failed to make a new directory');
-                        console.log(err.code);
-                    }
-
-                    fs.closeSync(fs.openSync(folder + '/index.html', 'a'));
-                    fs.closeSync(fs.openSync(folder + '/index.md', 'a'));
-
-                    fs.mkdir(folder + '/upload', function(err) {
-                        if(err) {
-                            console.log('Failed to make a new directory');
-                            console.log(err.code);
-                        }
-                    });
-
-                    var formatDate = df.format(datetime);
-                    fs.writeFileSync(folder + '/info.txt', JSON.stringify({ title: fields.title, datetime: formatDate }));
-
-                    var formData = {
-                        title: fields.title,
-                        articleId: articleId,
-                        code: [''],
-                    };
-
-                    res.render('edit', {
-                        fields: formData,
-                    });
-                });
-            } else {
-                console.log("Edit existing article.");
-                var info = am.getInfo(fields.articleId);
-                var code  = fs.readFileSync(am.dir + '/' + fields.articleId + '/index.md');
-                var formData = {
-                    title: info.title,
-                    articleId: fields.articleId,
-                    code: [code],
-                };
-
-                res.render('edit', {
-                    fields: formData,
-                    config: {
-                        host: config.host,
-                        port: config.port
-                    }
-                });
+  var config = module.parent.exports.get('config');
+  var form   = new mp.Form();
+  form.parse(req, function(err, fields, files) {
+    if (fields.from[0] === 'index') {
+      if (!fields.articleId) {
+        var md5 = crypto.createHash('md5');
+        var datetime = (new Date()).getTime();
+        var orgText = fields.title + datetime.toString();
+        md5.update(orgText);
+        var articleId = md5.digest('hex');
+        var folder = am.dir + articleId;
+
+        console.log("hogehoge");
+        fs.mkdir(folder, function(err) {
+          if (err) {
+            console.log('Failed to make a new directory');
+            console.log(err.code);
+          }
+
+          fs.closeSync(fs.openSync(folder + '/index.html', 'a'));
+          fs.closeSync(fs.openSync(folder + '/index.md', 'a'));
+
+          fs.mkdir(folder + '/upload', function(err) {
+            if(err) {
+              console.log('Failed to make a new directory');
+              console.log(err.code);
             }
-        }
-        else if(fields.from == "edit") {
-            var orgname = files.upload[0].originalFilename;
-            var tempPath = files.upload[0].path;
-            var ext = path.extname(orgname);
-            var basename = path.basename(orgname, ext);
-            var uploadDir = am.dir + fields.articleId + '/upload/';
-
-            console.log('extension is: ' + ext);
-
-            if(ext === '.avi' || ext === '.wmv' || ext === '.mp4' || ext === '.mpg' || ext == '.mov') {
-                var targetPath = uploadDir + basename + '.mp4';
-                var ffmpeg = childProc.spawn('ffmpeg', [
-                '-i', tempPath,
-                '-f', 'mp4',
-                '-y', targetPath
-                ]);
-
-                ffmpeg.stdout.on('data', function(data) {
-                    console.log('stdout: ' + data);
-                });
-
-                ffmpeg.stderr.on('data', function(data) {
-                    console.log('stderr: ' + data);
-                });
-
-                ffmpeg.on('close', function(code) {
-                    if(code !== 0) {
-                        console.log('chile process exited with code: ' + code);
-                        res.end('502 Internal Server Error');
-                        return;
-                    }
-                    console.log('Movie successfully converted!!');
-                    fs.unlink(tempPath, function(err) {
-                        if(err) {
-                            throw err;
-                        }
-                    });
-                });
+          });
+
+          var formatDate = df.format(datetime);
+          fs.writeFileSync(folder + '/info.txt', JSON.stringify({ title: fields.title, datetime: formatDate }));
+
+          var formData = {
+            title: fields.title,
+            articleId: articleId,
+            code: [ '' ],
+          };
+
+          res.render('edit', {
+            fields: formData,
+          });
+        });
+      } else {
+        console.log("Edit existing article.");
+        var info = am.getInfo(fields.articleId);
+        var code  = fs.readFileSync(am.dir + '/' + fields.articleId + '/index.md');
+        var formData = {
+          title: info.title,
+          articleId: fields.articleId,
+          code: [code],
+        };
+
+        res.render('edit', {
+          fields: formData,
+          config: {
+            host: config.host,
+            port: config.port
+          }
+        });
+      }
+    }
+    else if(fields.from[0] == "edit") {
+      var orgname = files.upload[0].originalFilename;
+      var tempPath = files.upload[0].path;
+      var ext = path.extname(orgname);
+      var basename = path.basename(orgname, ext);
+      var uploadDir = am.dir + fields.articleId + '/upload/';
+
+      console.log('extension is: ' + ext);
+
+      if(ext === '.avi' || ext === '.wmv' || ext === '.mp4' || ext === '.mpg' || ext == '.mov') {
+        var targetPath = uploadDir + basename + '.mp4';
+        var ffmpeg = childProc.spawn('ffmpeg', [
+        '-i', tempPath,
+        '-f', 'mp4',
+        '-y', targetPath
+        ]);
+
+        ffmpeg.stdout.on('data', function(data) {
+          console.log('stdout: ' + data);
+        });
+
+        ffmpeg.stderr.on('data', function(data) {
+          console.log('stderr: ' + data);
+        });
+
+        ffmpeg.on('close', function(code) {
+          if(code !== 0) {
+            console.log('chile process exited with code: ' + code);
+            res.end('502 Internal Server Error');
+            return;
+          }
+          console.log('Movie successfully converted!!');
+          fs.unlink(tempPath, function(err) {
+            if(err) {
+              throw err;
             }
-            else {
-                var targetPath = uploadDir + basename + ext;
-                console.log(targetPath);
-                fs.rename(tempPath, targetPath, function() {
-                    if(err) {
-                        console.log(err);
-                        throw err;
-                    }
-                    fs.unlink(tempPath, function() {
-                        if(err) {
-                            console.log(err);
-                            throw err;
-                        }
-                    });
-                });
+          });
+        });
+      }
+      else {
+        var targetPath = uploadDir + basename + ext;
+        console.log(targetPath);
+        fs.rename(tempPath, targetPath, function() {
+          if(err) {
+            console.log(err);
+            throw err;
+          }
+          fs.unlink(tempPath, function() {
+            if(err) {
+              console.log(err);
+              throw err;
             }
-
-            res.render('edit', {
-                fields: fields,
-                config: {
-                    host: config.host,
-                    port: config.port
-                }
-            });
+          });
+        });
+      }
+
+      res.render('edit', {
+        fields: fields,
+        config: {
+          host: config.host,
+          port: config.port
         }
-    });
+      });
+    } else {
+      throw Error('Form data sent from Unknown page');
+    }
+  });
 }
diff --git a/test/.eslintrc b/test/.eslintrc
new file mode 100644
index 0000000..9f3a654
--- /dev/null
+++ b/test/.eslintrc
@@ -0,0 +1,3 @@
+env:
+  node: true
+  mocha: true
diff --git a/test/test_article_manager.js b/test/test_article_manager.js
index 02fcdeb..ae997b7 100644
--- a/test/test_article_manager.js
+++ b/test/test_article_manager.js
@@ -1,21 +1,22 @@
+'use strict';
+
 var am     = require('../lib/article-manager.js');
-var should = require('should');
 var assert = require('assert');
 
 describe('article-manager test', function() {
-    it('article dir', function() {
-        am.dir.should.equal('./public/articles/');
-    });
+  it('article dir', function() {
+    am.dir.should.equal('./public/articles/');
+  });
 
-    it('get article list', function() {
-        am.getList(function(err, hash) {
-            if(err) {
-                throw err;
-            }
-            assert.deepEqual(Object.keys(hash), ['2015']);
-            assert.deepEqual(Object.keys(hash['2015']), ['1']);
-            var article = hash['2015']['1'][0];
-            assert.equal(article.title, 'Article Example');
-        });
+  it('get article list', function() {
+    am.getList(function(err, hash) {
+      if (err) {
+        throw err;
+      }
+      assert.deepEqual(Object.keys(hash), [ '2015' ]);
+      assert.deepEqual(Object.keys(hash['2015']), [ '1' ]);
+      var article = hash['2015']['1'][0];
+      assert.equal(article.title, 'Article Example');
     });
+  });
 });
diff --git a/test/test_connect.js b/test/test_connect.js
index bde2dc6..28fd571 100644
--- a/test/test_connect.js
+++ b/test/test_connect.js
@@ -1,6 +1,6 @@
+'use strict';
+
 var connect = require('../lib/connect');
-var should  = require('should');
-var chai    = require('chai');
 var fs      = require('fs');
 
 describe('connect', function() {
diff --git a/test/test_date_formatter.js b/test/test_date_formatter.js
index a84205c..e199e46 100644
--- a/test/test_date_formatter.js
+++ b/test/test_date_formatter.js
@@ -1,23 +1,25 @@
+'use strict';
+
 var df = require('../lib/date-formatter');
 
 var should = require('should');
 
 describe('date-formater', function() {
-    it('simple format', function() {
-        var datestr  = '1970/01/01 00:00:00';
-        var datetime = new Date(datestr);
-        df.format(datetime.getTime()).should.equal('1970/01/01 00:00:00');
-    });
+  it('simple format', function() {
+    var datestr  = '1970/01/01 00:00:00';
+    var datetime = new Date(datestr);
+    df.format(datetime.getTime()).should.equal('1970/01/01 00:00:00');
+  });
 
-    it('simple format', function() {
-        var datestr  = '2000/02/28 14:00:00';
-        var datetime = new Date(datestr);
-        df.format(datetime.getTime()).should.equal(datestr);
-    });
+  it('simple format', function() {
+    var datestr  = '2000/02/28 14:00:00';
+    var datetime = new Date(datestr);
+    df.format(datetime.getTime()).should.equal(datestr);
+  });
 
-    it('simple format', function() {
-        var datestr  = '2015/08/31 23:59:59';
-        var datetime = new Date(datestr);
-        df.format(datetime.getTime()).should.equal(datestr);
-    });
+  it('simple format', function() {
+    var datestr  = '2015/08/31 23:59:59';
+    var datetime = new Date(datestr);
+    df.format(datetime.getTime()).should.equal(datestr);
+  });
 });
diff --git a/test/test_en_utils.js b/test/test_en_utils.js
index 8ccffc6..a964fa2 100644
--- a/test/test_en_utils.js
+++ b/test/test_en_utils.js
@@ -1,21 +1,23 @@
+'use strict';
+
 var enutils = require('../lib/en-utils.js');
 
 var should = require('should');
 
 describe('en-utils', function() {
-    it('ENMLize 1', function() {
-        enutils.ENMLize('<h2>Hello</h2>').enml.should.equal('<h2>Hello</h2>');
-    });
+  it('ENMLize 1', function() {
+    enutils.enmlize('<h2>Hello</h2>').enml.should.equal('<h2>Hello</h2>');
+  });
 
-    it('ENMLize 2', function() {
-        enutils.ENMLize('<hr>').enml.should.equal('<hr />');
-    });
+  it('ENMLize 2', function() {
+    enutils.enmlize('<hr>').enml.should.equal('<hr />');
+  });
 
-    it('Remove id and class 1', function() {
-        enutils.removeIdClass('<span class="test">test</span>').should.equal('<span>test</span>');
-    });
+  it('Remove id and class 1', function() {
+    enutils.removeIdClass('<span class="test">test</span>').should.equal('<span>test</span>');
+  });
 
-    it('Remove id and class 2', function() {
-        enutils.removeIdClass('<span class="test" id="test">test</span>').should.equal('<span>test</span>');
-    });
+  it('Remove id and class 2', function() {
+    enutils.removeIdClass('<span class="test" id="test">test</span>').should.equal('<span>test</span>');
+  });
 });
diff --git a/test/test_md_video.js b/test/test_md_video.js
index c86334c..dbd20c3 100644
--- a/test/test_md_video.js
+++ b/test/test_md_video.js
@@ -1,25 +1,28 @@
+'use strict';
+
 var mdv = require('../lib/md-video');
 
 var should = require('should');
 
 describe('md-video', function() {
-    it('No size specification', function() {
-        mdv.marked('$[](movie.mp4)').should.equal('<video src="movie.mp4" controls></video>');
-    });
+  it('No size specification', function() {
+    mdv.marked('$[](movie.mp4)').should.equal('<video src="movie.mp4" controls></video>');
+  });
 
-    it('Movie text is specified', function() {
-        mdv.marked('$[Movie](movie.mp4)').should.equal('<video src="movie.mp4" controls>Movie</video>');
-    });
+  it('Movie text is specified', function() {
+    mdv.marked('$[Movie](movie.mp4)').should.equal('<video src="movie.mp4" controls>Movie</video>');
+  });
 
-    it('Only width is specified', function() {
-        mdv.marked('$[](movie.mp4 =100x)').should.equal('<video src="movie.mp4" width="100" controls></video>');
-    });
+  it('Only width is specified', function() {
+    mdv.marked('$[](movie.mp4 =100x)').should.equal('<video src="movie.mp4" width="100" controls></video>');
+  });
 
-    it('Only height is specified', function() {
-        mdv.marked('$[](movie.mp4 =x200)').should.equal('<video src="movie.mp4" height="200" controls></video>');
-    });
+  it('Only height is specified', function() {
+    mdv.marked('$[](movie.mp4 =x200)').should.equal('<video src="movie.mp4" height="200" controls></video>');
+  });
 
-    it('Both width and height are specified', function() {
-        mdv.marked('$[](movie.mp4 =100x200)').should.equal('<video src="movie.mp4" width="100" height="200" controls></video>');
-    });
+  it('Both width and height are specified', function() {
+    mdv.marked('$[](movie.mp4 =100x200)').should
+    .equal('<video src="movie.mp4" width="100" height="200" controls></video>');
+  });
 });
diff --git a/test/test_server.js b/test/test_server.js
index fae5f70..24ff5cb 100644
--- a/test/test_server.js
+++ b/test/test_server.js
@@ -1,37 +1,37 @@
+'use strict';
+
 var request = require('supertest');
 var app     = require('../app');
 
 require('should');
 
 describe('routes', function() {
-    var url = 'http://localhost:3000';
-
-    before(function(done) {
-        done();
-    });
+  before(function(done) {
+    done();
+  });
 
-    it('Should display index page', function(done) {
-        request(app)
-        .get('/')
-        .set('Accept', 'application/json')
-        .expect(200)
-        .end(function(err, res) {
-            if(err) return done(err);
-            done();
-        });
+  it('Should display index page', function(done) {
+    request(app)
+    .get('/')
+    .set('Accept', 'application/json')
+    .expect(200)
+    .end(function(err) {
+      if (err) return done(err);
+      done();
     });
+  });
 
-    it('Should display editor page', function(done) {
-        request(app)
-        .post('/edit')
-        .type('form')
-        .field('from', 'index')
-        .field('title', 'Example Article')
-        .field('articleId', 'article_example')
-        .expect(200)
-        .end(function(err, res) {
-            if(err) return done(err);
-            done();
-        });
+  it('Should display editor page', function(done) {
+    request(app)
+    .post('/edit')
+    .type('form')
+    .field('from', 'index')
+    .field('title', 'Example Article')
+    .field('articleId', 'article_example')
+    .expect(200)
+    .end(function(err) {
+      if (err) return done(err);
+      done();
     });
+  });
 });