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.

Fix saving external images with links containing uppercase letters (#13298)

Łukasz Adamczyk54f78bf8966a
diff --git a/core/app/jobs/spree/images/save_from_url_job.rb b/core/app/jobs/spree/images/save_from_url_job.rb
index f29ea5a018..537eed0b1b 100644
--- a/core/app/jobs/spree/images/save_from_url_job.rb
+++ b/core/app/jobs/spree/images/save_from_url_job.rb
@@ -13,7 +13,7 @@ module Spree
Spree::Image.ensure_metafield_definition_exists!(Spree::Image::EXTERNAL_URL_METAFIELD_KEY)
- external_url = external_url.downcase.strip
+ external_url = external_url.strip
external_id = external_id.to_s.downcase.strip if external_id.present?
image = find_or_initialize_image(viewable, external_url, external_id)
diff --git a/core/app/models/spree/asset.rb b/core/app/models/spree/asset.rb
index d2523ec66c..c8545c7e07 100644
--- a/core/app/models/spree/asset.rb
+++ b/core/app/models/spree/asset.rb
@@ -22,7 +22,7 @@ module Spree
scope :with_session_uploaded_assets_uuid, lambda { |uuid|
where(session_id: uuid)
}
- scope :with_external_url, ->(url) { url.present? ? with_metafield_key_value(EXTERNAL_URL_METAFIELD_KEY, url.downcase.strip) : none }
+ scope :with_external_url, ->(url) { url.present? ? with_metafield_key_value(EXTERNAL_URL_METAFIELD_KEY, url.strip) : none }
def product
@product ||= viewable_type == 'Spree::Variant' ? viewable&.product : nil
@@ -33,7 +33,7 @@ module Spree
end
def external_url=(url)
- set_metafield(EXTERNAL_URL_METAFIELD_KEY, url.downcase.strip)
+ set_metafield(EXTERNAL_URL_METAFIELD_KEY, url.strip)
end
def skip_import?
diff --git a/core/spec/jobs/spree/images/save_from_url_job_spec.rb b/core/spec/jobs/spree/images/save_from_url_job_spec.rb
index 63603b7861..b95bacef54 100644
--- a/core/spec/jobs/spree/images/save_from_url_job_spec.rb
+++ b/core/spec/jobs/spree/images/save_from_url_job_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
RSpec.describe Spree::Images::SaveFromUrlJob, type: :job do
let!(:variant) { create(:variant) }
- let(:external_url) { "https://cdn.example.com/foo/bar_image.png" }
+ let(:external_url) { "https://cdn.example.com/foo/Bar_Image.png" }
let(:position) { nil }
let(:external_id) { nil }
let(:viewable_id) { variant.id }
@@ -33,14 +33,14 @@ RSpec.describe Spree::Images::SaveFromUrlJob, type: :job do
}
before do
- allow(URI).to receive(:parse).with(external_url.downcase.strip).and_return(uri_double)
+ allow(URI).to receive(:parse).with(external_url.strip).and_return(uri_double)
allow(uri_double).to receive(:scheme).and_return('https')
end
it "downloads and attaches image from the URL" do
expect { subject }.to change(Spree::Image, :count).by(1)
expect(image.attachment).to be_attached
- expect(image.external_url).to eq(external_url.downcase.strip)
+ expect(image.external_url).to eq(external_url.strip)
expect(image.position).to eq(1)
end
@@ -57,7 +57,7 @@ RSpec.describe Spree::Images::SaveFromUrlJob, type: :job do
let!(:image) { create(:image, viewable: variant) }
before do
- image.external_url = external_url.downcase.strip
+ image.external_url = external_url.strip
image.save!
end
@@ -71,7 +71,7 @@ RSpec.describe Spree::Images::SaveFromUrlJob, type: :job do
context 'when skip_import? returns true' do
before do
allow(image).to receive(:skip_import?).and_return(true)
- image.external_url = external_url.downcase.strip
+ image.external_url = external_url.strip
image.save!
end
diff --git a/core/spec/models/spree/asset_spec.rb b/core/spec/models/spree/asset_spec.rb
index 106965179e..7bc0140497 100644
--- a/core/spec/models/spree/asset_spec.rb
+++ b/core/spec/models/spree/asset_spec.rb
@@ -71,8 +71,8 @@ describe Spree::Asset, type: :model do
describe '.with_external_url' do
it 'returns assets with the given external URL' do
asset = create(:asset)
- asset.set_metafield('external.url', 'https://example.com')
- expect(described_class.with_external_url('https://example.com')).to include(asset)
+ asset.set_metafield('external.url', 'https://example.com/Example-Image-001.png')
+ expect(described_class.with_external_url('https://example.com/Example-Image-001.png')).to include(asset)
end
it 'returns no assets if the external URL is blank' do
@@ -83,8 +83,8 @@ describe Spree::Asset, type: :model do
describe '#external_url' do
it 'returns the external URL' do
asset = create(:asset)
- asset.set_metafield('external.url', 'https://example.com')
- expect(asset.external_url).to eq('https://example.com')
+ asset.set_metafield('external.url', 'https://example.com/Example-Image-001.png')
+ expect(asset.external_url).to eq('https://example.com/Example-Image-001.png')
end
it 'returns nil if the external URL is blank' do
@@ -96,8 +96,8 @@ describe Spree::Asset, type: :model do
describe '#external_url=' do
it 'sets the external URL' do
asset = create(:asset)
- asset.external_url = 'https://example.com'
- expect(asset.external_url).to eq('https://example.com')
+ asset.external_url = 'https://example.com/Example-Image-001.png'
+ expect(asset.external_url).to eq('https://example.com/Example-Image-001.png')
end
end
end