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.

Move ActiveStorage code into `Spree::Asset` (#12115)

Damian Legawiec0bf0d79f8e26
diff --git a/core/app/models/spree/asset.rb b/core/app/models/spree/asset.rb
index 97702f8d93..29f5177974 100644
--- a/core/app/models/spree/asset.rb
+++ b/core/app/models/spree/asset.rb
@@ -8,5 +8,13 @@ module Spree
belongs_to :viewable, polymorphic: true, touch: true
acts_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) }
end
end
diff --git a/core/app/models/spree/cms_section_image.rb b/core/app/models/spree/cms_section_image.rb
index 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 Spree
class 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'].freeze
IMAGE_SIZE = ['sm', 'md', 'lg', 'xl']
diff --git a/core/app/models/spree/icon.rb b/core/app/models/spree/icon.rb
index 1f73622141..abc28a97e8 100644
--- a/core/app/models/spree/icon.rb
+++ b/core/app/models/spree/icon.rb
@@ -1,11 +1,5 @@
module Spree
class 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_TYPES
diff --git a/core/app/models/spree/image/configuration/active_storage.rb b/core/app/models/spree/image/configuration/active_storage.rb
index 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 Spree
extend ActiveSupport::Concern
included 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.rb
index 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 Spree
class 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'].freeze
validates :attachment,
diff --git a/core/app/models/spree/store_logo.rb b/core/app/models/spree/store_logo.rb
index 9e21104289..9d796d18a8 100644
--- a/core/app/models/spree/store_logo.rb
+++ b/core/app/models/spree/store_logo.rb
@@ -1,9 +1,4 @@
module Spree
class StoreLogo < Asset
- if Spree.public_storage_service_name
- has_one_attached :attachment, service: Spree.public_storage_service_name
- else
- has_one_attached :attachment
- end
end
end
diff --git a/core/app/models/spree/store_mailer_logo.rb b/core/app/models/spree/store_mailer_logo.rb
index 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 Spree
class 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'].freeze
validates :attachment, content_type: VALID_CONTENT_TYPES
diff --git a/core/app/models/spree/taxon_image/configuration/active_storage.rb b/core/app/models/spree/taxon_image/configuration/active_storage.rb
index 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 Spree
extend ActiveSupport::Concern
included 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) }