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.

Automatically fallback to the default rails active storage service name (#12336)

Damian Legawiec5f33d64b2068
diff --git a/api/app/helpers/spree/api/v2/store_media_serializer_images_concern.rb b/api/app/helpers/spree/api/v2/store_media_serializer_images_concern.rb
index 3c36c3f346..768a893b08 100644
--- a/api/app/helpers/spree/api/v2/store_media_serializer_images_concern.rb
+++ b/api/app/helpers/spree/api/v2/store_media_serializer_images_concern.rb
@@ -10,11 +10,7 @@ module Spree
return unless attachment.attached?
url_helpers = Rails.application.routes.url_helpers
- if Spree.public_storage_service_name
- url_helpers.cdn_image_url(attachment)
- else
- url_helpers.rails_blob_path(attachment)
- end
+ url_helpers.cdn_image_url(attachment)
end
attribute :logo do |store|
diff --git a/api/spec/serializers/spree/api/v2/platform/store_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/store_serializer_spec.rb
index 272da0d2bd..178a378265 100644
--- a/api/spec/serializers/spree/api/v2/platform/store_serializer_spec.rb
+++ b/api/spec/serializers/spree/api/v2/platform/store_serializer_spec.rb
@@ -45,7 +45,7 @@ describe Spree::Api::V2::Platform::StoreSerializer do
supported_locales: store.supported_locales,
deleted_at: store.deleted_at,
settings: store.settings,
- logo: url_helpers.rails_blob_path(logo.attachment),
+ logo: url_helpers.cdn_image_url(logo.attachment),
mailer_logo: nil,
favicon_path: nil,
storefront_custom_code_body_end: nil,
diff --git a/core/app/models/spree/asset.rb b/core/app/models/spree/asset.rb
index 15742b3bc6..eda7247f58 100644
--- a/core/app/models/spree/asset.rb
+++ b/core/app/models/spree/asset.rb
@@ -11,11 +11,7 @@ module Spree
delegate :key, :attached?, :variant, :variable?, :blob, :filename, to: :attachment
- if Spree.public_storage_service_name
- has_one_attached :attachment, service: Spree.public_storage_service_name
- else
- has_one_attached :attachment
- end
+ has_one_attached :attachment, service: Spree.public_storage_service_name
default_scope { includes(attachment_attachment: :blob) }
diff --git a/core/app/models/spree/digital.rb b/core/app/models/spree/digital.rb
index 2deac3208b..19ff25dc5f 100644
--- a/core/app/models/spree/digital.rb
+++ b/core/app/models/spree/digital.rb
@@ -7,11 +7,7 @@ module Spree
include Spree::Webhooks::HasWebhooks
end
- if Spree.private_storage_service_name
- has_one_attached :attachment, service: Spree.private_storage_service_name
- else
- has_one_attached :attachment
- end
+ has_one_attached :attachment, service: Spree.private_storage_service_name
validates :attachment, attached: true
validates :variant, presence: true
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index b35e25325e..eaf4e36d86 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -72,9 +72,9 @@ module Spree
if @@private_storage_service_name
if @@private_storage_service_name.is_a?(String) || @@private_storage_service_name.is_a?(Symbol)
@@private_storage_service_name.to_sym
- else
- raise 'Spree.private_storage_service_name MUST be a String or Symbol object.'
end
+ else
+ Rails.application.config.active_storage.service
end
end
@@ -82,9 +82,9 @@ module Spree
if @@public_storage_service_name
if @@public_storage_service_name.is_a?(String) || @@public_storage_service_name.is_a?(Symbol)
@@public_storage_service_name.to_sym
- else
- raise 'Spree.public_storage_service_name MUST be a String or Symbol object.'
end
+ else
+ Rails.application.config.active_storage.service
end
end
diff --git a/core/spec/lib/spree/core_spec.rb b/core/spec/lib/spree/core_spec.rb
index 70e2aaca90..8b426006e3 100644
--- a/core/spec/lib/spree/core_spec.rb
+++ b/core/spec/lib/spree/core_spec.rb
@@ -106,19 +106,11 @@ describe Spree do
end
end
- context 'when private_storage_service_name is a Integer instance' do
- it 'raises an error' do
- described_class.private_storage_service_name = 33
-
- expect { described_class.private_storage_service_name }.to raise_error(RuntimeError)
- end
- end
-
context 'when private_storage_service_name is set to nil' do
- it 'returns the private_storage_service_name as nil value' do
+ it 'returns the private_storage_service_name as the default service' do
described_class.private_storage_service_name = nil
- expect(described_class.private_storage_service_name).to be nil
+ expect(described_class.private_storage_service_name).to eq(Rails.application.config.active_storage.service)
end
end
end