Merge pull request #8 from Boulangerie/chore/refactoring-es6

Chore/refactoring es6

package.json

@@ -7,14 +7,14 @@
     "commit": "git cz",
     "test": "mocha tests -w --compilers js:babel-register",
     "test:single": "babel-node node_modules/.bin/babel-istanbul cover _mocha -- tests -R spec",
-    "check-coverage": "istanbul check-coverage --statements 50 --branches 35 --functions 75 --lines 50",
+    "check-coverage": "istanbul check-coverage --statements 99 --branches 92 --functions 100 --lines 99",
     "report-coverage": "cat ./coverage/lcov.info | coveralls",
     "prebuild": "rm -Rf lib && mkdir lib",
     "build": "babel -d lib/ src/",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },
   "engines": {
-    "node": ">= 0.8.0"
+    "node": ">= 4.0.0"
   },
   "devDependencies": {
     "babel-cli": "6.5.1",
@@ -25,31 +25,19 @@
     "commitizen": "2.5.0",
     "coveralls": "2.11.8",
     "cz-conventional-changelog": "1.1.5",
-    "grunt": "~0.4.0",
-    "grunt-bump": "0.0.13",
-    "grunt-contrib-clean": "^0.5.0",
-    "grunt-contrib-copy": "^0.5.0",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-nodeunit": "^0.4.1",
-    "grunt-markdox": "^0.1.0",
     "istanbul": "0.4.2",
     "mocha": "2.4.5",
     "nodeunit": "^0.9.1",
     "semantic-release": "^4.3.5",
     "sinon": "1.17.3"
   },
-  "peerDependencies": {
-    "grunt": ">=0.4.0"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/Boulangerie/angular-translate-extract.git"
   },
   "keywords": [
     "AngularJS",
     "angular-translate",
-    "gruntplugin",
-    "grunt",
     "javascript",
     "js",
     "translate",

src/adapter/adapter.js

@@ -0,0 +1,20 @@
+import _ from 'lodash'
+
+export default class Adapter {
+  constructor(log, basePath) {
+    this.log = log
+    this.basePath = basePath
+  }
+
+  init(params) {
+    this.params = _.defaults(params, this.params)
+
+    try {
+      this.log.debug('Init PodAdapter', this.params.dest, this.params.prefix, this.params.suffix)
+    } catch(e) {}
+  }
+
+  persist() {
+    throw new Error('Must be implemented')
+  }
+}

src/adapter/json-adapter.js

@@ -7,73 +7,65 @@
  *
  */
 
-(function() {
-  'use strict'
-
-  var path = require('path')
-  var fs = require('fs')
-  var Utils = require('./../utils.js')
-  var Translations = require('./../translations.js')
-
-  var _log, _basePath, _utils
-
-
-  function JsonAdapter(log, basePath) {
-    _log = log
-    _basePath = basePath
-    _utils = new Utils.Utils({
-      basePath: _basePath
+import path from 'path'
+import fs from 'fs'
+import Adapter from './adapter'
+import {Utils} from './../utils'
+import {Translations} from './../translations'
+
+export class JsonAdapter extends Adapter {
+
+  constructor(log, basePath) {
+    super(log, basePath)
+    this.utils = new Utils({
+      "basePath": basePath
     })
+
+    this.params = {
+      lang: [],
+      prefix: '',
+      prefix: '',
+      suffix: '.json',
+      source: '',
+      defaultLang: '.',
+      stringifyOptions: null
+    }
   }
 
-  JsonAdapter.prototype.init = function(params) {
-    this.dest = params.dest
-    this.lang = params.lang
-    this.prefix = params.prefix
-    this.suffix = params.suffix || '.json'
-    this.source = params.source
-    this.defaultLang = params.defaultLang
-    this.stringifyOptions = params.stringifyOptions
+  getDestFilename(language) {
+    return path.resolve(this.basePath, path.join(this.params.dest, this.params.prefix + language + this.params.suffix))
   }
 
-  JsonAdapter.prototype.persist = function(_translation) {
-    var lang = this.lang
-    var dest = this.dest
-    var prefix = this.prefix
-    var suffix = this.suffix
-    var source = this.source || ''
-    var defaultLang = this.defaultLang || '.'
-    var stringify_options = this.stringifyOptions || null
-
-      // Build all output language files
-    lang.forEach(function (lang) {
-
-      var destFilename = path.resolve(_basePath, path.join(dest, prefix + lang + suffix)),
-        filename = source,
-        translations = {},
+  persist(translations) {
+    // Build all output language files
+    this.params.lang.forEach((language) => {
+
+
+      let destFilename = this.getDestFilename(language),
+        filename = this.params.source,
         json = {}
 
       // Test source filename
       if (filename === '' || !fs.statSync(filename)) {
         filename = destFilename
       }
 
-      _log.info('Process ' + lang + ' : ' + filename)
+      this.log.debug('Process ' + language + ' : ' + filename)
 
-      var isDefaultLang = (defaultLang === lang)
+      var isDefaultLang = (this.params.defaultLang === language)
       try {
         // Test if filename exists
         fs.statSync(filename)
-        _log.debug('File Exists. ' + destFilename)
+        this.log.debug('File Exists. ' + destFilename)
         json = JSON.parse(fs.readFileSync(filename, {encoding: 'utf8'}))
       } catch (e) {
-        _log.debug('Create file: ' + destFilename + (isDefaultLang ? ' (' + lang + ' is the default language)' : ''))
+        this.log.debug('Create file: ' + destFilename + (isDefaultLang ? ' (' + language + ' is the default language)' : ''))
       }
 
-      translations = _translation.getMergedTranslations(Translations.Translations.flatten(json), isDefaultLang)
+      let _translations = translations.getMergedTranslations(Translations.flatten(json), isDefaultLang)
 
-      var stats = _translation.getStats()
-      var statEmptyType = _translation.params.nullEmpty ? "null" : "empty"
+      var stats = translations.getStats()
+      var statEmptyType = translations.params.nullEmpty ? "null" : "empty"
       var statPercentage =  Math.round(stats[statEmptyType] / stats["total"] * 100)
       statPercentage = isNaN(statPercentage) ? 100 : statPercentage
       var statsString = "Statistics : " +
@@ -82,13 +74,12 @@
         " / Deleted: " + stats["deleted"] +
         " / New: " + stats["new"]
 
-      _log.info(statsString)
+      this.log.debug(statsString)
 
-      // Write JSON file for lang
-      fs.writeFileSync(path.resolve(_basePath, destFilename), _utils.customStringify(translations, stringify_options) + '\n')
+      // Write JSON file for language
+      fs.writeFileSync(path.resolve(this.basePath, destFilename), this.utils.customStringify(_translations, this.stringifyOptions) + '\n')
 
     })
   }
 
-  module.exports = JsonAdapter
-}())
+}

src/adapter/pot-adapter.js

@@ -2,6 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import Po from 'pofile'
 import _ from 'lodash'
+import Adapter from './adapter'
 
 export class PotObject {
 
@@ -20,11 +21,10 @@ msgstr "${PotObject.escapeString(this.msg)}"`
 
 PotObject.escapeString = (str) => (""+str).replace(/"/g, '\\"')
 
-export class PotAdapter {
+export class PotAdapter extends Adapter {
 
   constructor(log, basePath) {
-    this.log = log
-    this.basePath = basePath
+    super(log, basePath)
 
     this.params = {
       dest: '.',
@@ -33,14 +33,6 @@ export class PotAdapter {
     }
   }
 
-  init(params) {
-    this.params = _.defaults(params, this.params)
-
-    try {
-      this.log.debug('Init PodAdapter', this.params.dest, this.params.prefix, this.params.suffix)
-    } catch(e) {}
-  }
-
   persist(translations) {
     var catalog = new Po()