Merge branch 'develop' into release/0.3.x

lib/extract.js

@@ -20,12 +20,22 @@ function extract(opts) {
                 "No extractor found for file '%s'", filename));
         }
 
-        return results.concat(extractor(_.extend({}, opts, {
-            filename: filename,
-            source: fs
-                .readFileSync(path.resolve(filename))
-                .toString()
-        })));
+        var result = [];
+        try {
+            result = extractor(
+                _.extend({}, opts, {
+                    filename: filename,
+                    source: fs.readFileSync(path.resolve(filename)).toString(),
+                })
+            );
+        } catch (err) {
+            console.error('Cannot extract for', filename);
+            if (!opts.catchExtractError) {
+                throw err;
+            }
+        }
+
+        return results.concat(result);
     }, []);
 
     var pots = pot({

test/extract.test.js

@@ -107,4 +107,14 @@ describe("jspot.extract", function() {
         },
         /No extractor found for file 'a.custom'/);
     });
+
+    it("should not throw an error for unsupported formats if catchExtractError is set", function() {
+        jspot.extract({
+            catchExtractError: true,
+            target: tmpdir,
+            source: ['./test/fixtures/extract/wrong/input/a.js']
+        });
+
+        helpers.assert_file_not_exists(path.join(tmpdir, 'messages.pot'));
+    });
 });

test/fixtures/extract/wrong/input/a.js

@@ -0,0 +1,11 @@
+import {withRoute} from 'some/injector'
+
+@withRoute
+export class A extends React.Component {
+
+    render() {
+        return (
+            <h1>Hello World!</h1>
+        )
+    }
+}

test/helpers.js

@@ -15,6 +15,9 @@ helpers.assert_files_equal = function(actual_path, expected_path) {
     assert.equal(actual.toString(), expected.toString());
 };
 
+helpers.assert_file_not_exists = function(actual_path) {
+    assert.equal(fs.existsSync(actual_path), false);
+};
 
 helpers.tmpdir = function(done) {
     tmp.dir({

utils/test.sh

@@ -1,3 +1,3 @@
 #!/bin/bash -e
-./node_modules/.bin/jshint `find lib/ test/ -name "*.js"`
+./node_modules/.bin/jshint `find lib/ test/ -not -path "test/fixtures/extract/wrong/*" -name "*.js"`
 ./node_modules/.bin/mocha `find "$@" -name "*.test.js"`