express-cmd 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a73377e3082ce9abb9e910c7d74789a5184f6b11
-  data.tar.gz: 7b364ad9da3eb258800bd6985edc929274504c7a
+  metadata.gz: 5301e51b2e87d44a253b3bd17eaccad435aa138a
+  data.tar.gz: 13edd49f757ba680c93d0cbe7773caa26dbfd583
 SHA512:
-  metadata.gz: bd714075d15db5718792f258f3434b25c99160172262aa7cc96136e1dcdbfccc8d2ad82dd8dd737ba976d99b1511dfed50e6bef88760f65028a6bed15822c729
-  data.tar.gz: 7289bf3608b1559ffad6484121e9f3d63d3274dba3ab86b23d2b6f7c8dd17000900f93a75133062916856fd31dc90f04b3c25faa22ae2a95026c693b0cfd56d0
+  metadata.gz: ca912f7f467cc187f97bb62fcf841879ef1c008d0dec8f9a2639b24d306fe1073cccd0bfbaa9a110f42dbb0d922f2cf3584b23f534cf1d141754bbd5740d7672
+  data.tar.gz: f58d075f22e5c92257a86e416a4cef59a8ab5759f8fcb779d690c797c82a87cac696c2ffaacb5f1ddfd75737e283d0fa34a2bbfd9e790cdcf0ebd6668c0dfd4a

data/.gitignore

@@ -8,3 +8,5 @@
 /spec/reports/
 /tmp/
 /test-project
+
+/*.gem

data/README.md

@@ -20,16 +20,20 @@ Or install it yourself as:
 
 I choose `mongodb` as my datastore, and I perfer to use `mongoose`.
 
-1. make sure you have installed node-inspector (debug tool) and nodemon (node auto reload after saved).
+  1. make sure you have installed node-inspector (debug tool) and nodemon (node auto reload after saved).
 
 ```bash
 npm install -g node-inspector
 npm install -g nodemon
 ```
 
-2. `express app_name`, and you can specify an option, for example `express my-project --skip_npm_install`.
+  2. `express app_name`, and you can specify an option, for example `express my-project --skip_npm_install`.
 
-**supported options**: `--skip_npm_install`.
+> supported options:
+
+  `--skip_npm_install`.
+
+  3. I use `i18next` as translations framework.
 
 ## Test
 

data/lib/express_cmd/generator.rb

@@ -12,35 +12,47 @@ module ExpressCmd
     end
 
     def setup_lib
-      keep_file "#{app_name}/lib"
+      empty_directory "#{app_name}/lib"
       copy_file "lib/errors.js", "#{app_name}/lib/errors.js"
       copy_file "lib/logger.js", "#{app_name}/lib/logger.js"
     end
 
     def setup_config
-      keep_file "#{app_name}/config"
+      empty_directory "#{app_name}/config"
       copy_file "config/mongo.js", "#{app_name}/config/mongo.js"
       copy_file "config/mongo.yml", "#{app_name}/config/mongo.yml"
+
+      empty_directory "#{app_name}/config/locales"
+      empty_directory "#{app_name}/config/locales/en-us"
+      empty_directory "#{app_name}/config/locales/zh-cn"
+      copy_file "config/locales/en-us/ns.special.json", "#{app_name}/config/locales/en-us/ns.special.json"
+      copy_file "config/locales/zh-cn/ns.special.json", "#{app_name}/config/locales/zh-cn/ns.special.json"
+      copy_file "config/i18n.js", "#{app_name}/config/i18n.js"
     end
 
     def setup_middleware
-      keep_file "#{app_name}/middlewares"
+      empty_directory "#{app_name}/middlewares"
       copy_file "middlewares/before-filter.js", "#{app_name}/middlewares/before-filter.js"
       copy_file "middlewares/error-handler.js", "#{app_name}/middlewares/error-handler.js"
       copy_file "middlewares/morgan-log.js", "#{app_name}/middlewares/morgan-log.js"
+      copy_file "middlewares/i18n.js", "#{app_name}/middlewares/i18n.js"
+    end
+
+    def setup_model
+      keep_file "#{app_name}/models"
     end
 
     def setup_route
-      keep_file "#{app_name}/routes"
+      empty_directory "#{app_name}/routes"
       copy_file "routes/instance.js", "#{app_name}/routes/instance.js"
       copy_file "routes/configuration.js", "#{app_name}/routes/configuration.js"
       copy_file "routes/translation.js", "#{app_name}/routes/translation.js"
     end
 
     def setup_test
-      keep_file "#{app_name}/test"
+      empty_directory "#{app_name}/test"
       keep_file "#{app_name}/test/reporter"
-      keep_file "#{app_name}/test/units"
+      empty_directory "#{app_name}/test/units"
 
       copy_file "test/test-helper.js", "#{app_name}/test/test-helper.js"
       copy_file "test/units/demo_test.js", "#{app_name}/test/units/demo_test.js"

data/lib/express_cmd/version.rb

@@ -1,3 +1,3 @@
 module ExpressCmd
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/templates/.gitignore

@@ -2,7 +2,5 @@
 /.idea
 /node_modules
 /log
-/test/reporter/*.xml
+/test/reporter
 .npm-debug.log
-
-/*.gem

data/templates/config/i18n.js

@@ -0,0 +1,20 @@
+var i18n = require('i18next');
+var path = require('path');
+
+configDir = path.join(__dirname, '../config')
+
+// I18n Config
+// http://i18next.com/node/pages/doc_init.html
+i18n.init({
+  detectLngQS: 'locale',
+  lngWhitelist: ['en-us', 'zh-cn'],
+  resGetPath: configDir + "/locales/__lng__/__ns__.json",
+  ns: {namespaces: ['ns.special'], defaultNs: 'ns.special'},
+  debug: true,
+  lowerCaseLng: true,
+  fallbackLng: ['en-us'],
+  useCookie: false,
+  detectLngFromLocalStorage: false
+});
+
+module.exports = i18n;

data/templates/config/locales/en-us/ns.special.json

@@ -0,0 +1,12 @@
+{
+  "errorHandling": {
+    "badRequest": "Invalid request data",
+    "authRequired": "Authorization required",
+    "forbidden": "Forbidden",
+    "notFound": "Not found",
+    "internalServerError": "Internal server error",
+    "multiJson": {
+      "decode": "Problems parsing JSON"
+    }
+  }
+}

data/templates/config/locales/zh-cn/ns.special.json

@@ -0,0 +1,12 @@
+{
+  "errorHandling": {
+    "badRequest": "错误的请求",
+    "authRequired": "验证失败",
+    "forbidden": "未授权",
+    "notFound": "未找到",
+    "internalServerError": "内部错误",
+    "multiJson": {
+      "decode": "解析JSON出错"
+    }
+  }
+}

data/templates/lib/errors.js

@@ -1,3 +1,5 @@
+var i18n = require('../config/i18n');
+
 var hasProp = {}.hasOwnProperty;
 var extend = function (child, parent) {
   for (var key in parent) {
@@ -18,7 +20,7 @@ var AuthError = (function (superClass) {
 
   function AuthError(message) {
     this.status = 401;
-    this.message = 'Unauthorized';
+    this.message = message || i18n.t('errorHandling.authRequired');
     AuthError.__super__.constructor.call(this, this.message);
   }
 
@@ -30,7 +32,7 @@ var ReqError = (function (superClass) {
 
   function ReqError(message) {
     this.status = 400;
-    this.message = 'Invalid request data';
+    this.message = message || i18n.t('errorHandling.badRequest');
     ReqError.__super__.constructor.call(this, this.message);
   }
 

data/templates/middlewares/before-filter.js

@@ -13,7 +13,8 @@ module.exports = function(app) {
     if ('OPTIONS' === req.method || req.path === '/favicon.ico') {
       return res.status(204).end();
     }
-    // TODO: write your auth logic.
+
+    // TODO: You can write your auth logic.
     if (!req.get('X-Access-Token')) {
       return next(new AuthError());
     } else {

data/templates/middlewares/i18n.js

@@ -0,0 +1,5 @@
+var i18n = require('../config/i18n');
+
+module.exports = function (app) {
+  app.use(i18n.handle);
+}

data/templates/package.json.erb

@@ -20,6 +20,7 @@
     "ejs": "^2.3.2",
     "express": "^4.12.4",
     "file-stream-rotator": "0.0.6",
+    "i18next": "^1.7.10",
     "js-yaml": "^3.3.1",
     "mocha": "^2.2.5",
     "mocha-jenkins-reporter": "^0.1.8",

data/templates/server.js

@@ -17,6 +17,8 @@ app.use(cookieParser());
 app.set('port', process.env.PORT || 9292);
 app.set('env', process.env.NODE_ENV || 'development');
 
+// I18n
+require('./middlewares/i18n')(app);
 // Before Filter
 require('./middlewares/before-filter')(app);
 // Access Log

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express-cmd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - wluo
@@ -133,12 +133,16 @@ files:
 - templates/.gitignore
 - templates/Makefile
 - templates/README.md.erb
+- templates/config/i18n.js
+- templates/config/locales/en-us/ns.special.json
+- templates/config/locales/zh-cn/ns.special.json
 - templates/config/mongo.js
 - templates/config/mongo.yml
 - templates/lib/errors.js
 - templates/lib/logger.js
 - templates/middlewares/before-filter.js
 - templates/middlewares/error-handler.js
+- templates/middlewares/i18n.js
 - templates/middlewares/morgan-log.js
 - templates/package.json.erb
 - templates/routes/configuration.js