Skip to content

Commit

Permalink
Only default to activestorage adapter if Rails version is supported
Browse files Browse the repository at this point in the history
We only support the activestorage adapter with Rails 6.1 and above,
but we default to it, even if the Rails version is 6.0 and below.
Since we still support Rails 5.2 and 6.0, we cannot default to
the active storage adapter. The app won't boot unless we also
change the adapter in the spree initializer.

If the initializer, though, is nested in a `config.to_prepare` hook
(as recommended from Rails new autoloader zeitwerk [1]) the app
refuses to start anyhow, because the config is then taken from
the `app_configuration` defaults.

[1](https://guides.rubyonrails.org/autoloading_and_reloading_constants.html#use-case-1-during-boot-load-reloadable-code)
tvdeyen committed Sep 5, 2022
1 parent 2e7b24d commit a5a7b50
Showing 2 changed files with 27 additions and 2 deletions.
5 changes: 3 additions & 2 deletions core/lib/spree/app_configuration.rb
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@
require "spree/core/search/variant"
require 'spree/preferences/configuration'
require 'spree/core/environment'
require 'spree/rails_compatibility'

module Spree
class AppConfiguration < Preferences::Configuration
@@ -497,7 +498,7 @@ def payment_canceller
# @!attribute [rw] image_attachment_module
# @return [Module] a module that can be included into Spree::Image to allow attachments
# Enumerable of images adhering to the present_image_class interface
class_name_attribute :image_attachment_module, default: 'Spree::Image::ActiveStorageAttachment'
class_name_attribute :image_attachment_module, default: Spree::RailsCompatibility.default_image_attachment_module

# @!attribute [rw] allowed_image_mime_types
#
@@ -555,7 +556,7 @@ def payment_canceller
# @!attribute [rw] taxon_attachment_module
# @return [Module] a module that can be included into Spree::Taxon to allow attachments
# Enumerable of taxons adhering to the present_taxon_class interface
class_name_attribute :taxon_attachment_module, default: 'Spree::Taxon::ActiveStorageAttachment'
class_name_attribute :taxon_attachment_module, default: Spree::RailsCompatibility.default_taxon_attachment_module

# Configures the absolute path that contains the Solidus engine
# migrations. This will be checked at app boot to confirm that all Solidus
24 changes: 24 additions & 0 deletions core/lib/spree/rails_compatibility.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# frozen_string_literal: true

require 'rails/gem_version'

module Spree
# Supported Rails versions compatibility
#
@@ -48,6 +50,28 @@ def self.raise_on_missing_translations(value)
end
end

# Set default image attachment adapter
#
# TODO: Remove when deprecating Rails 6.0
def self.default_image_attachment_module
if version_gte?("6.1")
"Spree::Image::ActiveStorageAttachment"
else
"Spree::Image::PaperclipAttachment"
end
end

# Set default taxon attachment adapter
#
# TODO: Remove when deprecating Rails 6.0
def self.default_taxon_attachment_module
if version_gte?("6.1")
"Spree::Taxon::ActiveStorageAttachment"
else
"Spree::Taxon::PaperclipAttachment"
end
end

# Set current host for ActiveStorage in a controller
#
# Changed from `#host` to including a module in Rails 6

0 comments on commit a5a7b50

Please sign in to comment.