Add JSHint. Fix style and some potential bugs.

.gitignore

@@ -0,0 +1 @@
+/node_modules

.jshintrc

@@ -0,0 +1,14 @@
+{
+  "curly": true,
+  "eqeqeq": true,
+  "immed": true,
+  "latedef": true,
+  "newcap": true,
+  "noarg": true,
+  "sub": true,
+  "undef": true,
+  "boss": true,
+  "eqnull": true,
+  "node": true,
+  "white": true
+}

Gruntfile.coffee

@@ -0,0 +1,18 @@
+module.exports = (grunt) ->
+    @loadNpmTasks('grunt-contrib-jshint')
+    @loadNpmTasks('grunt-contrib-watch')
+
+    @initConfig
+        jshint:
+            all: [ 'lib/*.js' ]
+            options:
+                jshintrc: '.jshintrc'
+
+        watch:
+            all:
+                files: ['lib/**.js', 'test/*/*']
+                tasks: ['test']
+
+    @registerTask 'default', ['test']
+    @registerTask 'build', ['jshint']
+    @registerTask 'test', ['build']

lib/po.js

@@ -1,207 +1,214 @@
-var fs = require('fs')
+var fs = require('fs'),
-  , util = require('util');
+    util = require('util');
 
 function trim(string) {
-  return string.replace(/^\s+|\s+$/g, '');
+    return string.replace(/^\s+|\s+$/g, '');
+}
+
+var PO = function () {
+    this.comments = [];
+    this.headers = {};
+    this.items = [];
 };
 
-var PO = function() {
+PO.prototype.save = function (filename, callback) {
-  this.comments = [];
+    fs.writeFile(filename, this.toString(), function (err) {
-  this.headers = {};
+        if (err) {
-  this.items = [];
+            throw err;
-};
+        }
 
-PO.prototype.save = function(filename, callback) {
+        if (callback) {
-  fs.writeFile(filename, this.toString(), function(err) {
+            callback();
-    if (err) throw err;
+        }
-    callback && callback();
-  });
-};
-
-PO.prototype.toString = function() {
-  var lines = []
-    , that = this;
-
-  if (this.comments) {
-    this.comments.forEach(function(comment) {
-      lines.push('# ' + comment);
     });
-  }
+};
 
-  lines.push('msgid ""');
+PO.prototype.toString = function () {
-  lines.push('msgstr ""');
+    var lines = [],
+        that = this;
 
-  var keys = Object.keys(this.headers);
+    if (this.comments) {
-  keys.forEach(function(key) {
+        this.comments.forEach(function (comment) {
-    lines.push(util.format('"%s: %s\\n"', key, that.headers[key]));
+            lines.push('# ' + comment);
-  });
+        });
+    }
 
-  lines.push('');
+    lines.push('msgid ""');
+    lines.push('msgstr ""');
+
+    var keys = Object.keys(this.headers);
+    keys.forEach(function (key) {
+        lines.push(util.format('"%s: %s\\n"', key, that.headers[key]));
+    });
 
-  this.items.forEach(function(item) {
-    lines.push(item.toString());
     lines.push('');
-  });
 
-  return lines.join("\n");
+    this.items.forEach(function (item) {
+        lines.push(item.toString());
+        lines.push('');
+    });
+
+    return lines.join("\n");
 };
 
-PO.load = function(filename, callback) {
+PO.load = function (filename, callback) {
-  fs.readFile(filename, 'utf-8', function(err, data) {
+    fs.readFile(filename, 'utf-8', function (err, data) {
-    if (err) throw err;
+        if (err) {
-    var po = PO.parse(data);
+            throw err;
-    callback && callback(po);
+        }
-  });
+        var po = PO.parse(data);
+        callback(po);
+    });
 };
 
-PO.parse = function(data) {
+PO.parse = function (data) {
     //support both unix and windows newline formats.
     data = data.replace(/\r\n/g, '\n');
-    var po = new PO
+    var po = new PO(),
-    , sections = data.split(/\n\n/)
+        sections = data.split(/\n\n/),
-    , headers = sections.shift()
+        headers = sections.shift(),
-    , lines = sections.join("\n").split(/\n/);
+        lines = sections.join("\n").split(/\n/);
 
-  po.headers = {
+    po.headers = {
-    'Project-Id-Version': '',
+        'Project-Id-Version': '',
-    'Report-Msgid-Bugs-To': '',
+        'Report-Msgid-Bugs-To': '',
-    'POT-Creation-Date': '',
+        'POT-Creation-Date': '',
-    'PO-Revision-Date': '',
+        'PO-Revision-Date': '',
-    'Last-Translator': '',
+        'Last-Translator': '',
-    'Language': '',
+        'Language': '',
-    'Language-Team': '',
+        'Language-Team': '',
-    'Content-Type': '',
+        'Content-Type': '',
-    'Content-Transfer-Encoding': '',
+        'Content-Transfer-Encoding': '',
-    'Plural-Forms': '',
+        'Plural-Forms': '',
-  };
+    };
 
-  headers.split(/\n/).forEach(function(header) {
+    headers.split(/\n/).forEach(function (header) {
-    if (header.match(/^#/)) {
+        if (header.match(/^#/)) {
-      po.comments.push(header.replace(/^#\s*/, ''));
+            po.comments.push(header.replace(/^#\s*/, ''));
-    }
-    if (header.match(/^"/)) {
-      header = header.trim().replace(/^"/, '').replace(/\\n"$/, '');
-      var p = header.split(/:/)
-        , name = p.shift().trim()
-        , value = p.join(':').trim();
-      po.headers[name] = value;
-    }
-  });
-
-  var item = new PO.Item()
-    , context = null
-    , plural = 0;
-
-  function finish() {
-    if (item.msgid.length > 0) {
-      po.items.push(item);
-      item = new PO.Item();
-    }
-  };
-
-  function extract(string) {
-    string = trim(string);
-    string = string.replace(/^[^"]*"|"$/g, '');
-    string = string.replace(/\\"/g, '"');
-    string = string.replace(/\\\\/g, '\\');
-    return string;
-  };
-
-  while (lines.length > 0) {
-    var line = trim(lines.shift())
-      , add = false;
-    if (line.match(/^#:/)) { // Reference
-      finish();
-      item.references.push(trim(line.replace(/^#:/, '')));
-    }
-    else if (line.match(/^#/)) { // Comment
-      finish();
-      item.comments.push(trim(line.replace(/^#/, '')));
-    }
-    else if (line.match(/^msgid_plural/)) { // Plural form
-      item.msgid_plural = extract(line);
-      context = 'msgid_plural';
-    }
-    else if (line.match(/^msgid/)) { // Original
-      finish();
-      item.msgid = extract(line);
-      context = 'msgid';
-    }
-    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 { // Probably multiline string or blank
-      if (line.length > 0) {
-        if (context == 'msgstr') {
-          item.msgstr[plural] += extract(line);
         }
-        else if (context == 'msgid') {
+        if (header.match(/^"/)) {
-          item.msgid += extract(line);
+            header = header.trim().replace(/^"/, '').replace(/\\n"$/, '');
+            var p = header.split(/:/),
+                name = p.shift().trim(),
+                value = p.join(':').trim();
+            po.headers[name] = value;
         }
-        else if (context == 'msgid_plural') {
-          item.msgid_plural += extract(line);
-        }
-      }
-    }
-  };
-  finish();
-
-  return po;
-};
-
-PO.Item = function() {
-  this.msgid = '';
-  this.references = [];
-  this.msgid_plural = null;
-  this.msgstr = [];
-  this.comments = [];
-};
-
-PO.Item.prototype.toString = function() {
-  var lines = []
-    , that = this;
-
-  var _process = function(keyword, text, i) {
-    var lines = []
-      , parts = text.split(/\n/)
-      , index = typeof i != 'undefined' ? util.format('[%d]', i) : '';
-    if (parts.length > 1) {
-      lines.push(util.format('%s%s ""', keyword, index));
-      parts.forEach(function(part) {
-        lines.push(util.format('"%s"', part))
-      });
-    }
-    else {
-      lines.push(util.format('%s%s "%s"', keyword, index, text));
-    }
-    return lines;
-  }
-
-  if (this.references.length > 0) {
-    this.references.forEach(function(ref) {
-      lines.push(util.format('#: %s', ref));
     });
-  };
 
-  ['msgid', 'msgid_plural', 'msgstr'].forEach(function(keyword) {
+    var item = new PO.Item(),
-    var text = that[keyword];
+        context = null,
-    if (text != null) {
+        plural = 0;
-      if (util.isArray(text) && text.length > 1) {
+
-        text.forEach(function(t, i) {
+    function finish() {
-          lines = lines.concat(_process(keyword, t, i));
+        if (item.msgid.length > 0) {
-        });
+            po.items.push(item);
-      }
+            item = new PO.Item();
-      else {
+        }
-        text = util.isArray(text) ? text.join() : text;
-        lines = lines.concat(_process(keyword, text));
-      }
     }
-  });
 
-  return lines.join("\n");
+    function extract(string) {
+        string = trim(string);
+        string = string.replace(/^[^"]*"|"$/g, '');
+        string = string.replace(/\\"/g, '"');
+        string = string.replace(/\\\\/g, '\\');
+        return string;
+    }
+
+    while (lines.length > 0) {
+        var line = trim(lines.shift()),
+            add = false;
+        if (line.match(/^#:/)) { // Reference
+            finish();
+            item.references.push(trim(line.replace(/^#:/, '')));
+        }
+        else if (line.match(/^#/)) { // Comment
+            finish();
+            item.comments.push(trim(line.replace(/^#/, '')));
+        }
+        else if (line.match(/^msgid_plural/)) { // Plural form
+            item.msgid_plural = extract(line);
+            context = 'msgid_plural';
+        }
+        else if (line.match(/^msgid/)) { // Original
+            finish();
+            item.msgid = extract(line);
+            context = 'msgid';
+        }
+        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 { // Probably multiline string or blank
+            if (line.length > 0) {
+                if (context === 'msgstr') {
+                    item.msgstr[plural] += extract(line);
+                }
+                else if (context === 'msgid') {
+                    item.msgid += extract(line);
+                }
+                else if (context === 'msgid_plural') {
+                    item.msgid_plural += extract(line);
+                }
+            }
+        }
+    }
+    finish();
+
+    return po;
+};
+
+PO.Item = function () {
+    this.msgid = '';
+    this.references = [];
+    this.msgid_plural = null;
+    this.msgstr = [];
+    this.comments = [];
+};
+
+PO.Item.prototype.toString = function () {
+    var lines = [],
+        that = this;
+
+    var _process = function (keyword, text, i) {
+        var lines = [],
+            parts = text.split(/\n/),
+            index = typeof i !== 'undefined' ? util.format('[%d]', i) : '';
+        if (parts.length > 1) {
+            lines.push(util.format('%s%s ""', keyword, index));
+            parts.forEach(function (part) {
+                lines.push(util.format('"%s"', part));
+            });
+        }
+        else {
+            lines.push(util.format('%s%s "%s"', keyword, index, text));
+        }
+        return lines;
+    };
+
+    if (this.references.length > 0) {
+        this.references.forEach(function (ref) {
+            lines.push(util.format('#: %s', ref));
+        });
+    }
+
+    ['msgid', 'msgid_plural', 'msgstr'].forEach(function (keyword) {
+        var text = that[keyword];
+        if (text != null) {
+            if (util.isArray(text) && text.length > 1) {
+                text.forEach(function (t, i) {
+                    lines = lines.concat(_process(keyword, t, i));
+                });
+            }
+            else {
+                text = util.isArray(text) ? text.join() : text;
+                lines = lines.concat(_process(keyword, text));
+            }
+        }
+    });
+
+    return lines.join("\n");
 };
 
 module.exports = PO;

package.json

@@ -1,11 +1,24 @@
 {
-  "name"          : "node-po",
+  "name": "node-po",
-  "description"   : "Simple library for loading and saving Gettext PO files.",
+  "description": "Simple library for loading and saving Gettext PO files.",
-  "version"       : "0.1.1",
+  "version": "0.1.1",
-  "author"        : "Mike Holly",
+  "author": "Mike Holly",
-  "homepage"      : "http://github.com/mikejholly/node-po",
+  "homepage": "http://github.com/mikejholly/node-po",
-  "repository"    : {"type" : "git", "url" : "http://github.com/mikejholly/node-po.git"},
+  "repository": {
-  "dependencies"  : [],
+    "type": "git",
-  "main"          : "./lib/po",
+    "url": "http://github.com/mikejholly/node-po.git"
-  "keywords"      : ["i18n", "l10n", "gettext", "mo", "po"]
+  },
+  "main": "./lib/po",
+  "keywords": [
+    "i18n",
+    "l10n",
+    "gettext",
+    "mo",
+    "po"
+  ],
+  "devDependencies": {
+    "grunt": "~0.4.2",
+    "grunt-contrib-watch": "~0.5.3",
+    "grunt-contrib-jshint": "~0.7.2"
+  }
 }