From 656bfd0b8d3cf6ce3138c20ece7b482649842efc Mon Sep 17 00:00:00 2001 From: Ruben Vermeersch Date: Thu, 19 Jun 2014 14:16:30 +0200 Subject: [PATCH] Add JSCS, fix style. --- .jscs.json | 34 ++++++++++++ Gruntfile.coffee | 10 +++- dist/pofile.js | 127 +++++++++++++++++++++++---------------------- dist/pofile.min.js | 2 +- lib/po.js | 99 ++++++++++++++++------------------- package.json | 13 ++--- test/parse.js | 48 ++++++++--------- test/write.js | 12 ++--- 8 files changed, 189 insertions(+), 156 deletions(-) create mode 100644 .jscs.json diff --git a/.jscs.json b/.jscs.json new file mode 100644 index 0000000..93b9ab5 --- /dev/null +++ b/.jscs.json @@ -0,0 +1,34 @@ +{ + "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"], + "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], + "requireParenthesesAroundIIFE": true, + "requireSpacesInFunctionExpression": { + "beforeOpeningCurlyBrace": true + }, + "requireSpacesInAnonymousFunctionExpression": { + "beforeOpeningRoundBrace": true + }, + "disallowSpacesInNamedFunctionExpression": { + "beforeOpeningRoundBrace": true + }, + "disallowSpacesInFunctionDeclaration": { + "beforeOpeningRoundBrace": true + }, + "disallowMultipleVarDecl": true, + "requireSpacesInsideObjectBrackets": "all", + "disallowSpaceAfterObjectKeys": true, + "requireCommaBeforeLineBreak": true, + "disallowSpaceBeforeBinaryOperators": [","], + "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"], + "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], + "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], + "requireSpaceAfterBinaryOperators": [",", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], + "validateQuoteMarks": true, + "validateIndentation": 4, + "disallowTrailingWhitespace": true, + "disallowKeywordsOnNewLine": ["else"], + "requireCapitalizedConstructors": true, + "safeContextKeyword": "self", + "requireDotNotation": true, + "disallowYodaConditions": true +} diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 1b4a972..5a8a5f3 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -5,6 +5,7 @@ module.exports = (grunt) -> @loadNpmTasks('grunt-contrib-jshint') @loadNpmTasks('grunt-contrib-uglify') @loadNpmTasks('grunt-contrib-watch') + @loadNpmTasks('grunt-jscs-checker') @loadNpmTasks('grunt-mocha-cli') @initConfig @@ -16,6 +17,13 @@ module.exports = (grunt) -> options: jshintrc: '.jshintrc' + jscs: + src: + options: + config: '.jscs.json' + files: + src: [ 'lib/*.js', 'test/*.js' ] + watch: all: options: @@ -49,5 +57,5 @@ module.exports = (grunt) -> pushTo: 'origin' @registerTask 'default', ['test'] - @registerTask 'build', ['clean', 'jshint', 'browserify', 'uglify'] + @registerTask 'build', ['clean', 'jshint', 'jscs', 'browserify', 'uglify'] @registerTask 'test', ['build', 'mochacli'] diff --git a/dist/pofile.js b/dist/pofile.js index a07f348..bad1396 100644 --- a/dist/pofile.js +++ b/dist/pofile.js @@ -1,6 +1,6 @@ require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o 0) { + if (obsoleteCount >= noCommentLineCount) { + item.obsolete = true; + } + obsoleteCount = 0; + noCommentLineCount = 0; po.items.push(item); item = new PO.Item(); - item.obsolete = obsolete; - obsolete = false; } } @@ -122,67 +126,69 @@ PO.parse = function (data) { } while (lines.length > 0) { - var line = trim(lines.shift()), - add = false; + var line = trim(lines.shift()); + var lineObsolete = false; + var add = false; if (line.match(/^#\~/)) { // Obsolete item - obsolete = true; + //only remove the obsolte comment mark, here + //might be, this is a new item, so + //only remember, this line is marked obsolete, count after line is parsed line = trim(line.substring(2)); - } else { - obsolete = false; + lineObsolete = true; } if (line.match(/^#:/)) { // Reference finish(); item.references.push(trim(line.replace(/^#:/, ''))); - } - else if (line.match(/^#,/)) { // Flags + } else if (line.match(/^#,/)) { // Flags finish(); - var flags = trim(line.replace(/^#,/, '')).split(","); + var flags = trim(line.replace(/^#,/, '')).split(','); for (var i = 0; i < flags.length; i++) { item.flags[flags[i]] = true; } - } - else if (line.match(/^#\s+/)) { // Translator comment + } else if (line.match(/^#\s+/)) { // Translator comment finish(); item.comments.push(trim(line.replace(/^#\s+/, ''))); - } - else if (line.match(/^#\./)) { // Extracted comment + } else if (line.match(/^#\./)) { // Extracted comment finish(); item.extractedComments.push(trim(line.replace(/^#\./, ''))); - } - else if (line.match(/^msgid_plural/)) { // Plural form + } else if (line.match(/^msgid_plural/)) { // Plural form item.msgid_plural = extract(line); context = 'msgid_plural'; - } - else if (line.match(/^msgid/)) { // Original + noCommentLineCount++; + } else if (line.match(/^msgid/)) { // Original finish(); item.msgid = extract(line); context = 'msgid'; - } - else if (line.match(/^msgstr/)) { // Translation + noCommentLineCount++; + } else if (line.match(/^msgstr/)) { // Translation var m = line.match(/^msgstr\[(\d+)\]/); plural = m && m[1] ? parseInt(m[1]) : 0; item.msgstr[plural] = extract(line); context = 'msgstr'; - } - else if (line.match(/^msgctxt/)) { // Context + noCommentLineCount++; + } else if (line.match(/^msgctxt/)) { // Context finish(); item.msgctxt = extract(line); - } - else { // Probably multiline string or blank + noCommentLineCount++; + } else { // Probably multiline string or blank if (line.length > 0) { + noCommentLineCount++; if (context === 'msgstr') { item.msgstr[plural] += extract(line); - } - else if (context === 'msgid') { + } else if (context === 'msgid') { item.msgid += extract(line); - } - else if (context === 'msgid_plural') { + } else if (context === 'msgid_plural') { item.msgid_plural += extract(line); } } } + + if (lineObsolete) { + // Count obsolete lines for this item + obsoleteCount++; + } } finish(); @@ -202,8 +208,8 @@ PO.Item = function () { }; PO.Item.prototype.toString = function () { - var lines = [], - that = this; + var lines = []; + var self = this; // reverse what extract(string) method during PO.parse does var _escape = function (string) { @@ -212,16 +218,15 @@ PO.Item.prototype.toString = function () { }; var _process = function (keyword, text, i) { - var lines = [], - parts = text.split(/\n/), - index = typeof i !== 'undefined' ? '[' + i + ']' : ''; + var lines = []; + var parts = text.split(/\n/); + var index = typeof i !== 'undefined' ? '[' + i + ']' : ''; if (parts.length > 1) { lines.push(keyword + index + ' ""'); parts.forEach(function (part) { lines.push('"' + _escape(part) + '"'); }); - } - else { + } else { lines.push(keyword + index + ' "' + _escape(text) + '"'); } return lines; @@ -244,29 +249,25 @@ PO.Item.prototype.toString = function () { var flags = Object.keys(this.flags); if (flags.length > 0) { - lines.push('#, ' + flags.join(",")); + lines.push('#, ' + flags.join(',')); } + var mkObsolete = this.obsolete ? '#~ ' : ''; ['msgctxt', 'msgid', 'msgid_plural', 'msgstr'].forEach(function (keyword) { - var text = that[keyword]; + var text = self[keyword]; if (text != null) { if (isArray(text) && text.length > 1) { text.forEach(function (t, i) { - lines = lines.concat(_process(keyword, t, i)); + lines = lines.concat(mkObsolete + _process(keyword, t, i)); }); - } - else { + } else { text = isArray(text) ? text.join() : text; - lines = lines.concat(_process(keyword, text)); + lines = lines.concat(mkObsolete + _process(keyword, text)); } } }); - if (this.obsolete) { - return "#~ " + lines.join("\n#~ "); - } else { - return lines.join("\n"); - } + return lines.join('\n'); }; module.exports = PO; diff --git a/dist/pofile.min.js b/dist/pofile.min.js index d9b3e5d..2eb1720 100644 --- a/dist/pofile.min.js +++ b/dist/pofile.min.js @@ -1 +1 @@ -require=function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g0&&(e.items.push(j),j=new f.Item,j.obsolete=m,m=!1)}function d(a){return a=c(a),a=a.replace(/^[^"]*"|"$/g,""),a=a.replace(/\\"/g,'"'),a=a.replace(/\\\\/g,"\\")}a=a.replace(/\r\n/g,"\n");var e=new f,g=a.split(/\n\n/),h=g.shift(),i=g.join("\n").split(/\n/);e.headers={"Project-Id-Version":"","Report-Msgid-Bugs-To":"","POT-Creation-Date":"","PO-Revision-Date":"","Last-Translator":"",Language:"","Language-Team":"","Content-Type":"","Content-Transfer-Encoding":"","Plural-Forms":""},h.split(/\n/).reduce(function(a,b){return a.merge&&(b=a.pop().slice(0,-1)+b.slice(1),delete a.merge),/^".*"$/.test(b)&&!/^".*\\n"$/.test(b)&&(a.merge=!0),a.push(b),a},[]).forEach(function(a){if(a.match(/^#/)&&e.comments.push(a.replace(/^#\s*/,"")),a.match(/^"/)){a=a.trim().replace(/^"/,"").replace(/\\n"$/,"");var b=a.split(/:/),c=b.shift().trim(),d=b.join(":").trim();e.headers[c]=d}});for(var j=new f.Item,k=null,l=0,m=!1;i.length>0;){var n=c(i.shift());if(n.match(/^#\~/)?(m=!0,n=c(n.substring(2))):m=!1,n.match(/^#:/))b(),j.references.push(c(n.replace(/^#:/,"")));else if(n.match(/^#,/)){b();for(var o=c(n.replace(/^#,/,"")).split(","),p=0;p0&&("msgstr"===k?j.msgstr[l]+=d(n):"msgid"===k?j.msgid+=d(n):"msgid_plural"===k&&(j.msgid_plural+=d(n)))}return b(),e},f.Item=function(){this.msgid="",this.msgctxt=null,this.references=[],this.msgid_plural=null,this.msgstr=[],this.comments=[],this.extractedComments=[],this.flags={},this.obsolete=!1},f.Item.prototype.toString=function(){var a=[],b=this,c=function(a){return a=a.replace(/\\/g,"\\\\"),a.replace(/"/g,'\\"')},d=function(a,b,d){var e=[],f=b.split(/\n/),g="undefined"!=typeof d?"["+d+"]":"";return f.length>1?(e.push(a+g+' ""'),f.forEach(function(a){e.push('"'+c(a)+'"')})):e.push(a+g+' "'+c(b)+'"'),e};this.comments.forEach(function(b){a.push("# "+b)}),this.extractedComments.forEach(function(b){a.push("#. "+b)}),this.references.forEach(function(b){a.push("#: "+b)});var f=Object.keys(this.flags);return f.length>0&&a.push("#, "+f.join(",")),["msgctxt","msgid","msgid_plural","msgstr"].forEach(function(c){var f=b[c];null!=f&&(e(f)&&f.length>1?f.forEach(function(b,e){a=a.concat(d(c,b,e))}):(f=e(f)?f.join():f,a=a.concat(d(c,f))))}),this.obsolete?"#~ "+a.join("\n#~ "):a.join("\n")},b.exports=f},{fs:3,"lodash.isarray":4}],pofile:[function(a,b){b.exports=a("W8CkM0")},{}],3:[function(){},{}],4:[function(a,b){var c=a("lodash._isnative"),d="[object Array]",e=Object.prototype,f=e.toString,g=c(g=Array.isArray)&&g,h=g||function(a){return a&&"object"==typeof a&&"number"==typeof a.length&&f.call(a)==d||!1};b.exports=h},{"lodash._isnative":5}],5:[function(a,b){function c(a){return"function"==typeof a&&f.test(a)}var d=Object.prototype,e=d.toString,f=RegExp("^"+String(e).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString| for [^\]]+/g,".*?")+"$");b.exports=c},{}]},{},["W8CkM0"]); \ No newline at end of file +require=function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g0&&(m>=n&&(j.obsolete=!0),m=0,n=0,e.items.push(j),j=new f.Item)}function d(a){return a=c(a),a=a.replace(/^[^"]*"|"$/g,""),a=a.replace(/\\"/g,'"'),a=a.replace(/\\\\/g,"\\")}a=a.replace(/\r\n/g,"\n");var e=new f,g=a.split(/\n\n/),h=g.shift(),i=g.join("\n").split(/\n/);e.headers={"Project-Id-Version":"","Report-Msgid-Bugs-To":"","POT-Creation-Date":"","PO-Revision-Date":"","Last-Translator":"",Language:"","Language-Team":"","Content-Type":"","Content-Transfer-Encoding":"","Plural-Forms":""},h.split(/\n/).reduce(function(a,b){return a.merge&&(b=a.pop().slice(0,-1)+b.slice(1),delete a.merge),/^".*"$/.test(b)&&!/^".*\\n"$/.test(b)&&(a.merge=!0),a.push(b),a},[]).forEach(function(a){if(a.match(/^#/)&&e.comments.push(a.replace(/^#\s*/,"")),a.match(/^"/)){a=a.trim().replace(/^"/,"").replace(/\\n"$/,"");var b=a.split(/:/),c=b.shift().trim(),d=b.join(":").trim();e.headers[c]=d}});for(var j=new f.Item,k=null,l=0,m=0,n=0;i.length>0;){var o=c(i.shift()),p=!1;if(o.match(/^#\~/)&&(o=c(o.substring(2)),p=!0),o.match(/^#:/))b(),j.references.push(c(o.replace(/^#:/,"")));else if(o.match(/^#,/)){b();for(var q=c(o.replace(/^#,/,"")).split(","),r=0;r0&&(n++,"msgstr"===k?j.msgstr[l]+=d(o):"msgid"===k?j.msgid+=d(o):"msgid_plural"===k&&(j.msgid_plural+=d(o)));p&&m++}return b(),e},f.Item=function(){this.msgid="",this.msgctxt=null,this.references=[],this.msgid_plural=null,this.msgstr=[],this.comments=[],this.extractedComments=[],this.flags={},this.obsolete=!1},f.Item.prototype.toString=function(){var a=[],b=this,c=function(a){return a=a.replace(/\\/g,"\\\\"),a.replace(/"/g,'\\"')},d=function(a,b,d){var e=[],f=b.split(/\n/),g="undefined"!=typeof d?"["+d+"]":"";return f.length>1?(e.push(a+g+' ""'),f.forEach(function(a){e.push('"'+c(a)+'"')})):e.push(a+g+' "'+c(b)+'"'),e};this.comments.forEach(function(b){a.push("# "+b)}),this.extractedComments.forEach(function(b){a.push("#. "+b)}),this.references.forEach(function(b){a.push("#: "+b)});var f=Object.keys(this.flags);f.length>0&&a.push("#, "+f.join(","));var g=this.obsolete?"#~ ":"";return["msgctxt","msgid","msgid_plural","msgstr"].forEach(function(c){var f=b[c];null!=f&&(e(f)&&f.length>1?f.forEach(function(b,e){a=a.concat(g+d(c,b,e))}):(f=e(f)?f.join():f,a=a.concat(g+d(c,f))))}),a.join("\n")},b.exports=f},{fs:3,"lodash.isarray":4}],pofile:[function(a,b){b.exports=a("W8CkM0")},{}],3:[function(){},{}],4:[function(a,b){var c=a("lodash._isnative"),d="[object Array]",e=Object.prototype,f=e.toString,g=c(g=Array.isArray)&&g,h=g||function(a){return a&&"object"==typeof a&&"number"==typeof a.length&&f.call(a)==d||!1};b.exports=h},{"lodash._isnative":5}],5:[function(a,b){function c(a){return"function"==typeof a&&f.test(a)}var d=Object.prototype,e=d.toString,f=RegExp("^"+String(e).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString| for [^\]]+/g,".*?")+"$");b.exports=c},{}]},{},["W8CkM0"]); \ No newline at end of file diff --git a/lib/po.js b/lib/po.js index 440eea3..84b305f 100644 --- a/lib/po.js +++ b/lib/po.js @@ -1,5 +1,5 @@ -var fs = require('fs'), - isArray = require('lodash.isarray'); +var fs = require('fs'); +var isArray = require('lodash.isarray'); function trim(string) { return string.replace(/^\s+|\s+$/g, ''); @@ -16,8 +16,7 @@ PO.prototype.save = function (filename, callback) { }; PO.prototype.toString = function () { - var lines = [], - that = this; + var lines = []; if (this.comments) { this.comments.forEach(function (comment) { @@ -29,8 +28,9 @@ PO.prototype.toString = function () { lines.push('msgstr ""'); var keys = Object.keys(this.headers); + var self = this; keys.forEach(function (key) { - lines.push('"' + key + ': ' + that.headers[key] + '\\n"'); + lines.push('"' + key + ': ' + self.headers[key] + '\\n"'); }); lines.push(''); @@ -40,7 +40,7 @@ PO.prototype.toString = function () { lines.push(''); }); - return lines.join("\n"); + return lines.join('\n'); }; PO.load = function (filename, callback) { @@ -56,10 +56,10 @@ PO.load = function (filename, callback) { PO.parse = function (data) { //support both unix and windows newline formats. data = data.replace(/\r\n/g, '\n'); - var po = new PO(), - sections = data.split(/\n\n/), - headers = sections.shift(), - lines = sections.join("\n").split(/\n/); + var po = new PO(); + var sections = data.split(/\n\n/); + var headers = sections.shift(); + var lines = sections.join('\n').split(/\n/); po.headers = { 'Project-Id-Version': '', @@ -91,18 +91,18 @@ PO.parse = function (data) { } if (header.match(/^"/)) { header = header.trim().replace(/^"/, '').replace(/\\n"$/, ''); - var p = header.split(/:/), - name = p.shift().trim(), - value = p.join(':').trim(); + var p = header.split(/:/); + var name = p.shift().trim(); + var value = p.join(':').trim(); po.headers[name] = value; } }); - var item = new PO.Item(), - context = null, - plural = 0, - obsoleteCount = 0, - noCommentLineCount = 0; + var item = new PO.Item(); + var context = null; + var plural = 0; + var obsoleteCount = 0; + var noCommentLineCount = 0; function finish() { if (item.msgid.length > 0) { @@ -125,9 +125,9 @@ PO.parse = function (data) { } while (lines.length > 0) { - var line = trim(lines.shift()), - lineObsolete = false, - add = false; + var line = trim(lines.shift()); + var lineObsolete = false; + var add = false; if (line.match(/^#\~/)) { // Obsolete item //only remove the obsolte comment mark, here @@ -140,61 +140,52 @@ PO.parse = function (data) { if (line.match(/^#:/)) { // Reference finish(); item.references.push(trim(line.replace(/^#:/, ''))); - } - else if (line.match(/^#,/)) { // Flags + } else if (line.match(/^#,/)) { // Flags finish(); - var flags = trim(line.replace(/^#,/, '')).split(","); + var flags = trim(line.replace(/^#,/, '')).split(','); for (var i = 0; i < flags.length; i++) { item.flags[flags[i]] = true; } - } - else if (line.match(/^#\s+/)) { // Translator comment + } else if (line.match(/^#\s+/)) { // Translator comment finish(); item.comments.push(trim(line.replace(/^#\s+/, ''))); - } - else if (line.match(/^#\./)) { // Extracted comment + } else if (line.match(/^#\./)) { // Extracted comment finish(); item.extractedComments.push(trim(line.replace(/^#\./, ''))); - } - else if (line.match(/^msgid_plural/)) { // Plural form + } else if (line.match(/^msgid_plural/)) { // Plural form item.msgid_plural = extract(line); context = 'msgid_plural'; noCommentLineCount++; - } - else if (line.match(/^msgid/)) { // Original + } else if (line.match(/^msgid/)) { // Original finish(); item.msgid = extract(line); context = 'msgid'; noCommentLineCount++; - } - else if (line.match(/^msgstr/)) { // Translation + } else if (line.match(/^msgstr/)) { // Translation var m = line.match(/^msgstr\[(\d+)\]/); plural = m && m[1] ? parseInt(m[1]) : 0; item.msgstr[plural] = extract(line); context = 'msgstr'; noCommentLineCount++; - } - else if (line.match(/^msgctxt/)) { // Context + } else if (line.match(/^msgctxt/)) { // Context finish(); item.msgctxt = extract(line); noCommentLineCount++; - } - else { // Probably multiline string or blank + } else { // Probably multiline string or blank if (line.length > 0) { noCommentLineCount++; if (context === 'msgstr') { item.msgstr[plural] += extract(line); - } - else if (context === 'msgid') { + } else if (context === 'msgid') { item.msgid += extract(line); - } - else if (context === 'msgid_plural') { + } else if (context === 'msgid_plural') { item.msgid_plural += extract(line); } } } + if (lineObsolete) { - //count obsolete lines for this item + // Count obsolete lines for this item obsoleteCount++; } } @@ -216,8 +207,8 @@ PO.Item = function () { }; PO.Item.prototype.toString = function () { - var lines = [], - that = this; + var lines = []; + var self = this; // reverse what extract(string) method during PO.parse does var _escape = function (string) { @@ -226,16 +217,15 @@ PO.Item.prototype.toString = function () { }; var _process = function (keyword, text, i) { - var lines = [], - parts = text.split(/\n/), - index = typeof i !== 'undefined' ? '[' + i + ']' : ''; + var lines = []; + var parts = text.split(/\n/); + var index = typeof i !== 'undefined' ? '[' + i + ']' : ''; if (parts.length > 1) { lines.push(keyword + index + ' ""'); parts.forEach(function (part) { lines.push('"' + _escape(part) + '"'); }); - } - else { + } else { lines.push(keyword + index + ' "' + _escape(text) + '"'); } return lines; @@ -258,26 +248,25 @@ PO.Item.prototype.toString = function () { var flags = Object.keys(this.flags); if (flags.length > 0) { - lines.push('#, ' + flags.join(",")); + lines.push('#, ' + flags.join(',')); } var mkObsolete = this.obsolete ? '#~ ' : ''; ['msgctxt', 'msgid', 'msgid_plural', 'msgstr'].forEach(function (keyword) { - var text = that[keyword]; + var text = self[keyword]; if (text != null) { if (isArray(text) && text.length > 1) { text.forEach(function (t, i) { lines = lines.concat(mkObsolete + _process(keyword, t, i)); }); - } - else { + } else { text = isArray(text) ? text.join() : text; lines = lines.concat(mkObsolete + _process(keyword, text)); } } }); - return lines.join("\n"); + return lines.join('\n'); }; module.exports = PO; diff --git a/package.json b/package.json index 9e7bf7d..102a3f1 100644 --- a/package.json +++ b/package.json @@ -35,15 +35,16 @@ "test": "test" }, "devDependencies": { - "grunt": "~0.4.2", - "grunt-contrib-watch": "~0.5.3", - "grunt-contrib-jshint": "~0.7.2", - "grunt-mocha-cli": "~1.4.0", - "grunt-contrib-uglify": "~0.2.7", "browserify": "~3.11.1", + "grunt": "~0.4.2", "grunt-browserify": "~1.3.0", + "grunt-bump": "0.0.13", "grunt-contrib-clean": "~0.5.0", - "grunt-bump": "0.0.13" + "grunt-contrib-jshint": "~0.7.2", + "grunt-contrib-uglify": "~0.2.7", + "grunt-contrib-watch": "~0.5.3", + "grunt-jscs-checker": "^0.5.1", + "grunt-mocha-cli": "~1.4.0" }, "dependencies": { "lodash.isarray": "~2.4.1" diff --git a/test/parse.js b/test/parse.js index c1de3f1..795395c 100644 --- a/test/parse.js +++ b/test/parse.js @@ -7,20 +7,20 @@ describe('Parse', function () { var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/big.po', 'utf8')); assert.notEqual(po, null); assert.equal(po.items.length, 69); - + var item = po.items[0]; - assert.equal(item.msgid, "Title"); - assert.equal(item.msgstr, "Titre"); + assert.equal(item.msgid, 'Title'); + assert.equal(item.msgstr, 'Titre'); }); it('Handles multi-line strings', function () { var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/multi-line.po', 'utf8')); assert.notEqual(po, null); assert.equal(po.items.length, 1); - + var item = po.items[0]; - assert.equal(item.msgid, "The following placeholder tokens can be used in both paths and titles. When used in a path or title, they will be replaced with the appropriate values."); - assert.equal(item.msgstr, "Les ébauches de jetons suivantes peuvent être utilisées à la fois dans les chemins et dans les titres. Lorsqu'elles sont utilisées dans un chemin ou un titre, elles seront remplacées par les valeurs appropriées."); + assert.equal(item.msgid, 'The following placeholder tokens can be used in both paths and titles. When used in a path or title, they will be replaced with the appropriate values.'); + assert.equal(item.msgstr, 'Les ébauches de jetons suivantes peuvent être utilisées à la fois dans les chemins et dans les titres. Lorsqu\'elles sont utilisées dans un chemin ou un titre, elles seront remplacées par les valeurs appropriées.'); }); it('Handles multi-line headers', function () { @@ -35,11 +35,11 @@ describe('Parse', function () { var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/comment.po', 'utf8')); assert.notEqual(po, null); assert.equal(po.items.length, 1); - + var item = po.items[0]; - assert.equal(item.msgid, "Title, as plain text"); - assert.equal(item.msgstr, "Attribut title, en tant que texte brut"); - assert.deepEqual(item.comments, ["Translator comment"]); + assert.equal(item.msgid, 'Title, as plain text'); + assert.equal(item.msgstr, 'Attribut title, en tant que texte brut'); + assert.deepEqual(item.comments, ['Translator comment']); }); it('Handles extracted comments', function () { @@ -48,26 +48,26 @@ describe('Parse', function () { assert.equal(po.items.length, 1); var item = po.items[0]; - assert.equal(item.msgid, "Title, as plain text"); - assert.equal(item.msgstr, "Attribut title, en tant que texte brut"); - assert.deepEqual(item.extractedComments, ["Extracted comment"]); + assert.equal(item.msgid, 'Title, as plain text'); + assert.equal(item.msgstr, 'Attribut title, en tant que texte brut'); + assert.deepEqual(item.extractedComments, ['Extracted comment']); }); it('Handles string references', function () { var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/reference.po', 'utf8')); assert.notEqual(po, null); assert.equal(po.items.length, 2); - + var item = po.items[0]; - assert.equal(item.msgid, "Title, as plain text"); - assert.equal(item.msgstr, "Attribut title, en tant que texte brut"); - assert.deepEqual(item.comments, ["Comment"]); - assert.deepEqual(item.references, [".tmp/crm/controllers/map.js"]); - + assert.equal(item.msgid, 'Title, as plain text'); + assert.equal(item.msgstr, 'Attribut title, en tant que texte brut'); + assert.deepEqual(item.comments, ['Comment']); + assert.deepEqual(item.references, ['.tmp/crm/controllers/map.js']); + item = po.items[1]; - assert.equal(item.msgid, "X"); - assert.equal(item.msgstr, "Y"); - assert.deepEqual(item.references, ["a", "b"]); + assert.equal(item.msgid, 'X'); + assert.equal(item.msgstr, 'Y'); + assert.deepEqual(item.references, ['a', 'b']); }); it('Parses flags', function () { @@ -76,8 +76,8 @@ describe('Parse', function () { assert.equal(po.items.length, 1); var item = po.items[0]; - assert.equal(item.msgid, "Sources"); - assert.equal(item.msgstr, "Source"); + assert.equal(item.msgid, 'Sources'); + assert.equal(item.msgstr, 'Source'); assert.notEqual(item.flags, null); assert.equal(item.flags.fuzzy, true); }); diff --git a/test/write.js b/test/write.js index a6020fa..d982b3a 100644 --- a/test/write.js +++ b/test/write.js @@ -3,7 +3,7 @@ var fs = require('fs'); var PO = require('..'); function assertHasLine(str, line) { - var lines = str.split("\n"); + var lines = str.split('\n'); var found = false; for (var i = 0; i < lines.length; i++) { @@ -13,7 +13,7 @@ function assertHasLine(str, line) { } } - assert(found, "Could not find line: " + line); + assert(found, 'Could not find line: ' + line); } describe('Write', function () { @@ -21,28 +21,28 @@ describe('Write', function () { var input = fs.readFileSync(__dirname + '/fixtures/fuzzy.po', 'utf8'); var po = PO.parse(input); var str = po.toString(); - assertHasLine(str, "#, fuzzy"); + assertHasLine(str, '#, fuzzy'); }); it('write msgid', function () { var input = fs.readFileSync(__dirname + '/fixtures/fuzzy.po', 'utf8'); var po = PO.parse(input); var str = po.toString(); - assertHasLine(str, "msgid \"Sources\""); + assertHasLine(str, 'msgid "Sources"'); }); it('write msgstr', function () { var input = fs.readFileSync(__dirname + '/fixtures/fuzzy.po', 'utf8'); var po = PO.parse(input); var str = po.toString(); - assertHasLine(str, "msgstr \"Source\""); + assertHasLine(str, 'msgstr "Source"'); }); it('write translator comment', function () { var input = fs.readFileSync(__dirname + '/fixtures/comment.po', 'utf8'); var po = PO.parse(input); var str = po.toString(); - assertHasLine(str, "# Translator comment"); + assertHasLine(str, '# Translator comment'); }); it('write extracted comment', function () {