hyrax 2.1.0 → 2.2.0

data/app/controllers/concerns/hyrax/works_controller_behavior.rb

@@ -206,7 +206,7 @@ module Hyrax
 
       def document_not_found!
         doc = ::SolrDocument.find(params[:id])
-        raise WorkflowAuthorizationException if doc.suppressed?
+        raise WorkflowAuthorizationException if doc.suppressed? && current_ability.can?(:read, doc)
         raise CanCan::AccessDenied.new(nil, :show)
       end
 

data/app/controllers/hyrax/admin/admin_sets_controller.rb

@@ -25,7 +25,7 @@ module Hyrax
     self.admin_set_create_service = AdminSetCreateService
 
     def deny_adminset_access(exception)
-      if current_user && current_user.persisted?
+      if current_user&.persisted?
         redirect_to root_url, alert: exception.message
       else
         session['user_return_to'] = request.url

data/app/controllers/hyrax/dashboard/collections_controller.rb

@@ -42,7 +42,7 @@ module Hyrax
       def deny_collection_access(exception)
         if exception.action == :edit
           redirect_to(url_for(action: 'show'), alert: 'You do not have sufficient privileges to edit this document')
-        elsif current_user && current_user.persisted?
+        elsif current_user&.persisted?
           redirect_to root_url, alert: exception.message
         else
           session['user_return_to'] = request.url
@@ -242,7 +242,7 @@ module Hyrax
 
         def remove_banner
           banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
-          banner_info.delete_all unless banner_info.nil?
+          banner_info&.delete_all
         end
 
         def update_logo_info(uploaded_file_id, alttext, linkurl)

data/app/controllers/hyrax/downloads_controller.rb

@@ -76,7 +76,7 @@ module Hyrax
                                    DownloadsController.default_content_path
                                  end
         association = dereference_file(default_file_reference)
-        association.reader if association
+        association&.reader
       end
 
       def mime_type_for(file)

data/app/controllers/hyrax/featured_works_controller.rb

@@ -16,11 +16,7 @@ module Hyrax
     def destroy
       authorize! :destroy, FeaturedWork
       @featured_work = FeaturedWork.find_by(work_id: params[:id])
-      if @featured_work
-        # Handle the case where a separate request may have already
-        # destroyed this work
-        @featured_work.destroy
-      end
+      @featured_work&.destroy
 
       respond_to do |format|
         format.json { head :no_content }

data/app/controllers/hyrax/homepage_controller.rb

@@ -44,6 +44,6 @@ class Hyrax::HomepageController < ApplicationController
     end
 
     def sort_field
-      "#{Solrizer.solr_name('system_create', :stored_sortable, type: :date)} desc"
+      "#{Solrizer.solr_name('date_uploaded', :stored_sortable, type: :date)} desc"
     end
 end

data/app/controllers/hyrax/single_use_links_controller.rb

@@ -9,7 +9,7 @@ module Hyrax
     rescue_from Hydra::AccessDenied, CanCan::AccessDenied, with: :deny_link_access
 
     def deny_link_access(exception)
-      if current_user && current_user.persisted?
+      if current_user&.persisted?
         redirect_to main_app.root_url, alert: "You do not have sufficient privileges to create links to this document"
       else
         session["user_return_to"] = request.url

data/app/controllers/hyrax/transfers_controller.rb

@@ -10,7 +10,7 @@ module Hyrax
     # Catch permission errors
     # TODO: Isn't this already handled?
     rescue_from CanCan::AccessDenied do |exception|
-      if current_user && current_user.persisted?
+      if current_user&.persisted?
         redirect_to root_url, alert: exception.message
       else
         session["user_return_to"] = request.url

data/app/controllers/hyrax/users_controller.rb

@@ -6,6 +6,7 @@ module Hyrax
     helper Hyrax::TrophyHelper
 
     def index
+      authenticate_user! if Flipflop.hide_users_list?
       @users = search(params[:uq])
     end
 

data/app/helpers/hyrax/citations_behaviors/publication_behavior.rb

@@ -14,11 +14,11 @@ module Hyrax
 
       # @param [Hyrax::WorkShowPresenter] work_presenter
       def setup_pub_place(work_presenter)
-        work_presenter.based_near_label.first if work_presenter.based_near_label
+        work_presenter.based_near_label&.first
       end
 
       def setup_pub_publisher(work)
-        work.publisher.first if work.publisher
+        work.publisher&.first
       end
 
       def setup_pub_info(work, include_date = false)

data/app/helpers/hyrax/collections_helper.rb

@@ -11,7 +11,7 @@ module Hyrax
     def render_collection_links(solr_doc)
       collection_list = Hyrax::CollectionMemberService.run(solr_doc, controller.current_ability)
       return if collection_list.empty?
-      links = collection_list.map { |collection| link_to collection.title_or_label, collection_path(collection.id) }
+      links = collection_list.map { |collection| link_to collection.title_or_label, hyrax.collection_path(collection.id) }
       collection_links = []
       links.each_with_index do |link, n|
         collection_links << link

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -201,7 +201,7 @@ module Hyrax
     # @param [Hash] options from blacklight helper_method invocation. Maps license URIs to links with labels.
     # @return [ActiveSupport::SafeBuffer] license links, html_safe
     def license_links(options)
-      service = Hyrax::LicenseService.new
+      service = Hyrax.config.license_service_class.new
       to_sentence(options[:value].map { |right| link_to service.label(right), right })
     end
 
@@ -209,7 +209,7 @@ module Hyrax
     # @param [Hash] options from blacklight helper_method invocation. Maps rights statement URIs to links with labels.
     # @return [ActiveSupport::SafeBuffer] rights statement links, html_safe
     def rights_statement_links(options)
-      service = Hyrax::RightsStatementService.new
+      service = Hyrax.config.rights_statement_service_class.new
       to_sentence(options[:value].map { |right| link_to service.label(right), right })
     end
 

data/app/jobs/characterize_job.rb

@@ -13,7 +13,7 @@ class CharacterizeJob < Hyrax::ApplicationJob
     Rails.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
     file_set.characterization_proxy.save!
     file_set.update_index
-    file_set.parent.in_collections.each(&:update_index) if file_set.parent
+    file_set.parent&.in_collections&.each(&:update_index)
     CreateDerivativesJob.perform_later(file_set, file_id, filepath)
   end
 end

data/app/jobs/fixity_check_job.rb

@@ -58,6 +58,6 @@ class FixityCheckJob < Hyrax::ApplicationJob
     end
 
     def logger
-      ActiveFedora::Base.logger
+      Hyrax.logger
     end
 end

data/app/jobs/import_url_job.rb

@@ -24,7 +24,7 @@ class ImportUrlJob < Hyrax::ApplicationJob
     @file_set = file_set
     @operation = operation
 
-    unless HTTParty.head(file_set.import_url).success?
+    unless can_retrieve?(uri)
       send_error('Expired URL')
       return false
     end
@@ -44,6 +44,17 @@ class ImportUrlJob < Hyrax::ApplicationJob
 
   private
 
+    # The previous strategy of using only a HEAD request to check the validity of a
+    # remote URL fails for Amazon S3 pre-signed URLs. S3 URLs are generated for a single
+    # verb only (in this case, GET), and will return a 403 Forbidden response if any
+    # other verb is used. The workaround is to issue a GET request instead, with a
+    # Range: header requesting only the first byte. The successful response status
+    # code is 206 instead of 200, but that is enough to satisfy the #success? method.
+    # @param uri [URI] the uri of the file to be downloaded
+    def can_retrieve?(uri)
+      HTTParty.get(uri, headers: { Range: 'bytes=0-0' }).success?
+    end
+
     # Download file from uri, yields a block with a file in a temporary directory.
     # It is important that the file on disk has the same file name as the URL,
     # because when the file in added into Fedora the file name will get persisted in the

data/app/models/checksum_audit_log.rb

@@ -51,7 +51,7 @@ class ChecksumAuditLog < ActiveRecord::Base
 
     0.upto(all_logs.length - 2).each do |i|
       next if all_logs[i].failed?
-      next if i > 0 && all_logs[i - 1].failed?
+      next if i.positive? && all_logs[i - 1].failed?
       next if all_logs[i + 1].failed?
 
       all_logs[i].destroy!

data/app/models/concerns/hyrax/ability.rb

@@ -75,7 +75,7 @@ module Hyrax
                                       .joins(:permission_template)
                                       .pluck('DISTINCT source_id')
         query = "_query_:\"{!raw f=has_model_ssim}AdminSet\" AND {!terms f=id}#{ids.join(',')}"
-        ActiveFedora::SolrService.count(query) > 0
+        ActiveFedora::SolrService.count(query).positive?
       end
 
       # This overrides hydra-head, (and restores the method from blacklight-access-controls)

data/app/models/hyrax/collection_type.rb

@@ -66,7 +66,7 @@ module Hyrax
 
     # @return [Boolean] True if there is at least one collection of this type
     def collections?
-      collections.count > 0
+      collections.count.positive?
     end
 
     # @return [Boolean] True if this is the Admin Set type

data/app/models/hyrax/operation.rb

@@ -45,10 +45,8 @@ module Hyrax
     def rollup_messages
       [].tap do |messages|
         messages << message if message.present?
-        if children
-          children.pluck(:message).uniq.each do |child_message|
-            messages << child_message if child_message.present?
-          end
+        children&.pluck(:message)&.uniq&.each do |child_message|
+          messages << child_message if child_message.present?
         end
       end
     end
@@ -63,7 +61,7 @@ module Hyrax
     def success!
       run_callbacks :success do
         update(status: SUCCESS)
-        parent.rollup_status if parent
+        parent&.rollup_status
       end
     end
 
@@ -78,7 +76,7 @@ module Hyrax
     def fail!(message = nil)
       run_callbacks :failure do
         update(status: FAILURE, message: message)
-        parent.rollup_status if parent
+        parent&.rollup_status
       end
     end
 

data/app/models/hyrax/permission_template_access.rb

@@ -11,12 +11,12 @@ module Hyrax
       scope: [:agent_id, :agent_type, :permission_template_id]
     }
 
-    VIEW = 'view'.freeze
-    DEPOSIT = 'deposit'.freeze
-    MANAGE = 'manage'.freeze
+    VIEW = 'view'
+    DEPOSIT = 'deposit'
+    MANAGE = 'manage'
 
-    GROUP = 'group'.freeze
-    USER = 'user'.freeze
+    GROUP = 'group'
+    USER = 'user'
 
     enum(
       access: {

data/app/models/sipity/entity.rb

@@ -28,7 +28,7 @@ module Sipity
              class_name: 'Sipity::Comment'
 
     def workflow_state_name
-      workflow_state.name if workflow_state
+      workflow_state&.name
     end
 
     # Defines the method #workflow_name

data/app/presenters/hyrax/admin_set_presenter.rb

@@ -1,5 +1,11 @@
 module Hyrax
   class AdminSetPresenter < CollectionPresenter
+    ##
+    # @return [Boolean] true if there are items
+    def any_items?
+      total_items.positive?
+    end
+
     def total_items
       ActiveFedora::SolrService.count("{!field f=isPartOf_ssim}#{id}")
     end
@@ -10,13 +16,14 @@ module Hyrax
 
     # AdminSet cannot be deleted if default set or non-empty
     def disable_delete?
-      AdminSet.default_set?(id) || total_items > 0
+      AdminSet.default_set?(id) || any_items?
     end
 
     # Message to display if deletion is disabled
     def disabled_message
       return I18n.t('hyrax.admin.admin_sets.delete.error_default_set') if AdminSet.default_set?(id)
-      return I18n.t('hyrax.admin.admin_sets.delete.error_not_empty') if total_items > 0
+
+      I18n.t('hyrax.admin.admin_sets.delete.error_not_empty') if any_items?
     end
 
     def collection_type

data/app/presenters/hyrax/admin_stats_presenter.rb

@@ -2,10 +2,49 @@ module Hyrax
   class AdminStatsPresenter
     attr_reader :limit, :stats_filters
 
-    def initialize(stats_filters, limit)
+    ##
+    # @!attribute [rw] by_depositor
+    #   @return [#query]
+    # @!attribute [rw] by_format
+    #   @return [#query]
+    # @!attribute [rw] depositor_summary
+    #   @return [#depositors]
+    # @!attribute [rw] system_stats
+    #   @return [#recent_users]
+    # @!attribute [rw] works_counter
+    #   @return [#by_permission]
+    attr_accessor :by_depositor, :by_format, :depositor_summary, :system_stats,
+                  :works_counter
+
+    # Long parameter lists (especially optional) are preferred to hard-coded
+    # dependencies. Further refactors may be desirable.
+    #
+    # rubocop:disable Metrics/ParameterLists
+
+    ##
+    # @param stats_filters     [Hash<Symbol, Object>]
+    # @param limit             [FixNum]
+    # @param by_depositor      [#query]
+    # @param by_format         [#query]
+    # @param depositor_summary [#depositors]
+    # @param system_stats      [#recent_users]
+    # @param works_counter     [#by_permission]
+    def initialize(stats_filters, limit,
+                   by_depositor:      Hyrax::Statistics::Works::ByDepositor,
+                   by_format:         Hyrax::Statistics::FileSets::ByFormat,
+                   depositor_summary: Hyrax::Statistics::Depositors::Summary,
+                   system_stats:      Hyrax::Statistics::SystemStats,
+                   works_counter:     Hyrax::Statistics::Works::Count)
       @stats_filters = stats_filters
       @limit = limit
+
+      self.by_depositor      = by_depositor
+      self.by_format         = by_format
+      self.depositor_summary = depositor_summary
+      self.system_stats      = system_stats
+      self.works_counter     = works_counter
     end
+    # rubocop:enable Metrics/ParameterLists
 
     def start_date
       @start_date ||= extract_date_from_stats_filters(key: :start_date, as_of: :beginning_of_day)
@@ -26,29 +65,36 @@ module Hyrax
 
     # @see Hyrax::Statistics::Depositors::Summary
     def depositors
-      @depositors ||= Hyrax::Statistics::Depositors::Summary.depositors(start_date: start_date, end_date: end_date)
+      @depositors ||=
+        depositor_summary.depositors(start_date: start_date, end_date: end_date)
     end
 
     # @see Hyrax::Statistics::SystemStats.recent_users
     def recent_users
-      @recent_users ||= Hyrax::Statistics::SystemStats.recent_users(limit: limit, start_date: start_date, end_date: end_date)
+      @recent_users ||=
+        system_stats.recent_users(limit:      limit,
+                                  start_date: start_date,
+                                  end_date:   end_date)
     end
 
     # @see Hyrax::Statistics::Works::ByDepositor
     def active_users
-      @active_users ||= Hyrax::Statistics::Works::ByDepositor.query(limit: limit)
+      @active_users ||= by_depositor.query(limit: limit)
     end
 
     # @see Hyrax::Statistics::FileSets::ByFormat
     def top_formats
-      @top_formats ||= Hyrax::Statistics::FileSets::ByFormat.query(limit: limit)
+      @top_formats ||= by_format.query(limit: limit)
     end
 
     # @see Hyrax::Statistics::Works::Count
     def works_count
-      @works_count ||= Hyrax::Statistics::Works::Count.by_permission(start_date: start_date, end_date: end_date)
+      @works_count ||=
+        works_counter.by_permission(start_date: start_date, end_date: end_date)
     end
 
+    ##
+    # @return [String]
     def date_filter_string
       if start_date.blank?
         "unfiltered"

data/app/presenters/hyrax/inspect_work_presenter.rb

@@ -43,7 +43,7 @@ module Hyrax
       end
 
       def workflow_comments
-        return [] unless sipity_entity && sipity_entity.comments.count > 0
+        return [] unless sipity_entity&.comments&.any?
         sipity_entity.comments.map do |comment|
           { comment: comment.comment, created_at: comment.created_at }
         end

data/app/presenters/hyrax/workflow_presenter.rb

@@ -10,7 +10,7 @@ module Hyrax
     attr_reader :solr_document, :current_ability
 
     def state
-      sipity_entity.workflow_state_name if sipity_entity
+      sipity_entity&.workflow_state_name
     end
 
     def state_label

data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb

@@ -100,11 +100,9 @@ module Hyrax
           array_to_exclude += @nesting_attributes.ancestors unless @nesting_attributes.ancestors.nil?
           # build a unique string containing all of Collection F's pathnames and ancestors
           exclude_list = ""
-          unless array_to_exclude.nil?
-            array_to_exclude.uniq.each do |element|
-              exclude_list += ' ' unless exclude_list.empty?
-              exclude_list += element.to_s
-            end
+          array_to_exclude&.uniq&.each do |element|
+            exclude_list += ' ' unless exclude_list.empty?
+            exclude_list += element.to_s
           end
           # Using a !lucene query allows us to get items which match any individual element
           # from the list. Building the query via the AF builder created a !field query which

data/app/search_builders/hyrax/filter_suppressed_with_roles.rb

@@ -31,7 +31,11 @@ module Hyrax
       end
 
       def depositor?
-        current_work[DepositSearchBuilder.depositor_field].first == current_ability.current_user.user_key
+        depositors = current_work[DepositSearchBuilder.depositor_field]
+
+        return false if depositors.nil?
+
+        depositors.first == current_ability.current_user.user_key
       end
   end
 end