Safe rubocop fixes

`rubocop -a`

https://docs.rubocop.org/rubocop/usage/auto_correct.html#safe-auto-correct

Author: JPrevost

app/models/retrieve.rb

@@ -3,9 +3,7 @@ def fetch(id)
     f = to_filter(id)
     record = Timdex::EsClient.search(index: ENV['ELASTICSEARCH_INDEX'], body: f)
 
-    if record['hits']['total'].zero?
-      raise Elasticsearch::Transport::Transport::Errors::NotFound
-    end
+    raise Elasticsearch::Transport::Transport::Errors::NotFound if record['hits']['total'].zero?
 
     record
   end

app/models/search.rb

@@ -67,23 +67,15 @@ def query
   def filters
     f = []
     f.push filter(@params[:collection], 'collections') if @params[:collection]
-    if @params[:contributor]
-      f.push filter(@params[:contributor], 'contributors')
-    end
+    f.push filter(@params[:contributor], 'contributors') if @params[:contributor]
 
-    if @params[:content_type]
-      f.push filter_single(@params[:content_type], 'content_type')
-    end
+    f.push filter_single(@params[:content_type], 'content_type') if @params[:content_type]
 
-    if @params[:content_format]
-      f.push filter(@params[:content_format], 'format')
-    end
+    f.push filter(@params[:content_format], 'format') if @params[:content_format]
 
     f.push filter(@params[:language], 'languages') if @params[:language]
 
-    if @params[:literary_form]
-      f.push filter_single(@params[:literary_form], 'literary_form')
-    end
+    f.push filter_single(@params[:literary_form], 'literary_form') if @params[:literary_form]
 
     f.push filter_single(@params[:source], 'source') if @params[:source]
     f.push filter(@params[:subject], 'subjects') if @params[:subject]
@@ -112,7 +104,7 @@ def filter(param, field)
           }
         )
       else
-        terms.push('term': { "#{field}.keyword": t })
+        terms.push(term: { "#{field}.keyword": t })
       end
     end
 
@@ -122,7 +114,7 @@ def filter(param, field)
   # use `filter_single` when we only accept a single value in our data model
   def filter_single(param, field)
     {
-      'term': { "#{field}.keyword": param }
+      term: { "#{field}.keyword": param }
     }
   end
 

app/views/api/v1/search/_extended.json.jbuilder

@@ -3,20 +3,14 @@ json.issns result['issns'] if result['issns']
 json.dois result['dois'] if result['dois']
 json.available 'Not Yet Implemented'
 json.alternate_titles result['alternate_titles'] if result['alternate_titles']
-if json.place_of_publication result['place_of_publication']
-  result['place_of_publication']
-end
+result['place_of_publication'] if json.place_of_publication result['place_of_publication']
 json.languages result['languages'] if result['languages']
 json.call_numbers result['call_numbers'] if result['call_numbers']
 json.edition result['edition'] if result['edition']
 json.imprint result['imprint'] if result['imprint']
-if result['physical_description']
-  json.physical_description result['physical_description']
-end
+json.physical_description result['physical_description'] if result['physical_description']
 json.summary result['summary'] if result['summary']
 json.imprint result['imprint'] if result['imprint']
 json.notes result['notes'] if result['notes']
-if result['publication_frequency']
-  json.publication_frequency result['publication_frequency']
-end
+json.publication_frequency result['publication_frequency'] if result['publication_frequency']
 json.literary_form result['literary_form'] if result['literary_form']

config.ru

@@ -1,6 +1,6 @@
 # This file is used by Rack-based servers to start the application.
 
-require_relative "config/environment"
+require_relative 'config/environment'
 
 run Rails.application
 Rails.application.load_server

test/controllers/auth_controller_test.rb

@@ -4,7 +4,7 @@ class AuthControllerTest < ActionDispatch::IntegrationTest
   test 'valid credentials returns JWT' do
     u = users(:yo)
     b = Base64.encode64(u.email + ':123greetings')
-    get '/api/v1/auth', headers: { 'Authorization': "Basic #{b}" }
+    get '/api/v1/auth', headers: { Authorization: "Basic #{b}" }
     assert_equal(200, response.status)
     assert_equal(u.id, JwtWrapper.decode(JSON.parse(response.body))['user_id'])
   end

test/controllers/graphql_controller_test.rb

@@ -137,7 +137,7 @@ class GraphqlControllerTest < ActionDispatch::IntegrationTest
   test 'search with multiple subjects applied' do
     VCR.use_cassette('graphql search multiple subjects') do
       post '/graphql', params: { query: '{
-                                  search(searchterm: "space", 
+                                  search(searchterm: "space",
                                         subjects: ["space and time.",
                                                    "quantum theory."]) {
                                     hits
@@ -167,7 +167,7 @@ class GraphqlControllerTest < ActionDispatch::IntegrationTest
       json = JSON.parse(response.body)
       assert(json['errors'].first['message'].present?)
       assert_equal("Field 'search' doesn't accept argument 'fake'",
-                 json['errors'].first['message'])
+                   json['errors'].first['message'])
     end
   end
 

test/controllers/search_controller_test.rb

@@ -5,7 +5,7 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
     token = JwtWrapper.encode(user_id: users(:yo).id)
     VCR.use_cassette('q super cool search') do
       get '/api/v1/search?q=super+cool+search',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal(21_502, json['hits'])
@@ -16,7 +16,7 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
     token = JwtWrapper.encode(user_id: 'fakeid')
     VCR.use_cassette('invalid token') do
       get '/api/v1/search?q=super+cool+search',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal(100, json['request_limit'])
@@ -29,7 +29,7 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
     end
     VCR.use_cassette('expired token') do
       get '/api/v1/search?q=super+cool+search',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal(100, json['request_limit'])
@@ -44,7 +44,7 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
 
   test 'ping with valid token' do
     token = JwtWrapper.encode(user_id: users(:yo).id)
-    get '/api/v1/ping', headers: { 'Authorization': "Bearer #{token}" }
+    get '/api/v1/ping', headers: { Authorization: "Bearer #{token}" }
     assert_equal(200, response.status)
     assert_equal('pong', JSON.parse(response.body))
   end
@@ -53,7 +53,7 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
     token = JwtWrapper.encode(user_id: users(:yo).id)
     VCR.use_cassette('record 001714562') do
       get '/api/v1/record/001714562',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal('001714562', json['id'])
@@ -65,7 +65,7 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
     token = JwtWrapper.encode(user_id: users(:yo).id)
     VCR.use_cassette('record asdf') do
       get '/api/v1/record/asdf',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(404, response.status)
     end
   end
@@ -74,47 +74,47 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
     token = JwtWrapper.encode(user_id: users(:yo).id)
     VCR.use_cassette('record period') do
       get '/api/v1/record/MIT:archivespace:MC.0044',
-          headers: { 'Authorization': "Bearer #{token}" }
-          assert_equal(200, response.status)
-          json = JSON.parse(response.body)
-          assert_equal('MIT:archivespace:MC.0044', json['id'])
+          headers: { Authorization: "Bearer #{token}" }
+      assert_equal(200, response.status)
+      json = JSON.parse(response.body)
+      assert_equal('MIT:archivespace:MC.0044', json['id'])
     end
   end
 
   test 'pagination' do
     token = JwtWrapper.encode(user_id: users(:yo).id)
     VCR.use_cassette('pagination') do
       get '/api/v1/search?q=marvel',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal(394, json['hits'])
       assert_equal('002312360', json['results'][0]['id'])
 
       get '/api/v1/search?q=marvel&page=2',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal(394, json['hits'])
       assert_equal('002611432', json['results'][0]['id'])
 
       get '/api/v1/search?q=marvel&page=10',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal(394, json['hits'])
       assert_equal('002602394', json['results'][0]['id'])
 
       get '/api/v1/search?q=marvel&page=25',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal(394, json['hits'])
       assert_equal('Invalid page parameter: requested page past last result',
                    json['error'])
 
       get '/api/v1/search?q=marvel&page=400',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(400, response.status)
       json = JSON.parse(response.body)
       assert_nil(json['hits'])
@@ -127,21 +127,21 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
     token = JwtWrapper.encode(user_id: users(:yo).id)
     VCR.use_cassette('filtering multiple values') do
       get '/api/v1/search?q=marvel',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal(394, json['hits'])
       assert_equal('002312360', json['results'][0]['id'])
 
       get '/api/v1/search?q=marvel&subject[]=Graphic%20Novels.',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal(20, json['hits'])
       assert_equal('002295630', json['results'][0]['id'])
 
       get '/api/v1/search?q=marvel&subject[]=Graphic%20Novels.&subject[]=science%20fiction%20comic%20books,%20strips,%20etc.',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal(11, json['hits'])
@@ -153,14 +153,14 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
     token = JwtWrapper.encode(user_id: users(:yo).id)
     VCR.use_cassette('filtering single value') do
       get '/api/v1/search?q=marvel',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal(394, json['hits'])
       assert_equal('002312360', json['results'][0]['id'])
 
       get '/api/v1/search?q=marvel&literary_form=fiction',
-          headers: { 'Authorization': "Bearer #{token}" }
+          headers: { Authorization: "Bearer #{token}" }
       assert_equal(200, response.status)
       json = JSON.parse(response.body)
       assert_equal(227, json['hits'])