Expand ActiveStorage variant mapping and tighten integration linting

Author: vipulnsward

README.md

@@ -526,6 +526,7 @@ url_for(record.file.preview(resize_to_limit: [320, 320]))
 ```ruby
 image_tag(record.image.variant(resize_to_limit: [320, 320], quality: "smart"))
 image_tag(record.image.variant(resize_to_fill: [200, 120]))
+image_tag(record.image.variant(resize_to_fit: [640, 480]))
 ```
 
 ### Uploadcare API interfaces

lib/uploadcare/rails/active_storage/integration.rb

@@ -6,6 +6,7 @@
 module Uploadcare
   module Rails
     module ActiveStorage
+      # :nodoc:
       module Integration
         module_function
 

lib/uploadcare/rails/active_storage/uploadcare_previewer.rb

@@ -8,6 +8,7 @@
 module Uploadcare
   module Rails
     module ActiveStorage
+      # :nodoc:
       class UploadcarePreviewer < ::ActiveStorage::Previewer
         class << self
           def accept?(blob)
@@ -47,13 +48,17 @@ def open_preview_io(url)
           tempfile.binmode
 
           response = http_get(url)
-          raise ::ActiveStorage::PreviewError, "Uploadcare preview fetch failed: #{response.code}" unless response.is_a?(Net::HTTPSuccess)
+          raise_preview_error(response) unless response.is_a?(Net::HTTPSuccess)
 
           tempfile.write(response.body)
           tempfile.rewind
           yield tempfile
         ensure
-          tempfile.close! if tempfile
+          tempfile&.close!
+        end
+
+        def raise_preview_error(response)
+          raise ::ActiveStorage::PreviewError, "Uploadcare preview fetch failed: #{response.code}"
         end
 
         def http_get(url, limit = 5)

lib/uploadcare/rails/active_storage/variant_remote_processing.rb

@@ -6,6 +6,7 @@
 module Uploadcare
   module Rails
     module ActiveStorage
+      # :nodoc:
       module VariantRemoteProcessing
         private
 
@@ -28,13 +29,13 @@ def download_transformed_uploadcare_image
           tempfile.binmode
 
           response = http_get(variant_source_url)
-          raise ::ActiveStorage::IntegrityError, "Uploadcare variant fetch failed: #{response.code}" unless response.is_a?(Net::HTTPSuccess)
+          raise_integrity_error(response) unless response.is_a?(Net::HTTPSuccess)
 
           tempfile.write(response.body)
           tempfile.rewind
           yield tempfile
         ensure
-          tempfile.close! if tempfile
+          tempfile&.close!
         end
 
         def variant_source_url
@@ -48,23 +49,32 @@ def uploadcare_uuid
 
         def uploadcare_transformations
           mapped = variation.transformations.deep_symbolize_keys.except(:format)
-          resize_to_limit = mapped.delete(:resize_to_limit)
-          resize_to_fill = mapped.delete(:resize_to_fill)
+          map_resize!(mapped, mapped.delete(:resize_to_fit))
+          map_resize!(mapped, mapped.delete(:resize_to_limit))
+          map_scale_crop!(mapped, mapped.delete(:resize_to_fill))
 
-          if resize_to_limit.present?
-            width, height = resize_to_limit
-            mapped[:resize] = [width, height].compact.join('x')
-          end
+          mapped
+        end
 
-          if resize_to_fill.present?
-            width, height = resize_to_fill
-            mapped[:scale_crop] = {
-              dimensions: [width, height].compact.join('x'),
-              offsets: '50%,50%'
-            }
-          end
+        def map_resize!(mapped, dimensions)
+          return if dimensions.blank?
 
-          mapped
+          width, height = dimensions
+          mapped[:resize] = [width, height].compact.join('x')
+        end
+
+        def map_scale_crop!(mapped, dimensions)
+          return if dimensions.blank?
+
+          width, height = dimensions
+          mapped[:scale_crop] = {
+            dimensions: [width, height].compact.join('x'),
+            offsets: '50%,50%'
+          }
+        end
+
+        def raise_integrity_error(response)
+          raise ::ActiveStorage::IntegrityError, "Uploadcare variant fetch failed: #{response.code}"
         end
 
         def http_get(url, limit = 5)

spec/uploadcare/rails/active_storage/uploadcare_previewer_spec.rb

@@ -6,7 +6,12 @@
 require 'uploadcare/rails/active_storage/uploadcare_previewer'
 
 RSpec.describe Uploadcare::Rails::ActiveStorage::UploadcarePreviewer do
-  let(:service) { ActiveStorage::Service::UploadcareService.new(public_key: 'demopublickey', secret_key: 'demosecretkey') }
+  let(:service) do
+    ActiveStorage::Service::UploadcareService.new(
+      public_key: 'demopublickey',
+      secret_key: 'demosecretkey'
+    )
+  end
   let(:uuid) { '2d33999d-c74a-4ff9-99ea-abc23496b052' }
   let(:filename) { double(base: 'report') }
   let(:blob) do

spec/uploadcare/rails/active_storage/variant_remote_processing_spec.rb

@@ -6,7 +6,12 @@
 require 'uploadcare/rails/active_storage/variant_remote_processing'
 
 RSpec.describe Uploadcare::Rails::ActiveStorage::VariantRemoteProcessing do
-  let(:service) { ActiveStorage::Service::UploadcareService.new(public_key: 'demopublickey', secret_key: 'demosecretkey') }
+  let(:service) do
+    ActiveStorage::Service::UploadcareService.new(
+      public_key: 'demopublickey',
+      secret_key: 'demosecretkey'
+    )
+  end
   let(:uuid) { '2d33999d-c74a-4ff9-99ea-abc23496b052' }
 
   let(:variant_host_class) do
@@ -65,6 +70,15 @@ def process
     expect(mapped[:scale_crop]).to eq({ dimensions: '200x100', offsets: '50%,50%' })
   end
 
+  it 'maps resize_to_fit into uploadcare resize operation' do
+    fit_variation = double(format: 'png', transformations: { resize_to_fit: [640, 480] })
+    host = variant_host_class.new(service: service, blob: blob, variation: fit_variation)
+
+    mapped = host.send(:uploadcare_transformations)
+
+    expect(mapped[:resize]).to eq('640x480')
+  end
+
   it 'falls back to base process when service is not uploadcare service' do
     non_uploadcare_service = Object.new
     host = variant_host_class.new(service: non_uploadcare_service, blob: blob, variation: variation)