From 9d636c9e2fae61712164c9293d947547443fed5e Mon Sep 17 00:00:00 2001 From: claudiob Date: Thu, 3 Aug 2017 11:41:23 -0700 Subject: Make Rubocop happier about ActiveStorage Running `rubocop activestorage` before this commit resulted in 20 offenses. This commit only fixes: - Trailing whitespace detected - Space inside } missing - Put one space between the method name and the first argument. The other offenses are left since they are intentional according to @georgeclaghorn (https://github.com/rails/rails/pull/30061#issuecomment-319999190) --- activestorage/activestorage.gemspec | 2 +- activestorage/app/models/active_storage/attachment.rb | 2 +- activestorage/app/models/active_storage/variation.rb | 2 +- activestorage/config/routes.rb | 2 +- activestorage/test/service/s3_service_test.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/activestorage/activestorage.gemspec b/activestorage/activestorage.gemspec index 2d4a1f7569..911e1a0469 100644 --- a/activestorage/activestorage.gemspec +++ b/activestorage/activestorage.gemspec @@ -27,4 +27,4 @@ Gem::Specification.new do |s| s.add_dependency "actionpack", version s.add_dependency "activerecord", version -end \ No newline at end of file +end diff --git a/activestorage/app/models/active_storage/attachment.rb b/activestorage/app/models/active_storage/attachment.rb index 2c8b7a9cf2..8829967ebf 100644 --- a/activestorage/app/models/active_storage/attachment.rb +++ b/activestorage/app/models/active_storage/attachment.rb @@ -1,7 +1,7 @@ require "active_storage/blob" require "active_support/core_ext/module/delegation" -# Attachments associate records with blobs. Usually that's a one record-many blobs relationship, +# Attachments associate records with blobs. Usually that's a one record-many blobs relationship, # but it is possible to associate many different records with the same blob. If you're doing that, # you'll want to declare with `has_one/many_attached :thingy, dependent: false`, so that destroying # any one record won't destroy the blob as well. (Then you'll need to do your own garbage collecting, though). diff --git a/activestorage/app/models/active_storage/variation.rb b/activestorage/app/models/active_storage/variation.rb index 34b854fd9f..e784506b4c 100644 --- a/activestorage/app/models/active_storage/variation.rb +++ b/activestorage/app/models/active_storage/variation.rb @@ -1,6 +1,6 @@ require "active_support/core_ext/object/inclusion" -# A set of transformations that can be applied to a blob to create a variant. This class is exposed via +# A set of transformations that can be applied to a blob to create a variant. This class is exposed via # the `ActiveStorage::Blob#variant` method and should rarely be used directly. # # In case you do need to use this directly, it's instantiated using a hash of transformations where diff --git a/activestorage/config/routes.rb b/activestorage/config/routes.rb index 6aa99c42ac..fddbb93255 100644 --- a/activestorage/config/routes.rb +++ b/activestorage/config/routes.rb @@ -9,7 +9,7 @@ Rails.application.routes.draw do resolve("ActiveStorage::Attachment") { |attachment| route_for(:rails_blob, attachment.blob) } - get "/rails/active_storage/variants/:signed_blob_id/:variation_key/*filename" => "active_storage/variants#show", as: :rails_blob_variation + get "/rails/active_storage/variants/:signed_blob_id/:variation_key/*filename" => "active_storage/variants#show", as: :rails_blob_variation direct :rails_variant do |variant| signed_blob_id = variant.blob.signed_id diff --git a/activestorage/test/service/s3_service_test.rb b/activestorage/test/service/s3_service_test.rb index 23b94f25ed..ec80cbce61 100644 --- a/activestorage/test/service/s3_service_test.rb +++ b/activestorage/test/service/s3_service_test.rb @@ -35,7 +35,7 @@ if SERVICE_CONFIGURATIONS[:s3] && SERVICE_CONFIGURATIONS[:s3][:access_key_id].pr end test "uploading with server-side encryption" do - config = SERVICE_CONFIGURATIONS.deep_merge(s3: { upload: { server_side_encryption: "AES256" }}) + config = SERVICE_CONFIGURATIONS.deep_merge(s3: { upload: { server_side_encryption: "AES256" } }) service = ActiveStorage::Service.configure(:s3, config) begin -- cgit v1.2.3