From f6623870fe4d8985c7ea9cd3b2ac43d55d64f46d Mon Sep 17 00:00:00 2001
From: Konrad <konradnarewski@gmail.com>
Date: Mon, 2 Dec 2024 14:41:13 +0100
Subject: [PATCH 1/2] test: rename "describe" to "context" where appropriate

"describe" feels more accurate when discussing the interface, while "context" fits well when we are talking
about particular scenario/setup"
---
 spec/morandi_spec.rb | 52 ++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/spec/morandi_spec.rb b/spec/morandi_spec.rb
index 2f39f70..b1a84d7 100644
--- a/spec/morandi_spec.rb
+++ b/spec/morandi_spec.rb
@@ -49,7 +49,7 @@
     let(:reference_image_prefix) { processor_name == 'pixbuf' ? '' : processor_name }
     subject(:process_image) { Morandi.process(file_arg, options, file_out, { 'processor' => processor_name }) }
 
-    describe 'when given an input without any options' do
+    context 'when given an input without any options' do
       it 'creates output' do
         process_image
         expect(File).to exist(file_out)
@@ -57,7 +57,7 @@
       end
     end
 
-    describe 'when given a blank file' do
+    context 'when given a blank file' do
       it 'should fail' do
         File.open(file_in, 'w') { |fp| fp << '' }
         expect { process_image }.to raise_error(
@@ -68,7 +68,7 @@
       end
     end
 
-    describe 'when given a corrupt file' do
+    context 'when given a corrupt file' do
       it 'should fail' do
         File.open(file_in, 'ab') { |fp| fp.truncate(64) }
         expect { process_image }.to raise_exception(Morandi::CorruptImageError)
@@ -76,7 +76,7 @@
       end
     end
 
-    describe 'when given a invalid file format' do
+    context 'when given a invalid file format' do
       it 'should fail' do
         File.open(file_in, 'wb') { |fp| fp << 'INVALID' }
         expect { process_image }.to raise_error(
@@ -87,7 +87,7 @@
       end
     end
 
-    describe 'with a big image and a bigger cropped area to fill' do
+    context 'with a big image and a bigger cropped area to fill' do
       let(:options) do
         {
           'crop' => '0,477,15839,18804',
@@ -108,7 +108,7 @@
       end
     end
 
-    describe 'when given an angle of rotation' do
+    context 'when given an angle of rotation' do
       let(:options) { { 'angle' => angle } }
 
       context '90 degress', vips_wip: processor_name == 'vips' do
@@ -152,7 +152,7 @@
       let(:cropped_width) { 300 }
       let(:cropped_height) { 300 }
 
-      describe 'when given an array of dimensions' do
+      context 'when given an array of dimensions' do
         let(:options) { { 'crop' => [10, 10, cropped_width, cropped_height] } }
 
         it 'should crop the image' do
@@ -166,7 +166,7 @@
         end
       end
 
-      describe 'when given a string of dimensions' do
+      context 'when given a string of dimensions' do
         let(:options) { { 'crop' => "10,10,#{cropped_width},#{cropped_height}" } }
 
         it 'should do cropping of images with a string' do
@@ -180,7 +180,7 @@
         end
       end
 
-      describe 'with negative initial coordinates' do
+      context 'with negative initial coordinates' do
         let(:options) { { 'crop' => [-50, -50, cropped_width, cropped_height] } }
 
         it 'crops the image to desired dimensions' do
@@ -194,7 +194,7 @@
         end
       end
 
-      describe 'with desired dimensions exceeding the size of original image' do
+      context 'with desired dimensions exceeding the size of original image' do
         let(:options) { { 'crop' => [0, 0, original_image_width + 50, original_image_height + 50] } }
 
         it 'crops the image to desired dimensions' do
@@ -208,7 +208,7 @@
         end
       end
 
-      describe 'with negative dimensions' do
+      context 'with negative dimensions' do
         let(:options) { { 'crop' => [0, 0, -10, -10] } }
 
         it 'crops the image to 1x1px' do
@@ -223,7 +223,7 @@
       end
     end
 
-    describe 'when given an output.max option' do
+    context 'when given an output.max option' do
       let(:options) { { 'output.max' => max_size } }
       let(:max_size) { 200 }
 
@@ -239,7 +239,7 @@
       end
     end
 
-    describe 'when given a straighten option', vips_wip: processor_name == 'vips' do
+    context 'when given a straighten option', vips_wip: processor_name == 'vips' do
       let(:options) { { 'straighten' => 5 } }
 
       it 'straightens images' do
@@ -279,7 +279,7 @@
       end
     end
 
-    describe 'when given a gamma option', vips_wip: processor_name == 'vips' do
+    context 'when given a gamma option', vips_wip: processor_name == 'vips' do
       let(:options) { { 'gamma' => 2.0 } }
 
       it 'should apply the gamma to the image' do
@@ -292,7 +292,7 @@
       end
     end
 
-    describe 'when given an fx option' do
+    context 'when given an fx option' do
       let(:options) { { 'fx' => filter_name } }
 
       context 'with sepia' do
@@ -332,7 +332,7 @@
       end
     end
 
-    describe 'when changing the dimensions and auto-cropping' do
+    context 'when changing the dimensions and auto-cropping' do
       let(:max_width) { 300 }
       let(:max_height) { 200 }
 
@@ -357,7 +357,7 @@
       end
     end
 
-    describe 'with limiting the output size without autocrop' do
+    context 'with limiting the output size without autocrop' do
       let(:output_width) { 300 }
       let(:output_height) { 200 }
 
@@ -494,7 +494,7 @@
   context 'pixbuf processor' do
     it_behaves_like 'an image processor', 'pixbuf'
 
-    describe 'when given a pixbuf as an input' do
+    context 'when given a pixbuf as an input' do
       subject(:process_image) do
         Morandi.process(pixbuf, options, file_out)
       end
@@ -511,7 +511,7 @@
       end
     end
 
-    describe 'when the user supplies a path.icc in the "local_options" argument' do
+    context 'when the user supplies a path.icc in the "local_options" argument' do
       subject(:process_image) do
         Morandi.process(file_in, options, file_out, local_options)
       end
@@ -545,7 +545,7 @@
       end
     end
 
-    describe 'when the user supplies a path.icc in the "options" argument' do
+    context 'when the user supplies a path.icc in the "options" argument' do
       let(:icc_path) { 'sample/icc_insecure_test.jpg' }
       let(:options) { { 'path.icc' => icc_path } }
       let(:icc_width) { 900 }
@@ -564,7 +564,7 @@
       end
     end
 
-    describe 'when given a redeye option' do
+    context 'when given a redeye option' do
       let(:file_in) { 'spec/fixtures/public-domain-redeye-image-from-wikipedia.jpg' }
       let(:options) { { 'redeye' => [[540, 650]] } }
 
@@ -602,7 +602,7 @@
       end
     end
 
-    describe 'when given a negative sharpen option' do
+    context 'when given a negative sharpen option' do
       let(:options) { { 'sharpen' => -3 } }
 
       it 'should blur the image' do
@@ -614,7 +614,7 @@
       end
     end
 
-    describe 'when given a postive sharpen option' do
+    context 'when given a postive sharpen option' do
       let(:options) { { 'sharpen' => 3 } }
 
       it 'should sharpen the image' do
@@ -627,7 +627,7 @@
       end
     end
 
-    describe 'when applying a border and maintaining the original size' do
+    context 'when applying a border and maintaining the original size' do
       let(:options) do
         {
           'border-style' => 'square',
@@ -684,7 +684,7 @@
       end
     end
 
-    describe 'when applying a retro border and maintaining the original size' do
+    context 'when applying a retro border and maintaining the original size' do
       let(:options) do
         {
           'border-style' => 'retro',
@@ -707,7 +707,7 @@
       end
     end
 
-    describe 'when applying multiple transformations' do
+    context 'when applying multiple transformations' do
       let(:desired_image_width) { 300 }
       let(:desired_image_height) { 260 }
 

From 71376beccf0c82dbc93db87b589d2faa1b7ddc21 Mon Sep 17 00:00:00 2001
From: Konrad <konradnarewski@gmail.com>
Date: Mon, 2 Dec 2024 15:48:38 +0100
Subject: [PATCH 2/2] fix: ensure that VipsImageProcessor#write_to_jpeg uses
 jpg regardless of the output file extension

Since vips chooses format based on the extension, the easiest way to guarantee the expected format is to append .jpg to the filename, then rename
---
 lib/morandi/vips_image_processor.rb |  6 ++++--
 spec/morandi_spec.rb                | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/morandi/vips_image_processor.rb b/lib/morandi/vips_image_processor.rb
index fe7fbad..533ddaf 100644
--- a/lib/morandi/vips_image_processor.rb
+++ b/lib/morandi/vips_image_processor.rb
@@ -73,12 +73,14 @@ def write_to_png(_write_to, _orientation = :any)
       raise 'not implemented'
     end
 
-    def write_to_jpeg(write_to, quality = nil)
+    def write_to_jpeg(target_path, quality = nil)
       process!
 
       quality ||= @options.fetch('quality', 97)
 
-      @img.write_to_file(write_to, Q: quality)
+      target_path_jpg = "#{target_path}.jpg" # Vips chooses format based on file extension, this ensures jpg
+      @img.write_to_file(target_path_jpg, Q: quality)
+      FileUtils.mv(target_path_jpg, target_path)
     end
 
     private
diff --git a/spec/morandi_spec.rb b/spec/morandi_spec.rb
index b1a84d7..6731172 100644
--- a/spec/morandi_spec.rb
+++ b/spec/morandi_spec.rb
@@ -489,6 +489,16 @@
         end
       end
     end
+
+    context 'with output file having jpg extension' do
+      let(:file_out) { "#{super()}.png" }
+
+      it 'writes file as jpg' do
+        process_image
+
+        expect(processed_image_type).to eq('jpeg')
+      end
+    end
   end
 
   context 'pixbuf processor' do