Add suffix support, simplify tests

Author: moonglum

index.js

@@ -77,11 +77,11 @@ async function processFiles(fileNames, config) {
 }
 
 async function processFile(fileName,
-		{ source, target, targetDir, fingerprint, assetManager, variant, suffix }) {
+		{ source, target, targetDir, fingerprint, assetManager, variant }) {
 	let sourcePath = path.join(source, fileName);
-	let targetPath = path.join(target, fileName);
+	let targetPath = addSuffix(path.join(target, fileName), variant.suffix);
 
-	let format = variant.format ? variant.format : fileExtension(fileName);
+	let format = variant.format ? variant.format : extname(fileName);
 
 	let output = format === "svg" ?
 		await optimizeSVG(sourcePath) :
@@ -138,11 +138,18 @@ async function optimizeBitmap(sourcePath, format,
 	return image.toBuffer();
 }
 
+function addSuffix(filepath, suffix = "") {
+	let directory = path.dirname(filepath);
+	let extension = path.extname(filepath);
+	let basename = path.basename(filepath, extension);
+	return path.join(directory, `${basename}${suffix}${extension}`);
+}
+
 function withFileExtension(...extensions) {
-	return filename => extensions.includes(fileExtension(filename));
+	return filename => extensions.includes(extname(filename));
 }
 
 // extname follows this annoying idea that the dot belongs to the extension
-function fileExtension(filename) {
+function extname(filename) {
 	return path.extname(filename).slice(1);
 }

test/prepare

@@ -11,8 +11,4 @@ cp test/test_basic/src/example.jpg test/test_webp/src/example.jpg
 cp test/test_basic/src/example.png test/test_webp/src/example.png
 cp test/test_basic/src/example.webp test/test_webp/src/example.webp
 
-cp test/test_basic/src/example.jpg test/test_thumbnail/src/example.jpg
-cp test/test_basic/src/example.png test/test_thumbnail/src/example.png
-
-cp test/test_basic/src/example.jpg test/test_thumbnail_square/src/example.jpg
-cp test/test_basic/src/example.png test/test_thumbnail_square/src/example.png
+cp test/test_basic/src/example.jpg test/test_resizing/src/nested/example.jpg

test/run

@@ -75,26 +75,17 @@ begin "$root/test_webp"
 	assert_mime_type "image/webp" dist/example.webp
 end
 
-begin "$root/test_thumbnail"
+begin "$root/test_resizing"
 	faucet
-	assert_dimensions "300x200" dist/example.jpg
-	assert_dimensions "300x225" dist/example.png
-end
 
-begin "$root/test_thumbnail_square"
-	faucet
-	assert_dimensions "300x300" dist/example.jpg
-	assert_dimensions "300x300" dist/example.png
-end
+	assert_mime_type "image/jpeg" dist/nested/example-small.jpg
+	assert_dimensions "3000x2000" dist/nested/example-small.jpg
 
-# TODO: This does not work on Github Actions, and I don't know why
-# begin "$root/test_scaling"
-# 	faucet
-# 	assert_dimensions "3000x2000" dist/example.jpg
-# 	assert_dimensions "280x210" dist/example.png
-# end
+	assert_mime_type "image/jpeg" dist/nested/example-thumbnail.jpg
+	assert_dimensions "300x200" dist/nested/example-thumbnail.jpg
 
-# TODO: Add Suffix
-# Merge the last three tests into one with three different suffixes
+	assert_mime_type "image/jpeg" dist/nested/example-square.jpg
+	assert_dimensions "300x300" dist/nested/example-square.jpg
+end
 
 echo; echo "SUCCESS: all tests passed"

test/test_resizing/faucet.config.js

@@ -0,0 +1,25 @@
+"use strict";
+let path = require("path");
+
+module.exports = {
+	images: [{
+		source: "./src",
+		target: "./dist",
+		scale: 0.5,
+		suffix: "-small"
+	}, {
+		source: "./src",
+		target: "./dist",
+		width: 300,
+		height: 300,
+		suffix: "-thumbnail"
+	}, {
+		source: "./src",
+		target: "./dist",
+		width: 300,
+		height: 300,
+		keepRatio: false,
+		suffix: "-square"
+	}],
+	plugins: [path.resolve(__dirname, "../..")]
+};