Commit ce84d183 authored by Micaël Bergeron's avatar Micaël Bergeron

apply fixes from feedback

parent 2b153640
...@@ -30,8 +30,7 @@ class Upload < ActiveRecord::Base ...@@ -30,8 +30,7 @@ class Upload < ActiveRecord::Base
end end
def build_uploader def build_uploader
uploader_class.new(model, mount_point, **uploader_context) uploader_class.new(model, mount_point, **uploader_context).tap do |uploader|
.tap do |uploader|
uploader.upload = self uploader.upload = self
uploader.retrieve_from_store!(identifier) uploader.retrieve_from_store!(identifier)
end end
......
...@@ -110,14 +110,16 @@ class FileUploader < GitlabUploader ...@@ -110,14 +110,16 @@ class FileUploader < GitlabUploader
end end
def upload=(value) def upload=(value)
unless apply_context!(value.uploader_context)
if matches = DYNAMIC_PATH_PATTERN.match(value.path)
@secret = matches[:secret]
@identifier = matches[:identifier]
end
end
super super
return unless value
return if apply_context!(value.uploader_context)
# fallback to the regex based extraction
if matches = DYNAMIC_PATH_PATTERN.match(value.path)
@secret = matches[:secret]
@identifier = matches[:identifier]
end
end end
def secret def secret
......
...@@ -54,4 +54,31 @@ describe FileUploader do ...@@ -54,4 +54,31 @@ describe FileUploader do
expect(uploader.secret).to eq('secret') expect(uploader.secret).to eq('secret')
end end
end end
describe '#upload=' do
let(:secret) { SecureRandom.hex }
let(:upload) { create(:upload, :issuable_upload, secret: secret, filename: 'file.txt') }
it 'handles nil' do
expect(uploader).not_to receive(:apply_context!)
uploader.upload = nil
end
it 'extract the uploader context from it' do
expect(uploader).to receive(:apply_context!).with(a_hash_including(secret: secret, identifier: 'file.txt'))
uploader.upload = upload
end
context 'uploader_context is empty' do
it 'fallbacks to regex based extraction' do
expect(upload).to receive(:uploader_context).and_return({})
uploader.upload = upload
expect(uploader.secret).to eq(secret)
expect(uploader.instance_variable_get(:@identifier)).to eq('file.txt')
end
end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment