Add back format inference from filename [possible breaking change]

.gitignore

@@ -4,10 +4,12 @@ examples/imgs/*
 !examples/imgs/original.jpg
 !examples/imgs/original.png
 !examples/imgs/original.gif
+!examples/imgs/original.svg
 !examples/imgs/originalSideways.jpg
 !examples/imgs/morpher.jpg
 !examples/imgs/photo.JPG
 !examples/imgs/orientation/*\d.jpg
 !examples/imgs/orientation/*.correct.jpg
+!examples/imgs/icon.ico
 *.sw*
 .idea

index.js

@@ -64,6 +64,12 @@ function gm (source, height, color) {
       this.sourceFrames = source.substr(frames.index, frames[0].length);
       source = source.substr(0, frames.index);
     }
+
+    // parse out extension
+    var ext = source.match(/\.(\w+)$/);
+    if (ext && source !== 'unknown.jpg') {
+      this.sourceExt = ext[1].toLowerCase();
+    }
   }
 
   this.source = source;
@@ -74,6 +80,7 @@ function gm (source, height, color) {
     var inputFromStdin = this.sourceStream || this.sourceBuffer;
     var ret = inputFromStdin ? '-' : this.source;
 
+    if (inputFromStdin && this.sourceExt) ret = this.sourceExt + ':-';
     if (ret && this.sourceFrames) ret += this.sourceFrames;
 
     src.length = 0;

lib/command.js

@@ -224,7 +224,11 @@ module.exports = function (proto) {
     } catch (e) {
       return cb(e);
     }
-    proc.stdin.once('error', cb);
+    proc.stdin.on('error', function (err) {
+      if (err.code !== 'ECONNRESET') {
+        cb(err);
+      }
+    });
 
     if (timeout) {
       timeoutId = setTimeout(function(){

lib/getters.js

@@ -53,7 +53,7 @@ module.exports = function (gm) {
 
       self.bufferStream = !!opts.bufferStream;
 
-      if (val.verbose) {
+      if (val.verbose || this.inputIs('svg')) {
         self.identify(opts, function (err, stdout, stderr, cmd) {
           if (err) {
             self.emit(getter, err, self.data[key], stdout, stderr, cmd);

test/formatInference.js

@@ -0,0 +1,21 @@
+var assert = require('assert')
+var fs = require('fs');
+
+module.exports = function (_, dir, finish, gm) {
+  var m = gm(fs.createReadStream(dir + '/icon.ico'), 'icon.ico')
+
+  var args = m.args();
+  assert.equal('convert', args[0]);
+  assert.equal('ico:-', args[1]);
+
+  if (!gm.integration)
+    return finish();
+
+  m
+  .size({bufferStream: true}, function (err, size) { 
+    if (err) return finish(err);
+    assert.equal(128, size.width);
+    assert.equal(128, size.height);
+    finish();
+  });
+}

test/getterSize.js

@@ -11,9 +11,13 @@ module.exports = function (_, dir, finish, gm) {
     sizeGIF(function (err) {
       if (err) return finish(err);
 
-      sizePNG(finish);
-    })
-  })
+      sizePNG(function (err) {
+        if (err) return finish(err);
+
+        sizeSVG(finish);
+      });
+    });
+  });
 
   function sizeJPEG(done) {
     gm(dir + '/original.jpg')
@@ -32,22 +36,34 @@ module.exports = function (_, dir, finish, gm) {
     .size(function (err, size) {
       if (err) return done(err);
 
-      assert.equal(size.width, 192)
-      assert.equal(size.height, 56)
+      assert.equal(size.width, 192);
+      assert.equal(size.height, 56);
 
-      done()
-    })
+      done();
+    });
   }
 
   function sizePNG(done) {
     gm(dir + '/original.png')
     .size(function (err, size) {
       if (err) return done(err);
 
-      assert.equal(size.width, 460)
-      assert.equal(size.height, 155)
+      assert.equal(size.width, 460);
+      assert.equal(size.height, 155);
 
-      done()
-    })
+      done();
+    });
+  }
+
+  function sizeSVG(done) {
+    gm(dir + '/original.svg')
+    .size(function (err, size) {
+      if (err) return done(err);
+
+      assert.equal(size.width, 216);
+      assert.equal(size.height, 216);
+
+      done();
+    });
   }
 }

test/gifFrameStream.js

@@ -7,7 +7,7 @@ module.exports = function (_, dir, finish, gm) {
 
   var args = m.args();
   assert.equal('convert', args[0]);
-  assert.equal('-[0]', args[1]);
+  assert.equal('gif:-[0]', args[1]);
 
   if (!gm.integration)
     return finish();

test/resizeAndAutoOrientFromBuffer.js

@@ -14,7 +14,7 @@ module.exports = function (_, dir, finish, gm) {
 
   var args = m.args();
   assert.equal('convert', args[0]);
-  assert.equal('-', args[1]);
+  assert.equal('jpg:-', args[1]);
   assert.equal('-resize', args[2]);
   if (m._options.imageMagick) {
     assert.equal('20%', args[3]);

test/resizeBuffer.js

@@ -13,7 +13,7 @@ module.exports = function (_, dir, finish, gm) {
 
   var args = m.args();
   assert.equal('convert', args[0]);
-  assert.equal('-', args[1]);
+  assert.equal('jpg:-', args[1]);
   assert.equal('-resize', args[2]);
   if (m._options.imageMagick) {
     assert.equal('48%', args[3]);

test/streamerr.js

@@ -7,8 +7,7 @@ module.exports = function (_, dir, finish, gm) {
   // The following invocation should fail, because 'convert' 
   // has no way of interpreting the file.
   gm(
-    svg_file, 
-    './test.svg' // fiction
+    svg_file
     ).options({
       imageMagick: true
   }).setFormat('png').toBuffer(function(err, buffer) {