Skip to content

Commit

Permalink
Merge pull request #4324 from nebulab/waiting-for-dev/libvips_31
Browse files Browse the repository at this point in the history
[3.1] Fixes using ActiveStorage adapter with libvips as variant processor
  • Loading branch information
waiting-for-dev authored Apr 11, 2022
2 parents 61703eb + 12b7f9c commit 58f176d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions .dockerdev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN apt-get update -qq \
curl \
git \
imagemagick \
libvips \
libmariadb-dev \
sqlite3 \
libsqlite3-dev \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ def variant(style = nil)
size = style_to_size(style)
@attachment.variant(
resize_to_limit: size,
strip: true
saver: {
strip: true
}
).processed
end

Expand Down Expand Up @@ -58,7 +60,7 @@ def metadata
end

def normalize_styles(styles)
styles.transform_values { |v| v.split('x') }
styles.transform_values { |v| v.split('x').map(&:to_i) }
end

def style_to_size(style)
Expand Down
1 change: 1 addition & 0 deletions core/lib/spree/testing_support/dummy_app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class Application < ::Rails::Application
}
}
config.active_storage.service = :test
config.active_storage.variant_processor = ENV.fetch('ACTIVE_STORAGE_VARIANT_PROCESSOR', :mini_magick).to_sym
end
end

Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ services:
HISTFILE: "/home/solidus_user/history/bash_history"
MYSQL_HISTFILE: "/home/solidus_user/history/mysql_history"
RAILS_ENV: development
ACTIVE_STORAGE_VARIANT_PROCESSOR: "mini_magick"
ports:
- "${SANDBOX_PORT:-3000}:${SANDBOX_PORT:-3000}"
volumes:
Expand Down

0 comments on commit 58f176d

Please sign in to comment.