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
Add support for CDN for serving images
Damian Legawieccb771eff4f84
diff --git a/core/app/models/concerns/spree/image_methods.rb b/core/app/models/concerns/spree/image_methods.rbindex 9d02132c8e..96acd1e70a 100644--- a/core/app/models/concerns/spree/image_methods.rb+++ b/core/app/models/concerns/spree/image_methods.rb@@ -13,14 +13,11 @@ module Spree# FIXME: bring back support for background color- polymorphic_path(- attachment.variant(resize_and_pad: [width, height, { gravity: gravity }], saver: { quality: quality }),- only_path: true- )+ cdn_image_url(attachment.variant(resize_and_pad: [width, height, { gravity: gravity }], saver: { quality: quality }))enddef original_url- polymorphic_path(attachment, only_path: true)+ cdn_image_url(attachment)endendenddiff --git a/core/app/models/spree/taxon_image.rb b/core/app/models/spree/taxon_image.rbindex 60ab005b45..5f2d3741ee 100644--- a/core/app/models/spree/taxon_image.rb+++ b/core/app/models/spree/taxon_image.rb@@ -9,7 +9,8 @@ module Spreewidth, height = size[/(\d+)x(\d+)/].split('x').map(&:to_i){- url: polymorphic_path(attachment.variant(resize_to_limit: [width, height]), only_path: true),+ url: generate_url(size: size),+ size: size,width: width,height: height}diff --git a/core/config/routes.rb b/core/config/routes.rbindex 0b8e67a53e..49885a0087 100644--- a/core/config/routes.rb+++ b/core/config/routes.rb@@ -1 +1,28 @@+# direct method cannot be used inside engine routes+# see: https://github.com/rails/rails/issues/34872+Rails.application.routes.draw do+ direct :cdn_image do |model, options|+ if model.respond_to?(:signed_id)+ route_for(+ :rails_service_blob_proxy,+ model.signed_id,+ model.filename,+ options.merge(host: Spree.cdn_host || Rails.application.config.default_url_options[:host])+ )+ else+ signed_blob_id = model.blob.signed_id+ variation_key = model.variation.key+ filename = model.blob.filename++ route_for(+ :rails_blob_representation_proxy,+ signed_blob_id,+ variation_key,+ filename,+ options.merge(host: Spree.cdn_host || Rails.application.config.default_url_options[:host])+ )+ end+ end+end+Spree::Core::Engine.draw_routesdiff --git a/core/lib/generators/spree/dummy/templates/rails/test.rb b/core/lib/generators/spree/dummy/templates/rails/test.rbindex 486b3a594b..077c57e615 100644--- a/core/lib/generators/spree/dummy/templates/rails/test.rb+++ b/core/lib/generators/spree/dummy/templates/rails/test.rb@@ -37,4 +37,6 @@ Dummy::Application.configure doconfig.active_job.queue_adapter = :testconfig.cache_store = :redis_cache_store++ config.default_url_options = { host: 'localhost', port: 3000 }enddiff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rbindex e35cbef8ce..266ade2601 100644--- a/core/lib/spree/core.rb+++ b/core/lib/spree/core.rb@@ -25,7 +25,7 @@ require 'activerecord-typedstore'StateMachines::Machine.ignore_method_conflicts = truemodule Spree- mattr_accessor :user_class, :admin_user_class, :private_storage_service_name+ mattr_accessor :user_class, :admin_user_class, :private_storage_service_name, :cdn_hostdef self.user_class(constantize: true)if @@user_class.is_a?(Class)