rename some files

index.js

@@ -7,5 +7,4 @@
 "use strict";
 
 exports.Toshihiko = require("./lib/toshihiko");
-exports.Type = require("./lib/fieldType");
-exports.Memcached = require("toshihiko-memcached");
+exports.Type = require("./lib/field_type");

lib/field.js

@@ -6,9 +6,10 @@
  */
 "use strict";
 
-var fieldTypes = require("./fieldType");
 var util = require("util");
 
+var fieldTypes = require("./field_type");
+
 /**
  * Toshihiko Field
  * @param opt {

lib/fieldType/index.js → lib/field_type/index.js

@@ -6,12 +6,12 @@
  */
 "use strict";
 
-var _String = require("./string");
 var _Boolean = require("./boolean");
-var Integer = require("./integer");
+var _String = require("./string");
+var Datetime = require("./datetime");
 var Float = require("./float");
+var Integer = require("./integer");
 var Json = require("./json");
-var Datetime = require("./datetime");
 
 module.exports = {
     String      : _String,

lib/model.js

@@ -6,11 +6,12 @@
  */
 "use strict";
 
+var util = require("util");
+var colors = require("colors");
+
 var Field = require("./field");
 var Query = require("./query");
 var Yukari = require("./yukari");
-var util = require("util");
-var colors = require("colors");
 
 /**
  * Toshihiko Model

lib/query.js

@@ -6,17 +6,19 @@
  */
 "use strict";
 
-var λ = require("lodash");
-var colors = require("colors");
 var util = require("util");
-var Yukari = require("./yukari");
-var mysql = require("mysql2");
+
 var async = require("async");
+var colors = require("colors");
+var mysql = require("mysql2");
 var Scarlet = require("scarlet-task");
-var escaper = require("./escaper");
-var ResultPromisor = require("./resultpromisor");
+var λ = require("lodash");
+
 var common = require("../util/common");
-var sqlParser = require("../util/sqlparser");
+var escaper = require("./escaper");
+var ResultPromisor = require("./result_promisor");
+var sqlParser = require("../util/sql_parser");
+var Yukari = require("./yukari");
 
 /**
  * limit array to limit object

lib/resultpromisor.js → lib/result_promisor.js

@@ -6,9 +6,10 @@
  */
 "use strict";
 
-var damnArguments = require("../util/damnarguments");
 var BlueBird = require("bluebird");
 
+var damnArguments = require("../util/damn_arguments");
+
 /**
  * Result Promisor
  * @constructor

lib/toshihiko.js

@@ -6,10 +6,11 @@
  */
 "use strict";
 
-var 囍 = require("lodash");
 var mysql = require("mysql2");
-var Model = require("./model");
+var 囍 = require("lodash");
+
 var common = require("../util/common");
+var Model = require("./model");
 
 /**
  * Toshihiko Main Object

lib/yukari.js

@@ -6,12 +6,14 @@
  */
 "use strict";
 
-var 囍 = require("lodash");
 var util = require("util");
-var mysql = require("mysql2");
+
 var async = require("async");
-var fieldType = require("./fieldType");
-var ResultPromisor = require("./resultpromisor");
+var mysql = require("mysql2");
+var 囍 = require("lodash");
+
+var fieldType = require("./field_type");
+var ResultPromisor = require("./result_promisor");
 
 /**
  * Yakumo Yukari is the entity of Yakumo Toshihiko.

package.json

@@ -14,8 +14,7 @@
     "lodash": "^3.10.1",
     "moment": "^2.10.6",
     "mysql2": "^0.15.8",
-    "scarlet-task": "^0.1.0-comment",
-    "toshihiko-memcached": "^0.1.0"
+    "scarlet-task": "^0.1.0-comment"
   },
   "devDependencies": {
     "chinese-random-skill": "^0.0.3-rdm",
@@ -25,7 +24,8 @@
     "jsxhint": "^0.15.1",
     "mocha": "^2.3.4",
     "precommit-hook": "^3.0.0",
-    "should": "^8.0.1"
+    "should": "^8.0.1",
+    "toshihiko-memcached": "^0.1.0"
   },
   "scripts": {
     "test": "make test",

test/escaper.js

@@ -5,6 +5,7 @@
  * reserved.
  */
 require("should");
+
 var escaper = require("../lib/escaper");
 
 describe("Escaper", function() {

test/field.js

@@ -4,9 +4,10 @@
  * Copyright (c) 2015 Souche.com, all rights
  * reserved
  */
-var field = require("../lib/fieldType");
 require("should");
 
+var field = require("../lib/field_type");
+
 describe("Field",function () {
     describe("float type", function () {
         var float = field.Float;

test/issues.js

@@ -5,7 +5,9 @@
  * reserved
  */
 require("should");
+
 var T = require("../");
+
 var toshihiko = new T.Toshihiko("myapp_test", "root", "", {
     cache : {
         name: "memcached",

test/model.js

@@ -4,10 +4,12 @@
  * Copyright (c) 2015 Souche.com, all rights
  * reserved
  */
-var should = require("should");
-var T = require("../");
 var async = require("async");
+var should = require("should");
 var 鬼 = require("lodash");
+
+var T = require("../");
+
 var toshihiko = new T.Toshihiko("myapp_test", "root", "", {
     cache : {
         name: "memcached",

test/query.js

@@ -5,7 +5,9 @@
  * reserved.
  */
 require("should");
+
 var T = require("../");
+
 var toshihiko = new T.Toshihiko("test", "root", "", {});
 
 var Model = null;

test/sqlparser.js → test/sql_parser.js

@@ -5,7 +5,8 @@
  * reserved.
  */
 require("should");
-var parser = require("../util/sqlparser");
+
+var parser = require("../util/sql_parser");
 
 describe("Some SQL Parser", function() {
     describe("sql name to column", function() {

test/toshihiko.js

@@ -5,8 +5,10 @@
  * reserved.
  */
 var should = require("should");
+
 var Toshihiko = require("../lib/toshihiko");
-var Type = require("../lib/fieldType");
+var Type = require("../lib/field_type");
+
 var toshihiko = new Toshihiko("test", "root", "");
 
 describe("toshihiko", function() {

test/yukari.js

@@ -5,8 +5,10 @@
  * reserved.
  */
 var should = require("should");
-var T = require("../");
 var moment = require("moment");
+
+var T = require("../");
+
 var toshihiko = new T.Toshihiko("myapp_test", "root", "", {
     cache : {
         name: "memcached",

util/sqlparser.js → util/sql_parser.js

@@ -6,7 +6,7 @@
  */
 "use strict";
 
-var keywords = require("./sqlkeyword");
+var keywords = require("./sql_keyword");
 
 function processQuote(sql, startIdx) {
     var start = sql[startIdx];