cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix new rubocop warnings

Browse source
This commit is contained in:
Tom Hughes 2020-09-16 08:28:25 +01:00
parent 4fa4fa5979
commit 70c4a750d7
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

40
config/initializers/active_storage.rb
View file

@ -1,30 +1,30 @@
Rails.application.config.active_storage.queues.analysis = :storage
Rails.application.config.active_storage.queues.purge = :storage
module OpenStreetMap
module ActiveStorage
module Variant
private
def upload(image)
File.open(image.path, "r") { |file| service.upload(key, file, :content_type => content_type) }
end
end
module S3Service
def upload(key, io, content_type:, **options)
@upload_options[:content_type] = content_type
super(key, io, **options)
@upload_options.delete(:content_type)
end
end
end
end
Rails.configuration.after_initialize do
require "active_storage/service/s3_service"
require_dependency "active_storage/variant"
module OpenStreetMap
module ActiveStorage
module Variant
private
def upload(image)
File.open(image.path, "r") { |file| service.upload(key, file, :content_type => content_type) }
end
end
module S3Service
def upload(key, io, content_type:, **options)
@upload_options[:content_type] = content_type
super(key, io, **options)
@upload_options.delete(:content_type)
end
end
end
end
ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant)
ActiveStorage::Service::S3Service.prepend(OpenStreetMap::ActiveStorage::S3Service)