Skip to content
This repository was archived by the owner on May 1, 2025. It is now read-only.

Commit 98018f1

Browse files
author
Hans Kristian Flaatten
committed
Merge branch 'forced-orientation'
2 parents 48541bc + fae7c87 commit 98018f1

File tree

4 files changed

+62
-39
lines changed

4 files changed

+62
-39
lines changed

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var exec = require('child_process').exec, child;
1+
var exec = require('child_process').exec;
22
var aspect = require('aspectratio');
33
var dirname = require('path').dirname;
44
var basename = require('path').basename;
@@ -27,7 +27,7 @@ module.exports = function(image, output, cb) {
2727
module.exports.crop = function(image, ratio) {
2828
if (!ratio) { return false; }
2929

30-
var g = aspect.fixed(image.width, image.height, ratio);
30+
var g = aspect.crop(image.width, image.height, ratio);
3131

3232
// Check if the image already has the decired aspectratio.
3333
if (g[0] === 0 && g[1] === 0) {

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"main": "index.js",
66
"scripts": {
77
"test": "mocha test.js",
8+
"hint": "./node_modules/.bin/jshint index.js test.js",
89
"watch": "./node_modules/.bin/mocha -w test.js"
910
},
1011
"repository": {
@@ -26,9 +27,10 @@
2627
},
2728
"homepage": "https://github.com/Turistforeningen/node-im-resize",
2829
"devDependencies": {
29-
"mocha": "^2.2.4"
30+
"jshint": "~2",
31+
"mocha": "~2"
3032
},
3133
"dependencies": {
32-
"aspectratio": "^2.0.0"
34+
"aspectratio": "~2.1"
3335
}
3436
}

test.js

Lines changed: 50 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,16 @@ describe('resize()', function() {
255255
maxHeight: 150,
256256
maxWidth: 150,
257257
aspect: "3:2"
258+
},{
259+
suffix: '-horizontal-500',
260+
maxHeight: 500,
261+
maxWidth: 500,
262+
aspect: "3:2!h",
263+
},{
264+
suffix: '-vertical-500',
265+
maxHeight: 500,
266+
maxWidth: 500,
267+
aspect: "3:2!v",
258268
},{
259269
suffix: '-square-200',
260270
maxHeight: 200,
@@ -279,14 +289,16 @@ describe('resize()', function() {
279289
};
280290

281291
var checksum = {
282-
'assets/horizontal-full.jpg' : '1a97483f4dfc21ea77217731a0f1908f8edeec22',
283-
'assets/horizontal-1200.jpg' : '54f1be17d4ffac0cb23802f1c04e783594662a8a',
284-
'assets/horizontal-800.jpg' : '9ebf00a2d96361720dcbcb66af14689d3d51269f',
285-
'assets/horizontal-500.jpg' : '58b09dc1f4ecf22427cc73ffd7b8ef2194fff4bb',
286-
'assets/horizontal-260.jpg' : '33437a2300f7d991c439d532075e211aad962a78',
287-
'assets/horizontal-150.jpg' : 'ad5957669f0774cd66be76414dcbe6b0d789367d',
288-
'assets/horizontal-square-200.jpg': '576b72b83f486cfc684f459670e912310427a6a5',
289-
'assets/horizontal-square-50.jpg' : 'cc0291eb853ceba62b009626ae7a0e68562e93de'
292+
'assets/horizontal-1200.jpg' : '54f1be17d4ffac0cb23802f1c04e783594662a8a',
293+
'assets/horizontal-150.jpg' : 'ad5957669f0774cd66be76414dcbe6b0d789367d',
294+
'assets/horizontal-260.jpg' : '33437a2300f7d991c439d532075e211aad962a78',
295+
'assets/horizontal-500.jpg' : '58b09dc1f4ecf22427cc73ffd7b8ef2194fff4bb',
296+
'assets/horizontal-800.jpg' : '9ebf00a2d96361720dcbcb66af14689d3d51269f',
297+
'assets/horizontal-full.jpg' : '1a97483f4dfc21ea77217731a0f1908f8edeec22',
298+
'assets/horizontal-horizontal-500.jpg' : '58b09dc1f4ecf22427cc73ffd7b8ef2194fff4bb',
299+
'assets/horizontal-square-200.jpg' : '576b72b83f486cfc684f459670e912310427a6a5',
300+
'assets/horizontal-square-50.jpg' : 'cc0291eb853ceba62b009626ae7a0e68562e93de',
301+
'assets/horizontal-vertical-500.jpg' : '6b5cda8f8b58f49c653a8dc48ae2976c7d079c3d'
290302
};
291303

292304
resize(image, output, function(err, versions) {
@@ -314,14 +326,16 @@ describe('resize()', function() {
314326
};
315327

316328
var checksum = {
317-
'assets/vertical-full.jpg' : '709746db3a56f66066f846e273db78dee60d0311',
318-
'assets/vertical-1200.jpg' : '6f1f88a98e43377728864a42ad1123126b66c1f7',
319-
'assets/vertical-800.jpg' : '95fbe34e98dd7839b1bde9400f4c7a6784e408b3',
320-
'assets/vertical-500.jpg' : '474242606e782deafe7af976f23513697b622cf4',
321-
'assets/vertical-260.jpg' : '4e49f570413c9f15156b1cf99febe9054e2f294f',
322-
'assets/vertical-150.jpg' : '9d8ec5975d548ee0b2f6f83c5f896c0fcd5d3a88',
323-
'assets/vertical-square-200.jpg': '1d2a9b581b7f989e44384f4eabde1fc5085d20ad',
324-
'assets/vertical-square-50.jpg' : '33e038f5fbcbc92991d68e343733bb0735286243'
329+
'assets/vertical-1200.jpg' : '6f1f88a98e43377728864a42ad1123126b66c1f7',
330+
'assets/vertical-150.jpg' : '9d8ec5975d548ee0b2f6f83c5f896c0fcd5d3a88',
331+
'assets/vertical-260.jpg' : '4e49f570413c9f15156b1cf99febe9054e2f294f',
332+
'assets/vertical-500.jpg' : '474242606e782deafe7af976f23513697b622cf4',
333+
'assets/vertical-800.jpg' : '95fbe34e98dd7839b1bde9400f4c7a6784e408b3',
334+
'assets/vertical-full.jpg' : '709746db3a56f66066f846e273db78dee60d0311',
335+
'assets/vertical-horizontal-500.jpg' : 'a70eff22ec8c4a12ab128560463280eb13edb2be',
336+
'assets/vertical-square-200.jpg' : '1d2a9b581b7f989e44384f4eabde1fc5085d20ad',
337+
'assets/vertical-square-50.jpg' : '33e038f5fbcbc92991d68e343733bb0735286243',
338+
'assets/vertical-vertical-500.jpg' : '474242606e782deafe7af976f23513697b622cf4'
325339
};
326340

327341
resize(image, output, function(err, versions) {
@@ -357,14 +371,16 @@ describe('resize()', function() {
357371
}
358372

359373
var checksum = {
360-
'assets/transparent-full.jpg' : '78e3647bc9f86f3e0a8a0a25dcc60fba519c29b9',
361-
'assets/transparent-1200.jpg' : '35069de49846815381830b4c46ab90f75eba43aa',
362-
'assets/transparent-800.jpg' : '017ec8afb9a81eae00132105da9cd6ea4083011c',
363-
'assets/transparent-500.jpg' : 'c0705376d473724384e6ed30a1305683023780e9',
364-
'assets/transparent-260.jpg' : '1ccf58141dfa60fe2cc74f024a9df82172e235d4',
365-
'assets/transparent-150.jpg' : 'f46d2e15c618b65d9e082f605e894d5ebd6a5450',
366-
'assets/transparent-square-200.jpg': '012230141cb127947cfe958c452560b7a50d2425',
367-
'assets/transparent-square-50.jpg' : 'ea8a03a6f9acfd1c5170c4b5d382c84aa3b304dc'
374+
'assets/transparent-1200.jpg' : '35069de49846815381830b4c46ab90f75eba43aa',
375+
'assets/transparent-150.jpg' : 'f46d2e15c618b65d9e082f605e894d5ebd6a5450',
376+
'assets/transparent-260.jpg' : '1ccf58141dfa60fe2cc74f024a9df82172e235d4',
377+
'assets/transparent-500.jpg' : 'c0705376d473724384e6ed30a1305683023780e9',
378+
'assets/transparent-800.jpg' : '017ec8afb9a81eae00132105da9cd6ea4083011c',
379+
'assets/transparent-full.jpg' : '78e3647bc9f86f3e0a8a0a25dcc60fba519c29b9',
380+
'assets/transparent-horizontal-500.jpg' : 'c0705376d473724384e6ed30a1305683023780e9',
381+
'assets/transparent-square-200.jpg' : '012230141cb127947cfe958c452560b7a50d2425',
382+
'assets/transparent-square-50.jpg' : 'ea8a03a6f9acfd1c5170c4b5d382c84aa3b304dc',
383+
'assets/transparent-vertical-500.jpg' : '384f876de67f866daca7d675a7b2a4f256c2767e',
368384
};
369385

370386
resize(image, output, function(err, versions) {
@@ -394,14 +410,16 @@ describe('resize()', function() {
394410
};
395411

396412
var checksum = {
397-
'assets/autorotate-full.jpg' : 'efe10ac17cae71bd28c316728d6d29eeacc11fd8',
398-
'assets/autorotate-1200.jpg' : 'e8f5b75aa6c9859426c1d652d57a053444f897ff',
399-
'assets/autorotate-800.jpg' : '081df1cc1a3d7d76a0762f0d586dbecff221a25c',
400-
'assets/autorotate-500.jpg' : 'c5437d9b2dbbf791931ca9089020c78ac8fd02a3',
401-
'assets/autorotate-260.jpg' : 'a9b811a19fb078264e655c0c3c01acffda8d192e',
402-
'assets/autorotate-150.jpg' : 'd837d5fb4239f9fe1e3566df34906e3f8d654275',
403-
'assets/autorotate-square-200.jpg': '24efb279a78b0c33a8715215d6f976c1f086573a',
404-
'assets/autorotate-square-50.jpg' : 'f716e975f6269c3b9649a04d4144c5481265169c'
413+
'assets/autorotate-1200.jpg' : 'e8f5b75aa6c9859426c1d652d57a053444f897ff',
414+
'assets/autorotate-150.jpg' : 'd837d5fb4239f9fe1e3566df34906e3f8d654275',
415+
'assets/autorotate-260.jpg' : 'a9b811a19fb078264e655c0c3c01acffda8d192e',
416+
'assets/autorotate-500.jpg' : 'c5437d9b2dbbf791931ca9089020c78ac8fd02a3',
417+
'assets/autorotate-800.jpg' : '081df1cc1a3d7d76a0762f0d586dbecff221a25c',
418+
'assets/autorotate-full.jpg' : 'efe10ac17cae71bd28c316728d6d29eeacc11fd8',
419+
'assets/autorotate-horizontal-500.jpg': 'c5437d9b2dbbf791931ca9089020c78ac8fd02a3',
420+
'assets/autorotate-square-200.jpg' : '24efb279a78b0c33a8715215d6f976c1f086573a',
421+
'assets/autorotate-square-50.jpg' : 'f716e975f6269c3b9649a04d4144c5481265169c',
422+
'assets/autorotate-vertical-500.jpg' : '11935afdde5f752d8d3e08242d9187392ba33aa5'
405423
};
406424

407425
resize(image, output, function(err, versions) {

wercker.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
box: starefossen/iojs-imagemagick:1-6
22
build:
33
steps:
4-
#- jshint:
5-
# version: 2.6
6-
74
- script:
85
name: echo nodejs information
96
code: |
@@ -16,6 +13,12 @@ build:
1613
convert --version
1714
1815
- npm-install
16+
17+
- script:
18+
name: jshint
19+
code: |
20+
npm run hint
21+
1922
- npm-test
2023

2124
after-steps:

0 commit comments

Comments
 (0)