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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Move ActiveStorage code into `Spree::Asset` (#12115)
Damian Legawiec0bf0d79f8e26
diff --git a/core/app/models/spree/asset.rb b/core/app/models/spree/asset.rbindex 97702f8d93..29f5177974 100644--- a/core/app/models/spree/asset.rb+++ b/core/app/models/spree/asset.rb@@ -8,5 +8,13 @@ module Spreebelongs_to :viewable, polymorphic: true, touch: trueacts_as_list scope: [:viewable_id, :viewable_type]++ if Spree.public_storage_service_name+ has_one_attached :attachment, service: Spree.public_storage_service_name+ else+ has_one_attached :attachment+ end++ default_scope { includes(attachment_attachment: :blob) }endenddiff --git a/core/app/models/spree/cms_section_image.rb b/core/app/models/spree/cms_section_image.rbindex 9668b10160..c4e056e786 100644--- a/core/app/models/spree/cms_section_image.rb+++ b/core/app/models/spree/cms_section_image.rb@@ -1,11 +1,5 @@module Spreeclass CmsSectionImage < Asset- if Spree.public_storage_service_name- has_one_attached :attachment, service: Spree.public_storage_service_name- else- has_one_attached :attachment- end-IMAGE_COUNT = ['one', 'two', 'three']IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freezeIMAGE_SIZE = ['sm', 'md', 'lg', 'xl']diff --git a/core/app/models/spree/icon.rb b/core/app/models/spree/icon.rbindex 1f73622141..abc28a97e8 100644--- a/core/app/models/spree/icon.rb+++ b/core/app/models/spree/icon.rb@@ -1,11 +1,5 @@module Spreeclass Icon < Spree::Asset- if Spree.public_storage_service_name- has_one_attached :attachment, service: Spree.public_storage_service_name- else- has_one_attached :attachment- end-ICON_TYPES = %i[png jpg jpeg gif svg]validates :attachment, attached: true, content_type: ICON_TYPESdiff --git a/core/app/models/spree/image/configuration/active_storage.rb b/core/app/models/spree/image/configuration/active_storage.rbindex 34846c88c1..ccb4ea7da7 100644--- a/core/app/models/spree/image/configuration/active_storage.rb+++ b/core/app/models/spree/image/configuration/active_storage.rb@@ -5,16 +5,8 @@ module Spreeextend ActiveSupport::Concernincluded do- if Spree.public_storage_service_name- has_one_attached :attachment, service: Spree.public_storage_service_name- else- has_one_attached :attachment- end-validates :attachment, attached: true, content_type: /\Aimage\/.*\z/- default_scope { includes(attachment_attachment: :blob) }-def self.styles@styles ||= {mini: '48x48>',diff --git a/core/app/models/spree/store_favicon_image.rb b/core/app/models/spree/store_favicon_image.rbindex a036dfa22d..71917ea037 100644--- a/core/app/models/spree/store_favicon_image.rb+++ b/core/app/models/spree/store_favicon_image.rb@@ -1,11 +1,5 @@module Spreeclass StoreFaviconImage < Asset- if Spree.public_storage_service_name- has_one_attached :attachment, service: Spree.public_storage_service_name- else- has_one_attached :attachment- end-VALID_CONTENT_TYPES = ['image/png', 'image/x-icon', 'image/vnd.microsoft.icon'].freezevalidates :attachment,diff --git a/core/app/models/spree/store_logo.rb b/core/app/models/spree/store_logo.rbindex 9e21104289..9d796d18a8 100644--- a/core/app/models/spree/store_logo.rb+++ b/core/app/models/spree/store_logo.rb@@ -1,9 +1,4 @@module Spreeclass StoreLogo < Asset- if Spree.public_storage_service_name- has_one_attached :attachment, service: Spree.public_storage_service_name- else- has_one_attached :attachment- endendenddiff --git a/core/app/models/spree/store_mailer_logo.rb b/core/app/models/spree/store_mailer_logo.rbindex 0645ebbdf1..ac95f4665c 100644--- a/core/app/models/spree/store_mailer_logo.rb+++ b/core/app/models/spree/store_mailer_logo.rb@@ -1,11 +1,5 @@module Spreeclass StoreMailerLogo < Asset- if Spree.public_storage_service_name- has_one_attached :attachment, service: Spree.public_storage_service_name- else- has_one_attached :attachment- end-VALID_CONTENT_TYPES = ['image/png', 'image/jpg', 'image/jpeg'].freezevalidates :attachment, content_type: VALID_CONTENT_TYPESdiff --git a/core/app/models/spree/taxon_image/configuration/active_storage.rb b/core/app/models/spree/taxon_image/configuration/active_storage.rbindex bc4ff160f0..868014c7c7 100644--- a/core/app/models/spree/taxon_image/configuration/active_storage.rb+++ b/core/app/models/spree/taxon_image/configuration/active_storage.rb@@ -5,12 +5,6 @@ module Spreeextend ActiveSupport::Concernincluded do- if Spree.public_storage_service_name- has_one_attached :attachment, service: Spree.public_storage_service_name- else- has_one_attached :attachment- end-validates :attachment, content_type: /\Aimage\/.*\z/default_scope { includes(attachment_attachment: :blob) }