Changes to support resize + crop=center for gm

papandreou · Mar 4, 2016 · 03a5886 · 03a5886
1 parent 19bda18
commit 03a5886
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/lib/getFilterInfosAndTargetContentTypeFromQueryString.js b/lib/getFilterInfosAndTargetContentTypeFromQueryString.js
@@ -136,6 +136,23 @@ module.exports = function getFilterInfosAndTargetContentTypeFromQueryString(quer
                                 if (options.maxInputPixels) {
                                     gmInstance.limit('pixels', options.maxInputPixels);
                                 }
+                                var resize;
+                                var crop;
+                                for (var i = 0 ; i < gmOperationsForThisInstance.length ; i += 1) {
+                                    var gmOperation = gmOperationsForThisInstance[i];
+                                    if (gmOperation.name === 'resize') {
+                                        resize = gmOperation;
+                                    } else if (gmOperation.name === 'crop') {
+                                        crop = gmOperation;
+                                    }
+                                }
+                                if (resize && crop) {
+                                    gmOperationsForThisInstance.push({
+                                        name: 'extent',
+                                        args: [].concat(resize.args)
+                                    });
+                                    resize.args.push('^');
+                                }
                                 gmOperationsForThisInstance.reduce(function (gmInstance, gmOperation) {
                                     checkSharpOrGmOperation(gmOperation);
                                     if (gmOperation.name === 'rotate' && gmOperation.args.length === 1) {
@@ -145,6 +162,21 @@ module.exports = function getFilterInfosAndTargetContentTypeFromQueryString(quer
                                     if (gmOperation.name === 'extract') {
                                         gmOperation.name = 'crop';
                                         gmOperation.args = [gmOperation.args[2], gmOperation.args[3], gmOperation.args[0], gmOperation.args[1]];
+                                    } else if (gmOperation.name === 'crop') {
+                                        gmOperation.name = 'gravity';
+                                        gmOperation.args = [
+                                            {
+                                                northwest: 'NorthWest',
+                                                north: 'North',
+                                                northeast: 'NorthEast',
+                                                west: 'West',
+                                                center: 'Center',
+                                                east: 'East',
+                                                southwest: 'SouthWest',
+                                                south: 'South',
+                                                southeast: 'SouthEast'
+                                            }[String(gmOperation.args[0]).toLowerCase()] || 'Center'
+                                        ];
                                     }
                                     if (!gmInstance[gmOperation.name]) {
                                         gmOperation = _.extend({}, gmOperation);

diff --git a/test/processImage.js b/test/processImage.js
@@ -577,9 +577,17 @@ describe('express-processimage', function () {
         );
     });
 
-    it.skip('should allow a crop operation with a gravity of center', function () {
-        return expect('GET /turtle.jpg?gm&resize=40,15&crop=center', 'to yield response', {
-            body: expect.it('to resemble', pathModule.resolve(__dirname, '..', 'testdata', 'turtleCroppedCenter.jpg'))
+    describe('with the gm engine', function () {
+        it('should allow a crop operation with a gravity of center', function () {
+            return expect('GET /turtle.jpg?gm&resize=40,15&crop=center', 'to yield response', {
+                body: expect.it('to resemble', pathModule.resolve(__dirname, '..', 'testdata', 'turtleCroppedCenterGm.jpg'))
+            });
+        });
+
+        it('should allow a crop operation with a gravity of northeast', function () {
+            return expect('GET /turtle.jpg?gm&resize=40,15&crop=northeast', 'to yield response', {
+                body: expect.it('to resemble', pathModule.resolve(__dirname, '..', 'testdata', 'turtleCroppedNorthEastGm.jpg'))
+            });
         });
     });
 });
diff --git a/testdata/turtleCroppedCenterGm.jpg b/testdata/turtleCroppedCenterGm.jpg
diff --git a/testdata/turtleCroppedNorthEastGm.jpg b/testdata/turtleCroppedNorthEastGm.jpg