Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

add support for mini_magick image processing

nciemniak4665517ff382
diff --git a/.circleci/config.yml b/.circleci/config.yml
index f7fc48736e..2b6172b639 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,9 +28,6 @@ run_tests_2_7: &run_tests_2_7
keys:
- spree-bundle-v10-ruby-2-7-{{ .Branch }}
- spree-bundle-v10-ruby-2-7
- - run:
- name: Install libvips
- command: sudo apt-get install libvips
- run:
name: Ensure Bundle Install
command: |
@@ -57,9 +54,6 @@ run_tests_3_0: &run_tests_3_0
keys:
- spree-bundle-v10-ruby-3-0-{{ .Branch }}
- spree-bundle-v10-ruby-3-0
- - run:
- name: Install libvips
- command: sudo apt-get install libvips
- run:
name: Ensure Bundle Install
command: |
@@ -86,9 +80,6 @@ jobs:
keys:
- spree-bundle-v10-ruby-2-7-{{ .Branch }}
- spree-bundle-v10-ruby-2-7
- - run:
- name: Install libvips
- command: sudo apt-get install libvips
- run:
name: Bundle Install
command: |
@@ -107,9 +98,6 @@ jobs:
keys:
- spree-bundle-v10-ruby-3-0-{{ .Branch }}
- spree-bundle-v10-ruby-3-0
- - run:
- name: Install libvips
- command: sudo apt-get install libvips
- run:
name: Bundle Install
command: |
@@ -195,9 +183,6 @@ jobs:
keys:
- spree-bundle-v10-ruby-3-0-{{ .Branch }}
- spree-bundle-v10-ruby-3-0
- - run:
- name: Install libvips
- command: sudo apt-get install libvips
- run:
name: Ensure Bundle Install
command: |
diff --git a/core/app/models/concerns/spree/image_methods.rb b/core/app/models/concerns/spree/image_methods.rb
index 96acd1e70a..34720def38 100644
--- a/core/app/models/concerns/spree/image_methods.rb
+++ b/core/app/models/concerns/spree/image_methods.rb
@@ -10,14 +10,27 @@ module Spree
return unless size.match(/(\d+)x(\d+)/)
width, height = size.split('x').map(&:to_i)
+ gravity = translate_gravity_for_mini_magick(gravity)
# FIXME: bring back support for background color
-
+
cdn_image_url(attachment.variant(resize_and_pad: [width, height, { gravity: gravity }], saver: { quality: quality }))
end
def original_url
cdn_image_url(attachment)
end
+
+ private
+
+ def translate_gravity_for_mini_magick(gravity)
+ variant_processor = Rails.application.config.active_storage.variant_processor
+
+ if gravity.downcase == 'centre' && (variant_processor == nil || variant_processor == :mini_magick)
+ 'center'
+ else
+ gravity
+ end
+ end
end
end
diff --git a/core/config/initializers/active_storage.rb b/core/config/initializers/active_storage.rb
index 29d15e378d..892e53f8aa 100644
--- a/core/config/initializers/active_storage.rb
+++ b/core/config/initializers/active_storage.rb
@@ -1,2 +1 @@
Rails.application.config.active_storage.content_types_to_serve_as_binary.delete('image/svg+xml')
-Rails.application.config.active_storage.variant_processor = :vips
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 5c2e02af03..79c5b4858a 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -14,7 +14,6 @@ require 'friendly_id'
require 'kaminari'
require 'monetize'
require 'paranoia'
-require 'ruby-vips'
require 'ransack'
require 'state_machines-activerecord'
require 'active_storage_validations'
diff --git a/core/spec/models/concerns/spree/image_methods_spec.rb b/core/spec/models/concerns/spree/image_methods_spec.rb
new file mode 100644
index 0000000000..c707f9a0c4
--- /dev/null
+++ b/core/spec/models/concerns/spree/image_methods_spec.rb
@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+
+describe Spree::ImageMethods do
+ describe '#generate_url' do
+ let(:variant) { create(:variant) }
+ let(:image) { create(:image, viewable: variant) }
+
+ before (:each) do
+ allow(image).to receive(:cdn_image_url)
+ end
+
+ context 'when gravity is not set to centre' do
+ let(:gravity) { 'north' }
+
+ it 'attachment.variant should receive the unchanged value of gravity' do
+ expect(image.attachment).to receive(:variant).with(resize_and_pad: [48, 48, gravity: 'north'], saver: anything)
+ image.generate_url(size: '48x48', gravity: gravity)
+ end
+ end
+
+ context 'when gravity is set to centre' do
+ let(:image) { create(:image, viewable: variant) }
+
+ it 'attachment.variant should receive "gravity: center" when image processing variant is nil' do
+ allow(Rails.application.config.active_storage).to receive(:variant_processor).and_return(nil)
+ expect(image.attachment).to receive(:variant).with(resize_and_pad: [48, 48, gravity: 'center'], saver: anything)
+ image.generate_url(size: '48x48')
+ end
+
+ it 'should return center when image processing variant is mini magick' do
+ allow(Rails.application.config.active_storage).to receive(:variant_processor).and_return(:mini_magick)
+ expect(image.attachment).to receive(:variant).with(resize_and_pad: [48, 48, gravity: 'center'], saver: anything)
+ image.generate_url(size: '48x48')
+ end
+
+ it 'should return centre when image processing variant is VIPS' do
+ allow(Rails.application.config.active_storage).to receive(:variant_processor).and_return(:vips)
+ expect(image.attachment).to receive(:variant).with(resize_and_pad: [48, 48, gravity: 'centre'], saver: anything)
+ image.generate_url(size: '48x48')
+ end
+ end
+ end
+end