Skip to content

Commit

Permalink
Fix new rubocop warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Sep 16, 2020
1 parent 4fa4fa5 commit 70c4a75
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions app/controllers/api_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ def set_request_formats
#
# As a workaround, and for back compatibility, default to XML format.
mimetypes = begin
Mime::Type.parse(accept_header)
rescue Mime::Type::InvalidMimeType
Array(Mime[:xml])
end
Mime::Type.parse(accept_header)
rescue Mime::Type::InvalidMimeType
Array(Mime[:xml])
end

# Allow XML and JSON formats, and treat an all formats wildcard
# as XML for backwards compatibility - all other formats are discarded
Expand Down
34 changes: 17 additions & 17 deletions config/initializers/active_storage.rb
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
Rails.application.config.active_storage.queues.analysis = :storage
Rails.application.config.active_storage.queues.purge = :storage

Rails.configuration.after_initialize do
require "active_storage/service/s3_service"
require_dependency "active_storage/variant"
module OpenStreetMap
module ActiveStorage
module Variant
private

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
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
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"

ActiveStorage::Variant.prepend(OpenStreetMap::ActiveStorage::Variant)
ActiveStorage::Service::S3Service.prepend(OpenStreetMap::ActiveStorage::S3Service)
Expand Down

0 comments on commit 70c4a75

Please sign in to comment.