diff --git a/Gemfile b/Gemfile index ac9af87ca924621066b9e08f480e28e757e48fd0..03fb3271be7571801aae555719af8e1ea78e0a35 100644 --- a/Gemfile +++ b/Gemfile @@ -97,8 +97,8 @@ group :storage do gem "google-cloud-storage", "~> 1.3", require: false # Contains fix to be able to test using StringIO - gem 'azure-core', git: "https://github.com/dixpac/azure-ruby-asm-core.git" - gem 'azure-storage', require: false + gem "azure-core", git: "https://github.com/dixpac/azure-ruby-asm-core.git" + gem "azure-storage", require: false gem "mini_magick" end diff --git a/Gemfile.lock b/Gemfile.lock index 76a5af6fbf148da0282aca89327d50d41434472f..541c31bfaa571952f8d67e28a07615657cc86f49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -512,7 +512,6 @@ DEPENDENCIES libxml-ruby listen (>= 3.0.5, < 3.2) mini_magick - minitest (< 5.3.4) minitest-bisect mocha (~> 0.14) mysql2 (>= 0.4.4) diff --git a/activestorage/test/dummy/Rakefile b/activestorage/test/dummy/Rakefile index ed646b6f554350f4f7242d58ff5e45ca4e4aaa57..d1baef0699f6cf6cc865b2efb3851b1806f2cd10 100644 --- a/activestorage/test/dummy/Rakefile +++ b/activestorage/test/dummy/Rakefile @@ -1,3 +1,3 @@ -require_relative 'config/application' +require_relative "config/application" Rails.application.load_tasks diff --git a/activestorage/test/dummy/bin/bundle b/activestorage/test/dummy/bin/bundle index 66e9889e8b4aeea1af13e2396fb70594232a2ae3..fe1874509ab3313d88e23a298341a6674c8979d5 100755 --- a/activestorage/test/dummy/bin/bundle +++ b/activestorage/test/dummy/bin/bundle @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) -load Gem.bin_path('bundler', 'bundle') +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__) +load Gem.bin_path("bundler", "bundle") diff --git a/activestorage/test/dummy/bin/rails b/activestorage/test/dummy/bin/rails index 073966023774750c90fe9c89910c769a92da604b..efc0377492f7e0ec9f6cedf7b5e1f6119bbbd24e 100755 --- a/activestorage/test/dummy/bin/rails +++ b/activestorage/test/dummy/bin/rails @@ -1,4 +1,4 @@ #!/usr/bin/env ruby -APP_PATH = File.expand_path('../config/application', __dir__) -require_relative '../config/boot' -require 'rails/commands' +APP_PATH = File.expand_path("../config/application", __dir__) +require_relative "../config/boot" +require "rails/commands" diff --git a/activestorage/test/dummy/bin/rake b/activestorage/test/dummy/bin/rake index 17240489f64832c9ce080088e27780d3dc3ee29a..4fbf10b960ef780b748861e6a616a4d88b00b50a 100755 --- a/activestorage/test/dummy/bin/rake +++ b/activestorage/test/dummy/bin/rake @@ -1,4 +1,4 @@ #!/usr/bin/env ruby -require_relative '../config/boot' -require 'rake' +require_relative "../config/boot" +require "rake" Rake.application.run diff --git a/activestorage/test/dummy/bin/yarn b/activestorage/test/dummy/bin/yarn index c2bacef836f2140d11d42535643d4d204b9d519c..b8fe4eeaf344537595e720ec84708270522b94ad 100755 --- a/activestorage/test/dummy/bin/yarn +++ b/activestorage/test/dummy/bin/yarn @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -VENDOR_PATH = File.expand_path('..', __dir__) +VENDOR_PATH = File.expand_path("..", __dir__) Dir.chdir(VENDOR_PATH) do begin exec "yarnpkg #{ARGV.join(" ")}" diff --git a/activestorage/test/dummy/config.ru b/activestorage/test/dummy/config.ru index f7ba0b527b16a6f539991825ecd72c2e9b6e3af0..441e6ff0c3cd574a7b0bd107f66a3f128bf413c7 100644 --- a/activestorage/test/dummy/config.ru +++ b/activestorage/test/dummy/config.ru @@ -1,5 +1,5 @@ # This file is used by Rack-based servers to start the application. -require_relative 'config/environment' +require_relative "config/environment" run Rails.application diff --git a/activestorage/test/dummy/config/application.rb b/activestorage/test/dummy/config/application.rb index 7c8c2575eeb45743b9189704b290f448e80e9c45..5c594013583415c4ecc092278baba7c8e409be5c 100644 --- a/activestorage/test/dummy/config/application.rb +++ b/activestorage/test/dummy/config/application.rb @@ -1,4 +1,4 @@ -require_relative 'boot' +require_relative "boot" require "rails" require "active_model/railtie" diff --git a/activestorage/test/dummy/config/boot.rb b/activestorage/test/dummy/config/boot.rb index c9aef85d4041faa346d7b6375cedaa1163ae2b43..116591a4ed57534216b632f42c7bf66f2f7badaa 100644 --- a/activestorage/test/dummy/config/boot.rb +++ b/activestorage/test/dummy/config/boot.rb @@ -1,5 +1,5 @@ # Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__) +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__) -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) -$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__) +require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"]) +$LOAD_PATH.unshift File.expand_path("../../../lib", __dir__) diff --git a/activestorage/test/dummy/config/environment.rb b/activestorage/test/dummy/config/environment.rb index 426333bb46978d897be4cc6fac77b9fcaacf59d0..cac5315775258a68f5e18885605d3fb1b758319e 100644 --- a/activestorage/test/dummy/config/environment.rb +++ b/activestorage/test/dummy/config/environment.rb @@ -1,5 +1,5 @@ # Load the Rails application. -require_relative 'application' +require_relative "application" # Initialize the Rails application. Rails.application.initialize! diff --git a/activestorage/test/dummy/config/environments/development.rb b/activestorage/test/dummy/config/environments/development.rb index 503375dede1b9f986c09a53c5732988b3dfca38c..5f3d463210e16a39122674c59481b2f8c88f9fb2 100644 --- a/activestorage/test/dummy/config/environments/development.rb +++ b/activestorage/test/dummy/config/environments/development.rb @@ -13,12 +13,12 @@ config.consider_all_requests_local = true # Enable/disable caching. By default caching is disabled. - if Rails.root.join('tmp/caching-dev.txt').exist? + if Rails.root.join("tmp/caching-dev.txt").exist? config.action_controller.perform_caching = true config.cache_store = :memory_store config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}" + "Cache-Control" => "public, max-age=#{2.days.seconds.to_i}" } else config.action_controller.perform_caching = false diff --git a/activestorage/test/dummy/config/environments/production.rb b/activestorage/test/dummy/config/environments/production.rb index 35a30e084ae28e74890dcc8a08ee95e46fbc96c4..343da23f0b2027b039dec57803ae5bcf3f4d7941 100644 --- a/activestorage/test/dummy/config/environments/production.rb +++ b/activestorage/test/dummy/config/environments/production.rb @@ -21,7 +21,7 @@ # Disable serving static files from the `/public` folder by default since # Apache or NGINX already handles this. - config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present? # Compress JavaScripts and CSS. config.assets.js_compressor = :uglifier diff --git a/activestorage/test/dummy/config/environments/test.rb b/activestorage/test/dummy/config/environments/test.rb index 4380dfc0cdfae43f4593ef3d0e91ad911e9b47b7..4f2c0486009309e5d176b21a033cb373255a2276 100644 --- a/activestorage/test/dummy/config/environments/test.rb +++ b/activestorage/test/dummy/config/environments/test.rb @@ -15,7 +15,7 @@ # Configure public file server for tests with Cache-Control for performance. config.public_file_server.enabled = true config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" + "Cache-Control" => "public, max-age=#{1.hour.seconds.to_i}" } # Show full error reports and disable caching. diff --git a/activestorage/test/dummy/config/initializers/assets.rb b/activestorage/test/dummy/config/initializers/assets.rb index 4b828e80cb778244843194acf5f8a74238ec2c13..c1f948d0184dfaad4f51fb3bd04802046aad1afc 100644 --- a/activestorage/test/dummy/config/initializers/assets.rb +++ b/activestorage/test/dummy/config/initializers/assets.rb @@ -1,12 +1,12 @@ # Be sure to restart your server when you modify this file. # Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = '1.0' +Rails.application.config.assets.version = "1.0" # Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path # Add Yarn node_modules folder to the asset load path. -Rails.application.config.assets.paths << Rails.root.join('node_modules') +Rails.application.config.assets.paths << Rails.root.join("node_modules") # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in the app/assets diff --git a/activestorage/test/service/gcs_service_test.rb b/activestorage/test/service/gcs_service_test.rb index aca779c16755cb3e457518f69e620b01be3e2678..03048731bc96ad42623cd7a97456e3e95090c755 100644 --- a/activestorage/test/service/gcs_service_test.rb +++ b/activestorage/test/service/gcs_service_test.rb @@ -17,8 +17,8 @@ class ActiveStorage::Service::GCSServiceTest < ActiveSupport::TestCase uri = URI.parse url request = Net::HTTP::Put.new uri.request_uri request.body = data - request.add_field 'Content-Type', 'text/plain' - request.add_field 'Content-MD5', checksum + request.add_field "Content-Type", "text/plain" + request.add_field "Content-MD5", checksum Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http| http.request request end diff --git a/activestorage/test/service/s3_service_test.rb b/activestorage/test/service/s3_service_test.rb index ae17eb32aa721aa6641ace3aff90cf8e15e42d29..23b94f25ed7f24d0f6240a82b0d2fb1d90ca91f7 100644 --- a/activestorage/test/service/s3_service_test.rb +++ b/activestorage/test/service/s3_service_test.rb @@ -17,8 +17,8 @@ class ActiveStorage::Service::S3ServiceTest < ActiveSupport::TestCase uri = URI.parse url request = Net::HTTP::Put.new uri.request_uri request.body = data - request.add_field 'Content-Type', 'text/plain' - request.add_field 'Content-MD5', checksum + request.add_field "Content-Type", "text/plain" + request.add_field "Content-MD5", checksum Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http| http.request request end