hyrax 1.1.1 → 2.0.0.beta1

data/app/presenters/hyrax/embargo_presenter.rb

@@ -12,7 +12,7 @@ module Hyrax
     end
 
     def embargo_release_date
-      Date.parse(solr_document.embargo_release_date).to_formatted_s(:rfc822)
+      solr_document.embargo_release_date.to_formatted_s(:rfc822)
     end
 
     def visibility_after_embargo

data/app/presenters/hyrax/file_set_presenter.rb

@@ -25,7 +25,7 @@ module Hyrax
 
     # Metadata Methods
     delegate :title, :label, :description, :creator, :contributor, :subject,
-             :publisher, :language, :date_uploaded, :rights,
+             :publisher, :language, :date_uploaded,
              :embargo_release_date, :lease_expiration_date,
              :depositor, :keyword, :title_or_label, :keyword,
              :date_created, :date_modified, :itemtype,
@@ -55,17 +55,12 @@ module Hyrax
     end
 
     def tweeter
-      user = ::User.find_by_user_key(depositor)
-      if user.try(:twitter_handle).present?
-        "@#{user.twitter_handle}"
-      else
-        I18n.translate('hyrax.product_twitter_handle')
-      end
+      TwitterPresenter.twitter_handle_for(user_key: depositor)
     end
 
-    def rights
-      return if solr_document.rights.nil?
-      solr_document.rights.first
+    def license
+      return if solr_document.license.nil?
+      solr_document.license.first
     end
 
     def stats_path
@@ -81,21 +76,21 @@ module Hyrax
       solr_document.to_model.model_name.name
     end
 
-    def audit_status
-      audit_service.logged_audit_status
+    def fixity_check_status
+      Hyrax::FixityStatusPresenter.new(id).render_file_set_status
     end
 
     def parent
       ids = ActiveFedora::SolrService.query("{!field f=member_ids_ssim}#{id}",
                                             fl: ActiveFedora.id_field)
                                      .map { |x| x.fetch(ActiveFedora.id_field) }
-      @parent_presenter ||= Hyrax::PresenterFactory.build_presenters(ids,
-                                                                     WorkShowPresenter,
-                                                                     current_ability).first
+      @parent_presenter ||= Hyrax::PresenterFactory.build_for(ids: ids,
+                                                              presenter_class: WorkShowPresenter,
+                                                              presenter_args: current_ability).first
     end
 
-    def audit_service
-      @audit_service ||= Hyrax::FileSetAuditService.new(id)
+    def fixity_check_service
+      @fixity_check_service ||= Hyrax::FileSetFixityCheckService.new(id)
     end
 
     private

data/app/presenters/hyrax/fixity_status_presenter.rb

@@ -0,0 +1,89 @@
+module Hyrax
+  # Creates fixity status messages to display to user, for a fileset.
+  # Determines status by looking up existing recorded ChecksumAuditLog objects,
+  # does not actually do a check itself.
+  #
+  # See FileSetFixityCheckService and ChecksumAuditLog for actually performing
+  # checks and recording as ChecksumAuditLog objects.
+  class FixityStatusPresenter
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::TextHelper
+    include ActionView::Helpers::OutputSafetyHelper
+
+    attr_reader :file_set_id, :relevant_log_records
+    # Note this takes a file_set_id NOT a FileSet, easy use from either solr
+    # or AF object.
+    def initialize(file_set_id)
+      @file_set_id = file_set_id
+    end
+
+    # Returns a html_safe string communicating fixity status checks,
+    # possibly on multiple files/versions.
+    def render_file_set_status
+      @file_set_status ||=
+        if relevant_log_records.empty?
+          "Fixity checks have not yet been run on this object"
+        elsif failing_checks.empty?
+          content_tag("span", "passed", class: "label label-success") + ' ' + render_existing_check_summary
+        else
+          content_tag("span", "FAIL", class: "label label-danger") + ' ' + render_existing_check_summary + render_failed_compact
+        end
+    end
+
+    protected
+
+      # A weird display, cause we need it to fit in that 180px column on
+      # FileSet show, and have no real UI to link to for files/versions :(
+      # rubocop:disable Metrics/MethodLength
+      def render_failed_compact
+        safe_join(
+          ["<p><strong>Failed checks:</strong></p>".html_safe] +
+          failing_checks.collect do |log|
+            safe_join(
+              [
+                "<p>".html_safe,
+                "ChecksumAuditLog id: #{log.id}; ",
+                content_tag("a", "file", href: "#{Hydra::PCDM::File.translate_id_to_uri.call(log.file_id)}/fcr:metadata") + "; ",
+                content_tag("a", "checked_uri", href: "#{log.checked_uri}/fcr:metadata") + "; ",
+                "date: #{log.created_at}; ",
+                "expected_result: #{log.expected_result}",
+                "</p>".html_safe
+              ]
+            )
+          end
+        )
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      def render_existing_check_summary
+        @render_existing_check_summary ||=
+          "#{pluralize num_checked_files, 'File'} with #{pluralize relevant_log_records.count, 'total version'} checked #{render_date_range}"
+      end
+
+      def render_date_range
+        @render_date_range ||= begin
+          from = relevant_log_records.min_by(&:created_at).created_at.to_s
+          to   = relevant_log_records.max_by(&:created_at).created_at.to_s
+          if from == to
+            from
+          else
+            "between #{from} and #{to}"
+          end
+        end
+      end
+
+      # 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)
+      end
+
+      def num_checked_files
+        @num_relevant_files ||= relevant_log_records.group_by(&:file_id).keys.count
+      end
+
+      def failing_checks
+        @failing_checks ||= relevant_log_records.find_all(&:failed?)
+      end
+  end
+end

data/app/presenters/hyrax/homepage_presenter.rb

@@ -1,13 +1,25 @@
 module Hyrax
   class HomepagePresenter
-    attr_reader :current_ability
+    attr_reader :current_ability, :collections
 
-    def initialize(current_ability)
+    def initialize(current_ability, collections)
       @current_ability = current_ability
+      @collections = collections
     end
 
+    # @return [Boolean] If the current user is a guest and the display_share_button_when_not_logged_in?
+    #   is activated, then return true. Otherwise return true if the signed in
+    #   user has permission to create at least one kind of work.
     def display_share_button?
-      Hyrax.config.always_display_share_button? || current_ability.can_create_any_work?
+      (user_unregistered? && Hyrax.config.display_share_button_when_not_logged_in?) ||
+        current_ability.can_create_any_work?
     end
+
+    private
+
+      def user_unregistered?
+        current_ability.current_user.new_record? ||
+          current_ability.current_user.guest?
+      end
   end
 end

data/app/presenters/hyrax/lease_presenter.rb

@@ -13,7 +13,7 @@ module Hyrax
 
     def lease_expiration_date
       if solr_document.lease_expiration_date
-        Date.parse(solr_document.lease_expiration_date).to_formatted_s(:rfc822)
+        solr_document.lease_expiration_date.to_formatted_s(:rfc822)
       else
         solr_document.keys
       end

data/app/presenters/hyrax/member_presenter_factory.rb

@@ -21,7 +21,9 @@ module Hyrax
     # @param [Class] presenter_class the type of presenter to build
     # @return [Array<presenter_class>] presenters for the ordered_members (not filtered by class)
     def member_presenters(ids = ordered_ids, presenter_class = composite_presenter_class)
-      PresenterFactory.build_presenters(ids, presenter_class, *presenter_factory_arguments)
+      PresenterFactory.build_for(ids: ids,
+                                 presenter_class: presenter_class,
+                                 presenter_args: presenter_factory_arguments)
     end
 
     # @return [Array<FileSetPresenter>] presenters for the orderd_members that are FileSets

data/app/presenters/hyrax/menu_presenter.rb

@@ -8,23 +8,40 @@ module Hyrax
     attr_reader :view_context
 
     delegate :controller, :controller_name, :action_name, :content_tag,
-             :current_page?, :link_to, to: :view_context
+             :current_page?, :link_to, :can?, to: :view_context
 
     # Returns true if the current controller happens to be one of the controllers that deals
-    # with workflow.  This is used to keep the parent section on the sidebar open.
-    def workflows_section?
-      controller.instance_of? Hyrax::Admin::WorkflowRolesController
+    # with settings.  This is used to keep the parent section on the sidebar open.
+    def settings_section?
+      %w[appearances content_blocks features pages].include?(controller_name)
     end
 
-    def nav_link(href, **link_options)
-      list_options = current_page?(href) ? { class: 'active' } : {}
+    # @param options [Hash, String] a hash or string representing the path. Hash is prefered as it
+    #                              allows us to workaround https://github.com/rails/rails/issues/28253
+    # @param also_active_for [Hash, String] a hash or string with alternative paths that should be 'active'
+    def nav_link(options, also_active_for: nil, **link_html_options)
+      active_urls = [options, also_active_for].compact
+      list_options = active_urls.any? { |url| current_page?(url) } ? { class: 'active' } : {}
       content_tag(:li, list_options) do
-        link_to(href, link_options) do
+        link_to(options, link_html_options) do
           yield
         end
       end
     end
 
+    # @return [Boolean] true if the current controller happens to be one of the controllers that deals
+    # with user activity  This is used to keep the parent section on the sidebar open.
+    def user_activity_section?
+      # we're using a case here because we need to differentiate UsersControllers
+      # in different namespaces (Hyrax & Admin)
+      case controller
+      when Hyrax::UsersController, Hyrax::NotificationsController, Hyrax::TransfersController
+        true
+      else
+        false
+      end
+    end
+
     # Draw a collaspable menu section. The passed block should contain <li> items.
     def collapsable_section(text, id:, icon_class:, open:, &block)
       CollapsableSectionPresenter.new(view_context: view_context,
@@ -33,5 +50,12 @@ module Hyrax
                                       icon_class: icon_class,
                                       open: open).render(&block)
     end
+
+    # @return [Boolean] will the configuration section be displayed to the user
+    def show_configuration?
+      can?(:update, :appearance) ||
+        can?(:manage, Sipity::WorkflowResponsibility) ||
+        can?(:manage, Hyrax::Feature)
+    end
   end
 end

data/app/presenters/hyrax/permission_badge.rb

@@ -2,10 +2,17 @@ module Hyrax
   class PermissionBadge
     include ActionView::Helpers::TagHelper
 
-    # @param visibility_or_document [String,#visibility] the current visibility or an object
-    #                                                    that has a method returning visibility
-    def initialize(visibility_or_document)
-      self.visibility = visibility_or_document
+    VISIBILITY_LABEL_CLASS = {
+      authenticated: "label-info",
+      embargo: "label-warning",
+      lease: "label-warning",
+      open: "label-success",
+      restricted: "label-danger"
+    }.freeze
+
+    # @param visibility [String] the current visibility
+    def initialize(visibility)
+      @visibility = visibility
     end
 
     # Draws a span tag with styles for a bootstrap label
@@ -15,17 +22,8 @@ module Hyrax
 
     private
 
-      def visibility=(visibility_or_document)
-        @visibility = if visibility_or_document.respond_to?(:visibility)
-                        Deprecation.warn(self, "PermissionBadge#visibility= no longer accepts a document, pass the visibility string instead. This will be removed in Hyrax 2.0")
-                        visibility_or_document.visibility
-                      else
-                        visibility_or_document
-                      end
-      end
-
       def dom_label_class
-        I18n.t("hyrax.visibility.#{@visibility}.class")
+        VISIBILITY_LABEL_CLASS.fetch(@visibility.to_sym)
       end
 
       def text

data/app/presenters/hyrax/presenter_factory.rb

@@ -1,21 +1,40 @@
 module Hyrax
+  # Responsible building an Array of presenters based on IDs and presenter class given
+  # @todo Extract a SolrDocument finder class that takes a list of pids and returns/yields a ::SolrDocument for each hit in SOLR.
+  # @note The given IDs are loaded from SOLR
   class PresenterFactory
     class << self
+      # @todo Convert to find and yield only the found SOLR documents. There is a coupling of knowledge regarding the building of the presenter class and its parameters.
+      # @todo We are looping through SOLR docs three times; Can this be compressed into a single loop
+      #
+      # @param [Array] ids the list of ids to load
+      # @param [Class] presenter_class the class of presenter to make
+      # @param [Array] presenter_args any other arguments to pass to the presenters
+      # @return [Array] presenters for the documents in order of the ids (as given)
+      def build_for(ids:, presenter_class:, presenter_args: [])
+        new(ids: ids, presenter_class: presenter_class, presenter_args: presenter_args).build
+      end
+
+      # @deprecated use .build_for instead
       # @param [Array] ids the list of ids to load
       # @param [Class] klass the class of presenter to make
       # @param [Array] args any other arguments to pass to the presenters
       # @return [Array] presenters for the documents in order of the ids
       def build_presenters(ids, klass, *args)
-        new(ids, klass, *args).build
+        Deprecation.warn(self, "build_presenters is deprecated and will be removed from Hyrax 3.0 (use .build_for instead)")
+        build_for(ids: ids, presenter_class: klass, presenter_args: args)
       end
     end
 
-    attr_reader :ids, :klass, :args
+    attr_reader :ids, :presenter_class, :presenter_args
+    alias klass presenter_class
+    deprecation_deprecate klass: "use #presenter_class instead"
 
-    def initialize(ids, klass, *args)
+    def initialize(ids:, presenter_class:, presenter_args:)
       @ids = ids
-      @klass = klass
-      @args = args
+      @presenter_class = presenter_class
+      # In moving from splat args to named parameters, passing the parameters is a bit off.
+      @presenter_args = presenter_args.nil? ? [nil] : presenter_args
     end
 
     def build
@@ -23,7 +42,7 @@ module Hyrax
       docs = load_docs
       ids.map do |id|
         solr_doc = docs.find { |doc| doc.id == id }
-        klass.new(solr_doc, *args) if solr_doc
+        presenter_class.new(solr_doc, *presenter_args) if solr_doc
       end.compact
     end
 

data/app/presenters/hyrax/presenter_renderer.rb

@@ -21,7 +21,7 @@ module Hyrax
       @view_context.safe_join(terms.map { |term| yield self, term })
     end
 
-    protected
+    private
 
       def render_show_field_partial(field_name, locals)
         partial = find_field_partial(field_name)

data/app/presenters/hyrax/select_type_presenter.rb

@@ -18,6 +18,22 @@ module Hyrax
       translate('name')
     end
 
+    def switch_to_new_work_path(route_set:, params:)
+      if params.key?(:add_works_to_collection)
+        route_set.new_polymorphic_path(concern, add_works_to_collection: params[:add_works_to_collection])
+      else
+        route_set.new_polymorphic_path(concern)
+      end
+    end
+
+    def switch_to_batch_upload_path(route_set:, params:)
+      if params.key?(:add_works_to_collection)
+        route_set.new_batch_upload_path(payload_concern: concern, add_works_to_collection: params[:add_works_to_collection])
+      else
+        route_set.new_batch_upload_path(payload_concern: concern)
+      end
+    end
+
     private
 
       def object_name

data/app/presenters/hyrax/transfers_presenter.rb

@@ -0,0 +1,37 @@
+module Hyrax
+  class TransfersPresenter
+    def initialize(current_user, view_context)
+      @current_user = current_user
+      @view_context = view_context
+    end
+
+    def render_sent_transfers
+      if outgoing_proxy_deposits.present?
+        render 'hyrax/transfers/sent', outgoing_proxy_deposits: outgoing_proxy_deposits
+      else
+        t('hyrax.dashboard.no_transfers')
+      end
+    end
+
+    def render_received_transfers
+      if incoming_proxy_deposits.present?
+        render 'hyrax/transfers/received', incoming_proxy_deposits: incoming_proxy_deposits
+      else
+        t('hyrax.dashboard.no_transfer_requests')
+      end
+    end
+
+    private
+
+      attr_reader :current_user, :view_context, :since
+      delegate :render, :t, to: :view_context
+
+      def incoming_proxy_deposits
+        @incoming ||= ProxyDepositRequest.incoming_for(user: current_user)
+      end
+
+      def outgoing_proxy_deposits
+        @outgoing ||= ProxyDepositRequest.outgoing_for(user: current_user)
+      end
+  end
+end

data/app/presenters/hyrax/trophy_presenter.rb

@@ -7,7 +7,7 @@ module Hyrax
 
     attr_reader :solr_document
 
-    delegate :to_s, to: :solr_document
+    delegate :to_s, :thumbnail_path, to: :solr_document
 
     # @param user [User] the user to find the TrophyPresentes for.
     # @return [Array<TrophyPresenter>] a list of all the trophy presenters for the user
@@ -20,10 +20,6 @@ module Hyrax
       []
     end
 
-    def thumbnail_path
-      solr_document[CatalogController.blacklight_config.index.thumbnail_field]
-    end
-
     def self.document_model
       CatalogController.blacklight_config.document_model
     end