added express4-cookie example & test

mashpie · Feb 6, 2016 · 1b5258c · 1b5258c
1 parent 300917b
commit 1b5258c
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 10 deletions.
diff --git a/examples/express4-cookie/index.js b/examples/express4-cookie/index.js
@@ -0,0 +1,38 @@
+var express = require('express');
+var cookieParser = require('cookie-parser');
+var url = require('url');
+var i18n = require('../../i18n');
+
+i18n.configure({
+  locales: ['en', 'de', 'ar'],
+  cookie: 'yourcookiename',
+  directory: __dirname+'/locales'
+});
+
+var app = express();
+app.use(cookieParser());
+app.use(i18n.init);
+
+app.get('/test', function (req, res) {
+  // delay a response to simulate a long running process,
+  // while another request comes in with altered language settings
+  setTimeout(function () {
+    res.send('<body>res: ' + res.__('Hello') + ' req: ' + req.__('Hello') + '</body>');
+  }, app.getDelay(req, res));
+});
+
+app.get('/testfail', function (req, res) {
+  // delay a response to simulate a long running process,
+  // while another request comes in with altered language settings
+  setTimeout(function () {
+    res.send('<body>' + i18n.__('Hello') + '</body>');
+  }, app.getDelay(req, res));
+});
+
+// simple param parsing
+app.getDelay = function (req, res) {
+  return url.parse(req.url, true).query.delay || 0;
+};
+
+// startup
+app.listen(3000);
diff --git a/examples/express4-cookie/locales/ar.json b/examples/express4-cookie/locales/ar.json
@@ -0,0 +1,3 @@
+{
+    "Hello": "مرحبا"
+}
diff --git a/examples/express4-cookie/locales/de.json b/examples/express4-cookie/locales/de.json
@@ -0,0 +1,4 @@
+{
+	"Hello World": "Hallo Welt",
+	"Hello": "Hallo"
+}
diff --git a/examples/express4-cookie/locales/en.json b/examples/express4-cookie/locales/en.json
@@ -0,0 +1,4 @@
+{
+	"Hello World": "Hello World",
+    "Hello": "Hello"
+}
diff --git a/examples/express4-cookie/test.js b/examples/express4-cookie/test.js
@@ -0,0 +1,42 @@
+require('./index');
+
+var Browser = require('zombie'),
+    visitLinks = require('../testlib/visitlinks'),
+    DE = new Browser(),
+    EN = new Browser();
+    AR = new Browser();
+
+EN.setCookie({name: 'yourcookiename', domain: 'localhost', value: 'en'});
+DE.setCookie({name: 'yourcookiename', domain: 'localhost', value: 'de'});
+AR.setCookie({name: 'yourcookiename', domain: 'localhost', value: 'ar'});
+
+describe('Using i18n in express 4.x with cookieParser', function () {
+  describe('res.__() is able to handle concurrent request correctly', function () {
+    describe('serial requests', function () {
+      visitLinks('series', 'test', EN, 'res: Hello req: Hello', DE, 'res: Hallo req: Hallo');
+    });
+
+    describe('parallel requests', function () {
+      visitLinks('parallel', 'test', EN, 'res: Hello req: Hello', DE, 'res: Hallo req: Hallo');
+    });
+
+    describe('serial requests AR', function () {
+      visitLinks('series', 'test', EN, 'res: Hello req: Hello', AR, 'res: مرحبا req: مرحبا');
+    });
+
+    describe('parallel requests AR', function () {
+      visitLinks('parallel', 'test', EN, 'res: Hello req: Hello', AR, 'res: مرحبا req: مرحبا');
+    });
+
+  });
+
+  describe('i18n.__() is NOT able to handle concurrent request correctly', function () {
+    describe('serial requests', function () {
+      visitLinks('series', 'testfail', EN, 'Hello', DE, 'Hello');
+    });
+
+    describe('parallel requests', function () {
+      visitLinks('parallel', 'testfail', EN, 'Hello', DE, 'Hello');
+    });
+  });
+});
diff --git a/i18n.js b/i18n.js
@@ -792,7 +792,7 @@ function getStorageFilePath(locale) {
       return filepathJS;
     }
   } catch (e) {
-    logDebug('will write to ' + filepath);
+    logDebug('will use ' + filepath);
   }
   return filepath;
 }

diff --git a/package.json b/package.json
@@ -18,20 +18,19 @@
     "lib": "."
   },
   "dependencies": {
-    "sprintf-js": ">=1.0.3",
+    "debug": "*",
     "mustache": "*",
-    "debug": "*"
+    "sprintf-js": ">=1.0.3"
   },
   "devDependencies": {
+    "async": "*",
+    "cookie-parser": "^1.4.1",
+    "express": "^4.13.4",
+    "jshint": "*",
     "mocha": "*",
     "should": "*",
-    "zombie": "*",
-    "async": "*",
-    "hbs": "*",
-    "jade": "*",
-    "consolidate": "*",
-    "restify": "*",
-    "jshint": "*"
+    "url": "^0.11.0",
+    "zombie": "*"
   },
   "engines": {
     "node": ">=0.10.0"