From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Sep 2020 07:28:25 +0000 (+0100)
Subject: Fix new rubocop warnings
X-Git-Tag: live~1991
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/70c4a750d75aaca611a0efe0cc8d5e1732fc6b36

Fix new rubocop warnings
---

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 478810dfc..c905b24ce 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -22,10 +22,10 @@ class ApiController < ApplicationController
         #
         # 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
diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb
index 361e2edee..042d78695 100644
--- a/config/initializers/active_storage.rb
+++ b/config/initializers/active_storage.rb
@@ -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)