Merge branch 'release-1.0.5'

CHANGELOG.md

@@ -1,3 +1,8 @@
+<a name="1.0.5"></a>
+## [1.0.5](https://github.com/adonisjs/adonis-antl/compare/v1.0.4...v1.0.5) (2016-12-12)
+
+
+
 <a name="1.0.4"></a>
 ## [1.0.4](https://github.com/adonisjs/adonis-antl/compare/v1.0.3...v1.0.4) (2016-10-07)
 

README.md

@@ -52,7 +52,7 @@ const providers = [
 
 ### Registering Aliases
 
-Providers are also defined inside `bootstrap/app.js` file.
+Aliases are also defined inside `bootstrap/app.js` file.
 
 ```javascript
 const aliases = {

bin/coverage.js

@@ -0,0 +1,12 @@
+'use strict'
+
+const semver = require('semver')
+const shell = require('shelljs')
+const nodeJsVersion = process.version
+let proxiesFlag = ''
+
+if (semver.lt(nodeJsVersion, '6.0.0')) {
+  proxiesFlag = '--harmony_proxies'
+}
+
+shell.exec(`DB=${process.env.DB} node ${proxiesFlag} ./node_modules/.bin/istanbul cover _mocha test`)

bin/test.js

@@ -0,0 +1,12 @@
+'use strict'
+
+const semver = require('semver')
+const shell = require('shelljs')
+const nodeJsVersion = process.version
+let proxiesFlag = ''
+
+if (semver.lt(nodeJsVersion, '6.0.0')) {
+  proxiesFlag = '--harmony_proxies'
+}
+
+shell.exec(`DB=${process.env.DB} node ${proxiesFlag} ./node_modules/.bin/istanbul cover _mocha --report lcovonly -- -R spec test && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage`)

package.json

@@ -1,14 +1,14 @@
 {
   "name": "adonis-antl",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Localization for adonisjs app",
   "main": "index.js",
   "directories": {
     "test": "test"
   },
   "scripts": {
-    "test": "npm run lint && node --harmony_proxies ./node_modules/.bin/istanbul cover _mocha --report lcovonly -- -R spec test && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage",
-    "coverage": "npm run lint && istanbul cover _mocha test",
+    "test": "npm run lint && FORCE_COLOR=true node ./bin/test",
+    "coverage": "npm run lint && FORCE_COLOR=true node ./bin/coverage",
     "lint": "standard"
   },
   "keywords": [
@@ -24,18 +24,20 @@
     "accepts": "^1.3.3",
     "adonis-ace": "^3.0.4",
     "adonis-fold": "^3.0.3",
-    "adonis-lucid": "^3.0.5",
+    "adonis-lucid": "^3.0.11",
     "chai": "^3.5.0",
     "clear-require": "^1.0.1",
     "co-mocha": "^1.1.3",
-    "coveralls": "^2.11.14",
+    "coveralls": "^2.11.15",
     "cz-conventional-changelog": "^1.2.0",
     "istanbul": "^0.4.5",
-    "mocha": "^3.0.2",
+    "mocha": "^3.2.0",
     "mocha-lcov-reporter": "^1.2.0",
-    "sqlite3": "^3.1.4",
-    "standard": "^8.1.0",
-    "supertest": "^2.0.0"
+    "semver": "^5.3.0",
+    "shelljs": "^0.7.5",
+    "sqlite3": "^3.1.8",
+    "standard": "^8.6.0",
+    "supertest": "^2.0.1"
   },
   "standard": {
     "global": [
@@ -58,14 +60,14 @@
     "co": "^4.6.0",
     "co-fs-extra": "^1.2.1",
     "flat": "^2.0.1",
-    "haye": "^1.0.0",
+    "haye": "^1.0.1",
     "intl": "^1.2.5",
     "intl-format-cache": "^2.0.5",
     "intl-messageformat": "^1.3.0",
     "intl-relativeformat": "^1.3.0",
-    "lodash": "^4.16.1",
+    "lodash": "^4.17.2",
     "negotiator": "^0.6.1",
     "node-exceptions": "^1.0.3",
-    "require-all": "^2.0.0"
+    "require-all": "^2.1.0"
   }
 }

src/Formatter/index.js

@@ -19,7 +19,7 @@ const intlNumber = fnCache(Intl.NumberFormat)
 const intlDate = fnCache(Intl.DateTimeFormat)
 const intlMessage = fnCache(require('intl-messageformat'))
 const intlRelativeFormat = fnCache(require('intl-relativeformat'))
-const expressionRegex = /\[(.*)\]/
+const expressionRegex = new RegExp('\\[(.*)\\]')
 
 /**
  * Build options by merging defaults, format