Merge pull request #270 from ifad/chore/consistent-comma

Enable consistent comma style

.rubocop.yml

@@ -29,3 +29,9 @@ Metrics/MethodLength:
 Metrics/ModuleLength:
   Exclude:
     - 'spec/**/*'
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma

lib/heathen/processor_methods/convert_image.rb

@@ -9,10 +9,12 @@ def convert_image(to: 'tiff', params: '')
 
       target_file = temp_file_name '', ".#{to.to_s}"
       executioner.execute(
-        *[Colore::C_.convert_path,
-        job.content_file,
-        params.split(/ +/),
-        target_file].flatten
+        *[
+          Colore::C_.convert_path,
+          job.content_file,
+          params.split(/ +/),
+          target_file,
+        ].flatten
       )
       raise ConversionFailed.new if executioner.last_exit_status != 0
 

lib/heathen/processor_methods/libreoffice.rb

@@ -35,8 +35,8 @@ def libreoffice(format:)
           'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'odp',
         },
         'txt' => {
-          '.*' => 'txt'
-        }
+          '.*' => 'txt',
+        },
       }
 
       raise InvalidParameterInStep.new('format', format) unless suffixes[format.to_s]

lib/sidekiq_workers.rb

@@ -95,7 +95,7 @@ class LegacyPurgeWorker
 
       ::Sidekiq::Cron::Job.load_from_hash('legacy_purge_worker' => {
         'cron'  => '0 6 * * *',
-        'class' => self.name
+        'class' => self.name,
       })
 
       # Looks for old legacy docs and deletes them

spec/helpers/mime_types.rb

@@ -4,22 +4,22 @@ def ms_excel_mime_types
   [
     'application/octet-stream; charset=binary', # LibreOffice 5.1
     'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; charset=binary',
-    'application/zip; charset=binary' # LibreOffice 6.0.7
+    'application/zip; charset=binary', # LibreOffice 6.0.7
   ]
 end
 
 def ms_powerpoint_mime_types
   [
     'application/octet-stream; charset=binary', # LibreOffice 6.0.7
-    'application/vnd.openxmlformats-officedocument.presentationml.presentation; charset=binary'
+    'application/vnd.openxmlformats-officedocument.presentationml.presentation; charset=binary',
   ]
 end
 
 def ms_word_mime_types
   [
     'application/octet-stream; charset=binary', # LibreOffice 6.0.7
     'application/vnd.openxmlformats-officedocument.wordprocessingml.document; charset=binary',
-    'application/zip; charset=binary'
+    'application/zip; charset=binary',
   ]
 end
 
@@ -38,6 +38,6 @@ def oo_odt_mime_types
 def tesseract_hocr_mime_types
   [
     'application/xml; charset=us-ascii', # tesseract v3
-    'text/xml; charset=us-ascii' # tesseract v4
+    'text/xml; charset=us-ascii', # tesseract v4
   ]
 end

spec/lib/app_spec.rb

@@ -39,7 +39,7 @@ def show_backtrace(response)
           file: Rack::Test::UploadedFile.new(__FILE__, 'application/ruby'),
           actions: ['ocr', 'pdf'],
           author: author,
-          backtrace: true
+          backtrace: true,
       }
       show_backtrace last_response
       expect(last_response.status).to eq 201
@@ -54,7 +54,7 @@ def show_backtrace(response)
           title: 'A title',
           file: Rack::Test::UploadedFile.new(__FILE__, 'application/ruby'),
           actions: ['ocr', 'pdf'],
-          backtrace: true
+          backtrace: true,
       }
       show_backtrace last_response
       expect(last_response.status).to eq 409
@@ -69,7 +69,7 @@ def show_backtrace(response)
       post "/document/#{appname}/#{doc_id}/#{filename}", {
           file: Rack::Test::UploadedFile.new(__FILE__, 'application/ruby'),
           actions: ['ocr', 'pdf'],
-          backtrace: true
+          backtrace: true,
       }
       show_backtrace last_response
       expect(last_response.status).to eq 201
@@ -85,7 +85,7 @@ def show_backtrace(response)
           file: Rack::Test::UploadedFile.new(__FILE__, 'application/ruby'),
           actions: ['ocr', 'pdf'],
           author: author,
-          backtrace: true
+          backtrace: true,
       }
       expect(last_response.status).to eq 404
       expect(last_response.content_type).to eq 'application/json'
@@ -115,7 +115,7 @@ def show_backtrace(response)
   context 'POST new conversion' do
     it 'starts a new conversion' do
       post "/document/#{appname}/#{doc_id}/current/#{filename}/ocr", {
-          backtrace: true
+          backtrace: true,
       }
       show_backtrace last_response
       expect(last_response.status).to eq 202
@@ -127,7 +127,7 @@ def show_backtrace(response)
     end
     it 'fails if invalid document' do
       post "/document/#{appname}/#{invalid_doc_id}/current/#{filename}/ocr", {
-          backtrace: true
+          backtrace: true,
       }
       show_backtrace last_response
       expect(last_response.status).to eq 404
@@ -137,7 +137,7 @@ def show_backtrace(response)
     end
     it 'fails if invalid version' do
       post "/document/#{appname}/#{doc_id}/fred/#{filename}/ocr", {
-          backtrace: true
+          backtrace: true,
       }
       show_backtrace last_response
       expect(last_response.status).to eq 400
@@ -150,7 +150,7 @@ def show_backtrace(response)
   context 'DELETE document' do
     it 'runs' do
       delete "/document/#{appname}/#{doc_id}", {
-        deleted_by: 'a.person'
+        deleted_by: 'a.person',
       }
       show_backtrace last_response
       expect(last_response.status).to eq 200
@@ -164,7 +164,7 @@ def show_backtrace(response)
   context 'DELETE document version' do
     it 'runs' do
       delete "/document/#{appname}/#{doc_id}/v001", {
-        deleted_by: 'a.person'
+        deleted_by: 'a.person',
       }
       show_backtrace last_response
       expect(last_response.status).to eq 200
@@ -175,7 +175,7 @@ def show_backtrace(response)
     end
     it 'fails if you try to delete current' do
       delete "/document/#{appname}/#{doc_id}/current", {
-        deleted_by: 'a.person'
+        deleted_by: 'a.person',
       }
       show_backtrace last_response
       expect(last_response.status).to eq 400
@@ -184,7 +184,7 @@ def show_backtrace(response)
     end
     it 'fails if you try to delete the current version' do
       delete "/document/#{appname}/#{doc_id}/v002", {
-        deleted_by: 'a.person'
+        deleted_by: 'a.person',
       }
       show_backtrace last_response
       expect(last_response.status).to eq 400
@@ -235,7 +235,7 @@ def show_backtrace(response)
     context 'when file is nil' do
       it 'returns an error' do
         params = {
-          file: nil
+          file: nil,
         }
         post "/convert", params
         expect(last_response.status).to eq 400
@@ -247,7 +247,7 @@ def show_backtrace(response)
     context 'when file is not correct' do
       it 'returns an error' do
         params = {
-          file: "I'm definitely not a file"
+          file: "I'm definitely not a file",
         }
         post "/convert", params
         expect(last_response.status).to eq 400

spec/lib/autoheathen/config_spec.rb

@@ -47,8 +47,8 @@
       'horse' => {
         'duck' => :duckle,
         'fish' => 'fishle',
-        'eagle' => ['the', 'quick', 'brown', 'fox']
-      }
+        'eagle' => ['the', 'quick', 'brown', 'fox'],
+      },
     }
     hash = @obj.symbolize_keys in_hash
     expect(hash).to eq({
@@ -57,8 +57,8 @@
       horse: {
         duck: :duckle,
         fish: 'fishle',
-        eagle: ['the', 'quick', 'brown', 'fox']
-      }
+        eagle: ['the', 'quick', 'brown', 'fox'],
+      },
     })
   end
 end

spec/lib/utils_spec.rb

@@ -18,7 +18,7 @@
         'awards' => [
           { type: 'Medal of Honour', 'reason' => 'Stupidity' },
           { 'type' => 'George Cross', reason: 'Bravery' },
-        ]
+        ],
       }
       expect(symbolize_keys(h)).to eq({
         name: 'Fred',
@@ -32,7 +32,7 @@
         awards: [
           { type: 'Medal of Honour', reason: 'Stupidity' },
           { type: 'George Cross',    reason: 'Bravery' },
-        ]
+        ],
       })
     end
 
@@ -61,7 +61,7 @@
             content_type: 'application/pdf',
             filename: 'foo.pdf',
           },
-        }
+        },
       }
       expect(symbolize_keys(h)).to eq h
     end