Merge pull request #489 from MITLibraries/rubocop

Ruby update and Rubocop changes

Author: JPrevost

.rubocop.yml

@@ -1,30 +1,30 @@
-require: rubocop-rails
-
-Documentation:
-  Enabled: false
+AllCops:
+  TargetRubyVersion: 2.7
+  NewCops: enable
+  Exclude:
+    - "db/**/*"
+    - "config/**/*"
+    - "bin/**"
 
-Rails:
-  Enabled: true
+Metrics/BlockLength:
+  CountComments: false # count full line comments?
+  Max: 25
+  Exclude:
+    - "Rakefile"
+    - "**/*.rake"
+    - "test/**/*.rb"
+    - "test/test_helper.rb"
 
-AllCops:
-  TargetRubyVersion: 2.6
+Metrics/ClassLength:
   Exclude:
-    - db/**/*
-    - config/**/*
-    - bin/**
+    - "test/**/*"
 
-ClassLength:
+Metrics/MethodLength:
   Exclude:
-    - test/**/*
+    - "test/**/*.rb"
 
-Style/FrozenStringLiteralComment:
+Style/Documentation:
   Enabled: false
 
-Metrics/BlockLength:
-  CountComments: false  # count full line comments?
-  Max: 25
-  Exclude:
-    - 'Rakefile'
-    - '**/*.rake'
-    - 'spec/**/*.rb'
-    - 'test/test_helper.rb'
+Style/FrozenStringLiteralComment:
+  Enabled: false

.ruby-version

@@ -1 +1 @@
-2.6.5
+2.7.4

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.6.5'
+ruby '2.7.4'
 
 gem 'aws-sdk-elasticsearchservice'
 gem 'bootsnap', require: false

Gemfile.lock

@@ -189,7 +189,7 @@ GEM
       racc (~> 1.4)
     orm_adapter (0.5.0)
     parallel (1.20.1)
-    parser (3.0.1.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     pg (1.2.3)
     public_suffix (4.0.6)
@@ -242,17 +242,17 @@ GEM
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
-    rubocop (1.13.0)
+    rubocop (1.18.4)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.8.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
+    rubocop-ast (1.8.0)
+      parser (>= 3.0.1.1)
     rubocop-rails (2.9.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
@@ -360,7 +360,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 2.6.5p114
+   ruby 2.7.4p191
 
 BUNDLED WITH
    2.1.4

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

@@ -3,8 +3,8 @@
 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}" }
+    b = Base64.encode64("#{u.email}:123greetings")
+    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