Merge branch 'auto-orient'

Author: Hans Kristian Flaatten

assets/.gitignore

@@ -1,3 +1,4 @@
+autorotate-*
 vertical-*
 horizontal-*
 transparent-*

assets/autorotate.jpg

@@ -69,7 +69,7 @@ module.exports.path = function(src, opts) {
  */
 module.exports.cmd = function(image, output) {
   var cmd = [
-    sprintf('convert %s -strip -write mpr:%s +delete', image.path, image.path)
+    sprintf('convert %s -auto-orient -strip -write mpr:%s +delete', image.path, image.path)
   ];
 
   for (var i = 0; i < output.versions.length; i++) {

index.js

@@ -1,6 +1,8 @@
 /*jshint laxbreak:true */
 
 var assert = require('assert');
+var crypto = require('crypto');
+var fs = require('fs');
 var resize = require('./index');
 
 describe('resize.path()', function() {
@@ -143,6 +145,7 @@ describe('resize.cmd()', function() {
     assert.equal(cmd, [
       // original image
       'convert ./assets/horizontal.jpg',
+      '-auto-orient',
       '-strip',
       '-write mpr:./assets/horizontal.jpg +delete',
 
@@ -275,23 +278,26 @@ describe('resize()', function() {
       height: 2623
     };
 
-    var paths = [
-      'assets/horizontal-full.jpg',
-      'assets/horizontal-1200.jpg',
-      'assets/horizontal-800.jpg',
-      'assets/horizontal-500.jpg',
-      'assets/horizontal-260.jpg',
-      'assets/horizontal-150.jpg',
-      'assets/horizontal-square-200.jpg',
-      'assets/horizontal-square-50.jpg'
-    ];
+    var checksum = {
+      'assets/horizontal-full.jpg'      : '1a97483f4dfc21ea77217731a0f1908f8edeec22',
+      'assets/horizontal-1200.jpg'      : '54f1be17d4ffac0cb23802f1c04e783594662a8a',
+      'assets/horizontal-800.jpg'       : '9ebf00a2d96361720dcbcb66af14689d3d51269f',
+      'assets/horizontal-500.jpg'       : '58b09dc1f4ecf22427cc73ffd7b8ef2194fff4bb',
+      'assets/horizontal-260.jpg'       : '33437a2300f7d991c439d532075e211aad962a78',
+      'assets/horizontal-150.jpg'       : 'ad5957669f0774cd66be76414dcbe6b0d789367d',
+      'assets/horizontal-square-200.jpg': '576b72b83f486cfc684f459670e912310427a6a5',
+      'assets/horizontal-square-50.jpg' : 'cc0291eb853ceba62b009626ae7a0e68562e93de'
+    };
 
     resize(image, output, function(err, versions) {
       assert.ifError(err);
       assert(versions instanceof Array);
 
       for(var i = 0; i < versions.length; i++) {
-        assert.equal(versions[i].path, paths[i]);
+        var file = fs.readFileSync(versions[i].path);
+        var sha = crypto.createHash('sha1').update(file).digest('hex');
+
+        assert.equal(sha, checksum[versions[i].path]);
       }
 
       done();
@@ -307,23 +313,28 @@ describe('resize()', function() {
       height: 3456
     };
 
-    var paths = [
-      'assets/vertical-full.jpg',
-      'assets/vertical-1200.jpg',
-      'assets/vertical-800.jpg',
-      'assets/vertical-500.jpg',
-      'assets/vertical-260.jpg',
-      'assets/vertical-150.jpg',
-      'assets/vertical-square-200.jpg',
-      'assets/vertical-square-50.jpg'
-    ];
+    var checksum = {
+      'assets/vertical-full.jpg'      : '709746db3a56f66066f846e273db78dee60d0311',
+      'assets/vertical-1200.jpg'      : '6f1f88a98e43377728864a42ad1123126b66c1f7',
+      'assets/vertical-800.jpg'       : '95fbe34e98dd7839b1bde9400f4c7a6784e408b3',
+      'assets/vertical-500.jpg'       : '474242606e782deafe7af976f23513697b622cf4',
+      'assets/vertical-260.jpg'       : '4e49f570413c9f15156b1cf99febe9054e2f294f',
+      'assets/vertical-150.jpg'       : '9d8ec5975d548ee0b2f6f83c5f896c0fcd5d3a88',
+      'assets/vertical-square-200.jpg': '1d2a9b581b7f989e44384f4eabde1fc5085d20ad',
+      'assets/vertical-square-50.jpg' : '33e038f5fbcbc92991d68e343733bb0735286243'
+    };
 
     resize(image, output, function(err, versions) {
       assert.ifError(err);
+
       assert(versions instanceof Array);
+      assert.equal(versions.length, output.versions.length);
 
       for(var i = 0; i < versions.length; i++) {
-        assert.equal(versions[i].path, paths[i]);
+        var file = fs.readFileSync(versions[i].path);
+        var sha = crypto.createHash('sha1').update(file).digest('hex');
+
+        assert.equal(sha, checksum[versions[i].path]);
       }
 
       done();
@@ -345,23 +356,65 @@ describe('resize()', function() {
       output.versions[i].format = 'jpg';
     }
 
-    var paths = [
-      'assets/transparent-full.jpg',
-      'assets/transparent-1200.jpg',
-      'assets/transparent-800.jpg',
-      'assets/transparent-500.jpg',
-      'assets/transparent-260.jpg',
-      'assets/transparent-150.jpg',
-      'assets/transparent-square-200.jpg',
-      'assets/transparent-square-50.jpg'
-    ];
+    var checksum = {
+      'assets/transparent-full.jpg'      : '78e3647bc9f86f3e0a8a0a25dcc60fba519c29b9',
+      'assets/transparent-1200.jpg'      : '35069de49846815381830b4c46ab90f75eba43aa',
+      'assets/transparent-800.jpg'       : '017ec8afb9a81eae00132105da9cd6ea4083011c',
+      'assets/transparent-500.jpg'       : 'c0705376d473724384e6ed30a1305683023780e9',
+      'assets/transparent-260.jpg'       : '1ccf58141dfa60fe2cc74f024a9df82172e235d4',
+      'assets/transparent-150.jpg'       : 'f46d2e15c618b65d9e082f605e894d5ebd6a5450',
+      'assets/transparent-square-200.jpg': '012230141cb127947cfe958c452560b7a50d2425',
+      'assets/transparent-square-50.jpg' : 'ea8a03a6f9acfd1c5170c4b5d382c84aa3b304dc'
+    };
+
+    resize(image, output, function(err, versions) {
+      assert.ifError(err);
+
+      assert(versions instanceof Array);
+      assert.equal(versions.length, output.versions.length);
+
+      for(var i = 0; i < versions.length; i++) {
+        var file = fs.readFileSync(versions[i].path);
+        var sha = crypto.createHash('sha1').update(file).digest('hex');
+
+        assert.equal(sha, checksum[versions[i].path]);
+      }
+
+      done();
+    });
+  });
+
+  it('auto-rotates rotated image', function(done) {
+    this.timeout(10000);
+
+    var image = {
+      path: './assets/autorotate.jpg',
+      width: 3264,
+      height: 2448
+    };
+
+    var checksum = {
+      'assets/autorotate-full.jpg'      : 'efe10ac17cae71bd28c316728d6d29eeacc11fd8',
+      'assets/autorotate-1200.jpg'      : 'e8f5b75aa6c9859426c1d652d57a053444f897ff',
+      'assets/autorotate-800.jpg'       : '081df1cc1a3d7d76a0762f0d586dbecff221a25c',
+      'assets/autorotate-500.jpg'       : 'c5437d9b2dbbf791931ca9089020c78ac8fd02a3',
+      'assets/autorotate-260.jpg'       : 'a9b811a19fb078264e655c0c3c01acffda8d192e',
+      'assets/autorotate-150.jpg'       : 'd837d5fb4239f9fe1e3566df34906e3f8d654275',
+      'assets/autorotate-square-200.jpg': '24efb279a78b0c33a8715215d6f976c1f086573a',
+      'assets/autorotate-square-50.jpg' : 'f716e975f6269c3b9649a04d4144c5481265169c'
+    };
 
     resize(image, output, function(err, versions) {
       assert.ifError(err);
+
       assert(versions instanceof Array);
+      assert.equal(versions.length, output.versions.length);
 
       for(var i = 0; i < versions.length; i++) {
-        assert.equal(versions[i].path, paths[i]);
+        var file = fs.readFileSync(versions[i].path);
+        var sha = crypto.createHash('sha1').update(file).digest('hex');
+
+        assert.equal(sha, checksum[versions[i].path]);
       }
 
       done();

test.js

@@ -1,18 +1,23 @@
-box: wercker/nodejs
+box: starefossen/iojs-imagemagick:1-6
 build:
   steps:
-    - jshint:
-        version: 2.6
-
-    - npm-install
-    - npm-test
+    #- jshint:
+    #    version: 2.6
 
     - script:
         name: echo nodejs information
         code: |
           echo "node version $(node -v) running"
           echo "npm version $(npm -v) running"
 
+    - script:
+        name: echo imagemagick information
+        code: |
+            convert --version
+
+    - npm-install
+    - npm-test
+
   after-steps:
     - turistforeningen/slack-notifier:
         url: $SLACK_WEBHOOK_URL