Release v1.1.3

Make obsolete public

Gruntfile.coffee

@@ -53,7 +53,7 @@ module.exports = (grunt) ->
 
         bump:
             options:
-                files: ['package.json', 'bower.json']
+                files: ['package.json', 'package-lock.json', 'bower.json']
                 commitFiles: ['-a']
                 pushTo: 'origin'
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "pofile",
-  "version": "1.0.11",
+  "version": "1.1.3",
   "authors": [
     "Ruben Vermeersch <ruben@rocketeer.be>"
   ],

dist/pofile.js

@@ -1,8 +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);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+require=(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 
 },{}],"pofile":[function(require,module,exports){
-var fs = require('fs');
-
 function trim(string) {
     return string.replace(/^\s+|\s+$/g, '');
 }
@@ -16,7 +14,7 @@ var PO = function () {
 };
 
 PO.prototype.save = function (filename, callback) {
-    fs.writeFile(filename, this.toString(), callback);
+    require('fs').writeFile(filename, this.toString(), callback);
 };
 
 PO.prototype.toString = function () {
@@ -68,7 +66,7 @@ PO.prototype.toString = function () {
 };
 
 PO.load = function (filename, callback) {
-    fs.readFile(filename, 'utf-8', function (err, data) {
+    require('fs').readFile(filename, 'utf-8', function (err, data) {
         if (err) {
             return callback(err);
         }
@@ -85,7 +83,7 @@ PO.parse = function (data) {
     var headers = [];
     //everything until the first 'msgid ""' is considered header
     while (sections[0] && (headers.length === 0 || headers[headers.length - 1].indexOf('msgid ""') < 0)) {
-        if (sections[0].match(/msgid "[^"]/)) {
+        if (sections[0].match(/msgid\s+"[^"]/)) {
             //found first real string, adding a dummy header item
             headers.push('msgid ""');
         } else {

lib/po.js

@@ -1,5 +1,3 @@
-var fs = require('fs');
-
 function trim(string) {
     return string.replace(/^\s+|\s+$/g, '');
 }
@@ -13,7 +11,7 @@ var PO = function () {
 };
 
 PO.prototype.save = function (filename, callback) {
-    fs.writeFile(filename, this.toString(), callback);
+    require('fs').writeFile(filename, this.toString(), callback);
 };
 
 PO.prototype.toString = function () {
@@ -65,7 +63,7 @@ PO.prototype.toString = function () {
 };
 
 PO.load = function (filename, callback) {
-    fs.readFile(filename, 'utf-8', function (err, data) {
+    require('fs').readFile(filename, 'utf-8', function (err, data) {
         if (err) {
             return callback(err);
         }
@@ -82,7 +80,7 @@ PO.parse = function (data) {
     var headers = [];
     //everything until the first 'msgid ""' is considered header
     while (sections[0] && (headers.length === 0 || headers[headers.length - 1].indexOf('msgid ""') < 0)) {
-        if (sections[0].match(/msgid "[^"]/)) {
+        if (sections[0].match(/msgid\s+"[^"]/)) {
             //found first real string, adding a dummy header item
             headers.push('msgid ""');
         } else {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pofile",
   "description": "Parse and serialize Gettext PO files.",
-  "version": "1.0.11",
+  "version": "1.1.3",
   "author": {
     "name": "Ruben Vermeersch",
     "email": "ruben@savanne.be",
@@ -37,7 +37,8 @@
   },
   "devDependencies": {
     "browserify": "~14.0.0",
-    "grunt": "~1.0.1",
+    "coffeescript": "^2.6.1",
+    "grunt": "~1.3.0",
     "grunt-browserify": "~5.0.0",
     "grunt-bump": "0.8.0",
     "grunt-contrib-clean": "~1.0.0",

pofile.d.ts

@@ -1,18 +1,4 @@
-declare module pofile {
-    function parse(data: string): PO;
-    function load(fileName: string, callback: (err: NodeJS.ErrnoException | null, po: PO) => void): void;
-
-    class PO {
-        public comments: string[];
-        public extractedComments: string[];
-        public items: Item[];
-        public headers: Partial<IHeaders>
-
-        public save(filename: string, callback: (err?: NodeJS.ErrnoException) => void): void;
-        public toString(): string;
-    }
-
-    interface IHeaders {
+declare interface IHeaders {
     'Project-Id-Version': string;
     'Report-Msgid-Bugs-To': string;
     'POT-Creation-Date': string;
@@ -23,9 +9,10 @@ declare module pofile {
     'Content-Type': string;
     'Content-Transfer-Encoding': string;
     'Plural-Forms': string;
-    }
+    [name: string]: string;
+}
 
-    class Item {
+declare class Item {
     public msgid: string;
     public msgctxt?: string;
     public references: string[];
@@ -33,12 +20,26 @@ declare module pofile {
     public msgstr: string[];
     public comments: string[];
     public extractedComments: string[];
-        public flags: { [flag: string]: boolean | undefined }
+    public flags: Record<string, boolean | undefined>;
+    public obsolete: boolean;
     private nplurals: number;
-        private obsolete: boolean;
 
     public toString(): string;
-    }
 }
 
-export = pofile
+declare class PO {
+    public comments: string[];
+    public extractedComments: string[];
+    public items: Item[];
+    public headers: Partial<IHeaders>
+
+    public static parse(data: string): PO;
+    public static parsePluralForms(forms: string): PO;
+    public static load(fileName: string, callback: (err: NodeJS.ErrnoException, po: PO) => void): void;
+    public static Item: typeof Item;
+
+    public save(fileName: string, callback: (err: NodeJS.ErrnoException) => void): void;
+    public toString(): string;
+}
+
+export = PO

test/fixtures/no_header_extra_spaces.po

@@ -0,0 +1,8 @@
+# some comment
+
+msgid   "First id, no header"
+msgstr  ""
+
+msgid   "A second string"
+msgstr  ""
+

test/headers.js

@@ -70,4 +70,24 @@ describe('PO files with no headers', function () {
             assert.equal(po.items.length, 2);
         });
     });
+
+    describe('advanced example with extra spaces', function () {
+        var po;
+
+        before(function (done) {
+            PO.load(__dirname + '/fixtures/no_header_extra_spaces.po', function (err, result) {
+                assert.equal(err, null);
+                po = result;
+                done();
+            });
+        });
+
+        it('Parses the po file', function () {
+            assert.notEqual(po, null);
+        });
+
+        it('Finds all items', function () {
+            assert.equal(po.items.length, 2);
+        });
+    });
 });