Update rubocop to 0.51.0

.rubocop.yml

@@ -49,6 +49,10 @@ Metrics/BlockLength:
 Metrics/MethodLength:
   Max: 13
 
+Naming/FileName: # https://github.com/bbatsov/rubocop/issues/2973
+  Exclude:
+    - 'Gemfile'
+
 Style/AsciiComments:
   Enabled: false
 
@@ -60,10 +64,6 @@ Style/CollectionMethods:
     detect: 'find'
     find_all: 'select'
 
-Style/FileName: # https://github.com/bbatsov/rubocop/issues/2973
-  Exclude:
-    - 'Gemfile'
-
 Style/MethodMissing:
   Exclude:
     - 'app/models/concerns/hyrax/file_set/characterization.rb'
@@ -140,6 +140,9 @@ RSpec/DescribeClass:
     - 'spec/tasks/rake_spec.rb'
     - 'spec/views/**/*'
 
+RSpec/ContextWording:
+  Enabled: false
+
 # By default RSpec/MessageSpies has the following:
 #   Prefer have_received for setting message expectations. Setup form as a spy using allow or instance_spy.
 # The default assumes EnforcedStyle is 'have_received'. Most of our specs are 'receive'

.rubocop_fixme.yml

@@ -42,14 +42,24 @@ Metrics/MethodLength:
     - 'lib/hyrax/rails/routes.rb'
     - 'spec/support/**/*'
 
+
+Naming/PredicateName:
+  Exclude:
+    - 'app/helpers/hyrax/collections_helper.rb'
+
+
 # TODO: remove when https://github.com/bbatsov/rubocop/issues/4539 is fixed
 Style/FormatStringToken:
   Exclude:
     - 'config/routes.rb'
 
-Style/PredicateName:
+Style/DateTime:
+  Enabled: false
+
+# TODO: remove when https://github.com/bbatsov/rubocop/issues/5161 is fixed
+Style/CommentedKeyword:
   Exclude:
-    - 'app/helpers/hyrax/collections_helper.rb'
+    - 'app/models/vocab/fedora_resource_status.rb'
 
 Rails/Output:
   Exclude:

app/actors/hyrax/actors/attach_members_actor.rb

@@ -56,11 +56,11 @@ def remove(curation_concern, id)
         end
 
         # Determines if a hash contains a truthy _destroy key.
-        # rubocop:disable Style/PredicateName
+        # rubocop:disable Naming/PredicateName
         def has_destroy_flag?(hash)
           ActiveFedora::Type::Boolean.new.cast(hash['_destroy'])
         end
-      # rubocop:enable Style/PredicateName
+      # rubocop:enable Naming/PredicateName
     end
   end
 end

app/actors/hyrax/actors/create_with_remote_files_actor.rb

@@ -32,7 +32,7 @@ def whitelisted_ingest_dirs
         # @param uri [URI] the uri fo the resource to import
         def validate_remote_url(uri)
           if uri.scheme == 'file'
-            path = File.absolute_path(URI.decode(uri.path))
+            path = File.absolute_path(CGI.unescape(uri.path))
             whitelisted_ingest_dirs.any? do |dir|
               path.start_with?(dir) && path.length > dir.length
             end

app/helpers/hyrax/trophy_helper.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 module Hyrax
   module TrophyHelper
     # rubocop:disable Metrics/MethodLength

app/models/admin_set.rb

@@ -39,9 +39,11 @@ class AdminSet < ActiveFedora::Base
     index.as :symbol
   end
 
+  # rubocop:disable Rails/HasManyOrHasOneDependent
   has_many :members,
            predicate:  Hyrax.config.admin_set_predicate,
            class_name: 'ActiveFedora::Base'
+  # rubocop:enable Rails/HasManyOrHasOneDependent
 
   before_destroy :check_if_not_default_set, :check_if_empty
   after_destroy :destroy_permission_template

app/models/concerns/hyrax/solr_document_behavior.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 module Hyrax
   module SolrDocumentBehavior
     extend ActiveSupport::Concern

app/models/concerns/hyrax/user.rb

@@ -16,13 +16,17 @@ module Hyrax::User
     acts_as_messageable
 
     # Set up proxy-related relationships
-    has_many :proxy_deposit_requests, foreign_key: 'receiving_user_id'
+    has_many :proxy_deposit_requests,
+             foreign_key: 'receiving_user_id',
+             dependent: :destroy
     has_many :deposit_rights_given, foreign_key: 'grantor_id', class_name: 'ProxyDepositRights', dependent: :destroy
     has_many :can_receive_deposits_from, through: :deposit_rights_given, source: :grantee
     has_many :deposit_rights_received, foreign_key: 'grantee_id', class_name: 'ProxyDepositRights', dependent: :destroy
     has_many :can_make_deposits_for, through: :deposit_rights_received, source: :grantor
 
-    has_many :job_io_wrappers, inverse_of: 'user'
+    has_many :job_io_wrappers,
+             inverse_of: 'user',
+             dependent: :destroy
 
     scope :guests, ->() { where(guest: true) }
     scope :registered, ->() { where(guest: false) }
@@ -39,7 +43,8 @@ module Hyrax::User
     # Add token to authenticate Arkivo API calls
     after_initialize :set_arkivo_token, unless: :persisted? if Hyrax.config.arkivo_api?
 
-    has_many :trophies
+    has_many :trophies,
+             dependent: :destroy
     has_one :sipity_agent, as: :proxy_for, dependent: :destroy, class_name: 'Sipity::Agent'
   end
 
@@ -108,8 +113,7 @@ def as_json(_opts = nil)
   end
 
   def name
-    display_name.titleize || raise
-  rescue
+    return display_name.titleize if display_name
     user_key
   end
 

app/models/hyrax/uploaded_file.rb

@@ -5,7 +5,10 @@ class UploadedFile < ActiveRecord::Base
     self.table_name = 'uploaded_files'
     mount_uploader :file, UploadedFileUploader
     alias uploader file
-    has_many :job_io_wrappers, inverse_of: 'uploaded_file', class_name: 'JobIoWrapper'
+    has_many :job_io_wrappers,
+             inverse_of: 'uploaded_file',
+             class_name: 'JobIoWrapper',
+             dependent: :destroy
     belongs_to :user, class_name: '::User'
 
     before_destroy :remove_file!

app/presenters/hyrax/fixity_status_presenter.rb

@@ -10,7 +10,7 @@ class FixityStatusPresenter
     include ActionView::Helpers::TextHelper
     include ActionView::Helpers::OutputSafetyHelper
 
-    attr_reader :file_set_id, :relevant_log_records
+    attr_reader :file_set_id
     # Note this takes a file_set_id NOT a FileSet, easy use from either solr
     # or AF object.
     def initialize(file_set_id)
@@ -75,7 +75,7 @@ def render_date_range
       # Should be all _latest_ ChecksumAuditLog about different files/versions
       # currently existing in specified FileSet.
       def relevant_log_records
-        @relevant_log_records = ChecksumAuditLog.latest_for_file_set_id(file_set_id)
+        @relevant_log_records ||= ChecksumAuditLog.latest_for_file_set_id(file_set_id)
       end
 
       def num_checked_files

app/renderers/hyrax/renderers/license_attribute_renderer.rb

@@ -11,7 +11,7 @@ class LicenseAttributeRenderer < AttributeRenderer
         def attribute_value_to_html(value)
           begin
             parsed_uri = URI.parse(value)
-          rescue
+          rescue URI::InvalidURIError
             nil
           end
           if parsed_uri.nil?

app/renderers/hyrax/renderers/rights_statement_attribute_renderer.rb

@@ -11,7 +11,7 @@ class RightsStatementAttributeRenderer < AttributeRenderer
         def attribute_value_to_html(value)
           begin
             parsed_uri = URI.parse(value)
-          rescue
+          rescue URI::InvalidURIError
             nil
           end
           if parsed_uri.nil?

app/services/hyrax/file_set_fixity_check_service.rb

@@ -22,7 +22,7 @@ module Hyrax
   # `max_days_between_fixity_checks` arg, which defaults to config'd
   # `Hyrax.config.max_days_between_fixity_checks`
   class FileSetFixityCheckService
-    attr_reader :file_set, :id, :latest_version_only,
+    attr_reader :id, :latest_version_only,
                 :async_jobs, :max_days_between_fixity_checks
 
     # @param file_set [ActiveFedora::Base, String] file_set

hyrax.gemspec

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'hyrax/version'
@@ -8,13 +6,13 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Justin Coyne", 'Michael J. Giarlo', "Carolyn Cole", "Matt Zumwalt", 'Jeremy Friesen', 'Trey Pendragon', 'Esmé Cowles']
   spec.email         = ["[email protected]", '[email protected]', '[email protected]', '[email protected]', "[email protected]", '[email protected]', '[email protected]']
   spec.description   = 'Hyrax is a featureful Samvera front-end based on the latest and greatest Samvera software components.'
-  spec.summary       = <<-EOF
+  spec.summary       = <<-SUMMARY
   Hyrax is a front-end based on the robust Samvera framework, providing a user
   interface for common repository features. Hyrax offers the ability to create
   repository object types on demand, to deposit content via multiple workflows,
   and to describe content with flexible metadata. Numerous optional features may
   be turned on in the administrative dashboard or added through plugins.
-EOF
+SUMMARY
 
   spec.homepage      = "http://github.com/samvera/hyrax"
 
@@ -31,65 +29,65 @@ EOF
   # http://guides.rubyonrails.org/maintenance_policy.html
   spec.add_dependency 'rails', '~> 5.0'
 
-  spec.add_dependency 'hydra-head', '>= 10.5.0'
-  spec.add_dependency 'hydra-editor', '~> 3.3'
-  spec.add_dependency 'hydra-works', '~> 0.16'
-  spec.add_dependency 'hydra-derivatives', '~> 3.3'
-  spec.add_dependency 'browse-everything', '>= 0.10.5'
   spec.add_dependency 'blacklight', '~> 6.11', '>= 6.11.2'
   spec.add_dependency 'blacklight-gallery', '~> 0.7'
-  spec.add_dependency 'tinymce-rails', '~> 4.1'
+  spec.add_dependency 'browse-everything', '>= 0.10.5'
+  spec.add_dependency 'carrierwave', '~> 1.0'
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
-  spec.add_dependency 'select2-rails', '~> 3.5'
+  spec.add_dependency 'hydra-derivatives', '~> 3.3'
+  spec.add_dependency 'hydra-editor', '~> 3.3'
+  spec.add_dependency 'hydra-head', '>= 10.5.0'
+  spec.add_dependency 'hydra-works', '~> 0.16'
+  spec.add_dependency 'jquery-ui-rails', '~> 5.0'
   spec.add_dependency 'json-schema' # for Arkivo
-  spec.add_dependency 'nest', '~> 2.0'
+  spec.add_dependency 'legato', '~> 0.3'
   spec.add_dependency 'mailboxer', '~> 0.12'
-  spec.add_dependency 'carrierwave', '~> 1.0'
+  spec.add_dependency 'nest', '~> 2.0'
   spec.add_dependency 'oauth'
   spec.add_dependency 'oauth2', '~> 1.2'
-  spec.add_dependency 'signet'
-  spec.add_dependency 'legato', '~> 0.3'
   spec.add_dependency 'posix-spawn'
-  spec.add_dependency 'jquery-ui-rails', '~> 5.0'
   spec.add_dependency 'redis-namespace', '~> 1.5'
+  spec.add_dependency 'select2-rails', '~> 3.5'
+  spec.add_dependency 'signet'
+  spec.add_dependency 'tinymce-rails', '~> 4.1'
   # Pin more tightly because 0.x gems are potentially unstable
-  spec.add_dependency 'flot-rails', '~> 0.0.6'
+  spec.add_dependency 'active_fedora-noid', '~> 2.0', '>= 2.0.2'
   spec.add_dependency 'almond-rails', '~> 0.1'
-  spec.add_dependency 'qa', '~> 2.0' # questioning_authority
+  spec.add_dependency 'awesome_nested_set', '~> 3.1'
+  spec.add_dependency 'breadcrumbs_on_rails', '~> 3.0'
+  spec.add_dependency 'clipboard-rails', '~> 1.5'
   spec.add_dependency 'flipflop', '~> 2.3'
+  spec.add_dependency 'flot-rails', '~> 0.0.6'
   spec.add_dependency 'jquery-datatables-rails', '~> 3.4'
-  spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
-  spec.add_dependency 'clipboard-rails', '~> 1.5'
+  spec.add_dependency 'qa', '~> 2.0' # questioning_authority
   spec.add_dependency 'rails_autolink', '~> 1.1'
-  spec.add_dependency 'active_fedora-noid', '~> 2.0', '>= 2.0.2'
-  spec.add_dependency 'awesome_nested_set', '~> 3.1'
-  spec.add_dependency 'breadcrumbs_on_rails', '~> 3.0'
+  spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
   # Pin more tightly because 0.x gems are potentially unstable
-  spec.add_dependency 'kaminari_route_prefix', '~> 0.1.1'
-  spec.add_dependency 'power_converter', '~> 0.1', '>= 0.1.2'
-  spec.add_dependency 'dry-validation', '~> 0.9'
+  spec.add_dependency 'active-fedora', '~> 11.5', '>= 11.5.2'
   spec.add_dependency 'dry-equalizer', '~> 0.2'
   spec.add_dependency 'dry-struct', '~> 0.1'
+  spec.add_dependency 'dry-validation', '~> 0.9'
+  spec.add_dependency 'kaminari_route_prefix', '~> 0.1.1'
+  spec.add_dependency 'linkeddata' # Required for getting values from geonames
+  spec.add_dependency 'power_converter', '~> 0.1', '>= 0.1.2'
   spec.add_dependency 'redlock', '>= 0.1.2'
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
-  spec.add_dependency 'active-fedora', '~> 11.5', '>= 11.5.2'
-  spec.add_dependency 'linkeddata' # Required for getting values from geonames
 
-  spec.add_development_dependency 'engine_cart', '~> 1.2'
-  spec.add_development_dependency 'mida', '~> 0.3'
-  spec.add_development_dependency 'database_cleaner', '~> 1.3'
-  spec.add_development_dependency 'solr_wrapper', '~> 1.1'
-  spec.add_development_dependency 'fcrepo_wrapper', '~> 0.5', '>= 0.5.1'
-  spec.add_development_dependency 'rspec-rails', '~> 3.1'
-  spec.add_development_dependency 'rspec-its', '~> 1.1'
-  spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
   spec.add_development_dependency "capybara", '~> 2.4'
   spec.add_development_dependency 'capybara-maleficent', '~> 0.2'
   spec.add_development_dependency "chromedriver-helper"
-  spec.add_development_dependency "selenium-webdriver"
-  spec.add_development_dependency "factory_bot_rails", '~> 4.4'
+  spec.add_development_dependency 'database_cleaner', '~> 1.3'
+  spec.add_development_dependency 'engine_cart', '~> 1.2'
   spec.add_development_dependency "equivalent-xml", '~> 0.5'
+  spec.add_development_dependency "factory_bot_rails", '~> 4.4'
+  spec.add_development_dependency 'fcrepo_wrapper', '~> 0.5', '>= 0.5.1'
   spec.add_development_dependency "jasmine", '~> 2.3'
+  spec.add_development_dependency 'mida', '~> 0.3'
+  spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
+  spec.add_development_dependency 'rspec-its', '~> 1.1'
+  spec.add_development_dependency 'rspec-rails', '~> 3.1'
+  spec.add_development_dependency "selenium-webdriver"
+  spec.add_development_dependency 'solr_wrapper', '~> 1.1'
   # Pin rubocop and rubocop-rspec tightly. Minor-level version bumps
   # in these gems cause Rubocop violations, and those violations cause
   # continuous integration builds to fail, and those failures prevent
@@ -100,11 +98,11 @@ EOF
   # conventions. This allows us to take a managed approach to code
   # style -- we choose to update style when we wish, not when a
   # minor-level version bump in a dependency comes out.
-  spec.add_development_dependency 'rubocop', '~> 0.49.1'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.16.0'
-  spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
-  spec.add_development_dependency 'rails-controller-testing', '~> 1'
-  spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'i18n-debug' if ENV['I18N_DEBUG']
   spec.add_development_dependency 'i18n_yaml_sorter' unless ENV['TRAVIS']
+  spec.add_development_dependency 'rails-controller-testing', '~> 1'
+  spec.add_development_dependency 'rubocop', '~> 0.51.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.20.1'
+  spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
+  spec.add_development_dependency 'webmock'
 end

lib/generators/hyrax/assets_generator.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'rails/generators'
 
 class Hyrax::AssetsGenerator < Rails::Generators::Base
@@ -20,10 +18,10 @@ def inject_css
   def inject_js
     return if hyrax_javascript_installed?
     insert_into_file 'app/assets/javascripts/application.js', after: '//= require_tree .' do
-      <<-EOF.strip_heredoc
+      <<-JS.strip_heredoc
 
         //= require hyrax
-      EOF
+      JS
     end
   end
 

lib/generators/hyrax/clamav_generator.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'rails/generators'
 
 class Hyrax::ClamavGenerator < Rails::Generators::Base

lib/generators/hyrax/config_generator.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'rails/generators'
 
 class Hyrax::ConfigGenerator < Rails::Generators::Base

lib/hyrax/configuration.rb

@@ -79,8 +79,7 @@ def feature_config_path
       @feature_config_path ||= Rails.root.join('config', 'features.yml')
     end
 
-    attr_accessor :temp_file_base, :enable_local_ingest,
-                  :analytics, :analytic_start_date
+    attr_accessor :temp_file_base, :enable_local_ingest
 
     attr_writer :display_microdata
     def display_microdata?
@@ -266,6 +265,7 @@ def browse_everything?
     end
 
     attr_writer :analytics
+    attr_reader :analytics
     def analytics?
       @analytics ||= false
     end

lib/hyrax/engine.rb

@@ -34,7 +34,7 @@ class Engine < ::Rails::Engine
       begin
         Hyrax.config.persist_registered_roles!
         Rails.logger.info("Hyrax::Engine.after_initialize - persisting registered roles!")
-      rescue
+      rescue ActiveRecord::StatementInvalid
         message = "Hyrax::Engine.after_initialize - unable to persist registered roles.\n"
         message += "It is expected during the application installation - during integration tests, rails install.\n"
         message += "It is UNEXPECTED if you are booting up a Hyrax powered application via `rails server'"