Merge pull request #20 from blocknotes/fix-rubocop-issues

Fix some RuboCop issues

Author: Mattia Roccoberton

.rubocop.yml

@@ -1,5 +1,4 @@
 inherit_from:
-  - .rubocop_todo.yml
   - https://relaxed.ruby.style/rubocop.yml
 
 require:
@@ -16,9 +15,17 @@ AllCops:
     - vendor/**/*
   TargetRubyVersion: 2.6
 
+Lint/MissingSuper:
+  Exclude:
+    - 'lib/active_storage/service/db_service.rb'
+
 Lint/UnusedMethodArgument:
   AllowUnusedKeywordArguments: true
 
+RSpec/DescribeClass:
+  Exclude:
+    - spec/tasks/active_storage_db_tasks_spec.rb
+
 RSpec/ExampleLength:
   # Default is 5
   Max: 10
@@ -34,3 +41,7 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NestedGroups:
   # Default is 3
   Max: 5
+
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'lib/active_storage/service/db_service.rb'

.rubocop_todo.yml

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module ActiveStorage
-  class Service::DBService < Service # rubocop:disable Style/ClassAndModuleChildren
-    def initialize(**_config)
+  class Service::DBService < Service
+    def initialize(**_options)
       @chunk_size = ENV.fetch('ASDB_CHUNK_SIZE') { 1.megabytes }
     end
 

lib/active_storage/service/db_service.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :active_storage_db_file, class: 'ActiveStorageDB::File' do
-    ref { ('a'..'z').to_a.shuffle[0, 32].join } # rubocop:disable Style/Sample
+    ref { ('a'..'z').to_a.sample(32).join }
 
     data do
       (+"\211PNG\r\n\032\n\000\000\000\rIHDR\000\000\000\020\000\000\000\020\001\003\000\000\000%=m\"\000\000\000\006PLTE\000\000\000\377\377\377\245\331\237\335\000\000\0003IDATx\234c\370\377\237\341\377_\206\377\237\031\016\2603\334?\314p\1772\303\315\315\f7\215\031\356\024\203\320\275\317\f\367\201R\314\f\017\300\350\377\177\000Q\206\027(\316]\233P\000\000\000\000IEND\256B`\202").force_encoding(Encoding::BINARY)

spec/factories/active_storage_db_file_factory.rb

@@ -11,7 +11,7 @@ def create_blob(data: 'Hello world!', filename: 'hello.txt', content_type: 'text
     )
   end
 
-  def create_blob_before_direct_upload(filename: 'hello.txt', byte_size:, checksum:, content_type: 'text/plain')
+  def create_blob_before_direct_upload(byte_size:, checksum:, filename: 'hello.txt', content_type: 'text/plain')
     ActiveStorage::Blob.create_before_direct_upload!(
       filename: filename,
       byte_size: byte_size,

spec/requests/file_controller_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe 'ActiveStorageDB tasks' do # rubocop:disable RSpec/DescribeClass
+RSpec.describe 'ActiveStorageDB tasks' do
   include_context 'with rake tasks'
 
   describe 'asdb:list' do
@@ -22,9 +22,7 @@
   end
 
   describe 'asdb:get' do
-    subject(:task) { execute_task('asdb:get', options) }
-
-    let(:options) {}
+    subject(:task) { execute_task('asdb:get') }
 
     it 'exits showing the required arguments' do
       with_captured_stderr do
@@ -33,7 +31,7 @@
     end
 
     context 'with only the source specified' do
-      let(:options) { { src: 'some_file' } }
+      subject(:task) { execute_task('asdb:get', src: 'some_file') }
 
       it 'exits showing the required arguments' do
         with_captured_stderr do
@@ -43,7 +41,7 @@
     end
 
     context 'with an invalid destination' do
-      let(:options) { { src: 'some_file', dst: 'some_path' } }
+      subject(:task) { execute_task('asdb:get', src: 'some_file', dst: 'some_path') }
 
       before do
         allow(File).to receive(:writable?).and_return(false)
@@ -57,7 +55,7 @@
     end
 
     context 'with a missing source' do
-      let(:options) { { src: 'some_file', dst: 'some_path' } }
+      subject(:task) { execute_task('asdb:get', src: 'some_file', dst: 'some_path') }
 
       before do
         allow(File).to receive(:writable?).and_return(true)
@@ -71,9 +69,10 @@
     end
 
     context 'with valid arguments' do
+      subject(:task) { execute_task('asdb:get', src: blob.filename.to_s, dst: 'some_path') }
+
       let(:blob) { build_stubbed(:active_storage_blob) }
       let(:blobs) { instance_double(ActiveRecord::Relation) }
-      let(:options) { { src: blob.filename.to_s, dst: 'some_path' } }
 
       before do
         allow(File).to receive_messages(binwrite: 1000, writable?: true)