hyrax 3.0.0.pre.beta2 → 3.0.0.pre.beta3

data/app/models/hyrax/statistic.rb

@@ -33,7 +33,11 @@ module Hyrax
           Rails.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
           return []
         end
-        profile.hyrax__pageview(sort: 'date', start_date: start_date).for_path(path)
+        profile.hyrax__pageview(sort: 'date',
+                                start_date: start_date,
+                                end_date: Date.yesterday,
+                                limit: 10_000)
+               .for_path(path)
       end
 
       private

data/app/models/hyrax/uploaded_file.rb

@@ -10,7 +10,5 @@ module Hyrax
              class_name: 'JobIoWrapper',
              dependent: :destroy
     belongs_to :user, class_name: '::User'
-
-    before_destroy :remove_file!
   end
 end

data/app/models/hyrax/virus_scanner.rb

@@ -0,0 +1,56 @@
+# The default virus scanner Hyrax::Works, ported from hydra_works.
+# If ClamAV is present, it will be used to check for the presence of a virus. If ClamAV is not
+# installed or otherwise not available to your application, Hyrax::Works does no virus checking
+# add assumes files have no viruses.
+#
+# To use a virus checker other than ClamAV:
+#   class MyScanner < Hyrax::Works::VirusScanner
+#     def infected?
+#       my_result = Scanner.check_for_viruses(file)
+#       [return true or false]
+#     end
+#   end
+#
+# Then set Hyrax::Works to use your scanner either in a config file or initializer:
+#   Hyrax::Works.default_system_virus_scanner = MyScanner
+module Hyrax
+  class VirusScanner
+    attr_reader :file
+
+    # @api public
+    # @param file [String]
+    def self.infected?(file)
+      new(file).infected?
+    end
+
+    def initialize(file)
+      @file = file
+    end
+
+    # Override this method to use your own virus checking software
+    # @return [Boolean]
+    def infected?
+      defined?(ClamAV) ? clam_av_scanner : null_scanner
+    end
+
+    def clam_av_scanner
+      scan_result = ClamAV.instance.method(:scanfile).call(file)
+      return false if scan_result.zero?
+      warning "A virus was found in #{file}: #{scan_result}"
+      true
+    end
+
+    # Always return zero if there's nothing available to check for viruses. This means that
+    # we assume all files have no viruses because we can't conclusively say if they have or not.
+    def null_scanner
+      warning "Unable to check #{file} for viruses because no virus scanner is defined"
+      false
+    end
+
+    private
+
+      def warning(msg)
+        Hyrax.logger&.warn(msg)
+      end
+  end
+end

data/app/models/job_io_wrapper.rb

@@ -22,7 +22,7 @@ class JobIoWrapper < ApplicationRecord
   validates :file_set_id, presence: true
 
   after_initialize :static_defaults
-  delegate :read, :size, to: :file
+  delegate :read, to: :file
 
   # Responsible for creating a JobIoWrapper from the given parameters, with a
   # focus on sniffing out attributes from the given :file.
@@ -56,18 +56,39 @@ class JobIoWrapper < ApplicationRecord
     super || extracted_mime_type
   end
 
-  def file_set
-    FileSet.find(file_set_id)
+  def size
+    return file.size.to_s if file.respond_to? :size
+    return file.stat.size.to_s if file.respond_to? :stat
+    nil # unable to determine
+  end
+
+  def file_set(use_valkyrie: false)
+    return FileSet.find(file_set_id) unless use_valkyrie
+    Hyrax.query_service.find_by(id: Valkyrie::ID.new(file_set_id))
   end
 
   def file_actor
     Hyrax::Actors::FileActor.new(file_set, relation.to_sym, user)
   end
 
+  # @return [Hyrax::FileMetadata, FalseClass] the created file metadata on success, false on failure
   def ingest_file
     file_actor.ingest_file(self)
   end
 
+  def to_file_metadata
+    Hyrax::FileMetadata.new(label: original_name,
+                            original_filename: original_name,
+                            mime_type: mime_type,
+                            use: [Valkyrie::Vocab::PCDMUse.OriginalFile])
+  end
+
+  # The magic that switches *once* between local filepath and CarrierWave file
+  # @return [File, StringIO, #read] File-like object ready to #read
+  def file
+    @file ||= (file_from_path || file_from_uploaded_file!)
+  end
+
   private
 
     def extracted_original_name
@@ -80,12 +101,6 @@ class JobIoWrapper < ApplicationRecord
       uploaded_file ? uploaded_file.uploader.content_type : Hydra::PCDM::GetMimeTypeForFile.call(original_name)
     end
 
-    # The magic that switches *once* between local filepath and CarrierWave file
-    # @return [File, StringIO, #read] File-like object ready to #read
-    def file
-      @file ||= (file_from_path || file_from_uploaded_file!)
-    end
-
     # @return [File, StringIO] depending on CarrierWave configuration
     # @raise when uploaded_file *becomes* required but is missing
     def file_from_uploaded_file!

data/app/models/proxy_deposit_request.rb

@@ -88,7 +88,7 @@ class ProxyDepositRequest < ActiveRecord::Base
 
     def send_request_transfer_message_as_part_of_create
       user_link = link_to(sending_user.name, Hyrax::Engine.routes.url_helpers.user_path(sending_user))
-      transfer_link = link_to('transfer requests', Hyrax::Engine.routes.url_helpers.transfers_path)
+      transfer_link = link_to(I18n.t('hyrax.notifications.proxy_deposit_request.transfer_on_create.transfer_link_label'), Hyrax::Engine.routes.url_helpers.transfers_path)
       message = I18n.t('hyrax.notifications.proxy_deposit_request.transfer_on_create.message', user_link: user_link,
                                                                                                transfer_link: transfer_link)
       Hyrax::MessengerService.deliver(::User.batch_user, receiving_user, message,

data/app/models/solr_hit.rb

@@ -0,0 +1,23 @@
+class SolrHit < Delegator
+  def __getobj__
+    @document # return object we are delegating to, required
+  end
+
+  alias static_config __getobj__
+
+  def __setobj__(obj)
+    @document = obj
+  end
+
+  attr_reader :document
+
+  def initialize(document)
+    document = document.with_indifferent_access
+    super
+    @document = document
+  end
+
+  def id
+    document[Hyrax.config.id_field]
+  end
+end

data/app/presenters/hyrax/admin_set_presenter.rb

@@ -7,7 +7,7 @@ module Hyrax
     end
 
     def total_items
-      ActiveFedora::SolrService.count("{!field f=isPartOf_ssim}#{id}")
+      Hyrax::SolrService.count("{!field f=isPartOf_ssim}#{id}")
     end
 
     def total_viewable_items

data/app/presenters/hyrax/characterization_behavior.rb

@@ -5,12 +5,12 @@ module Hyrax
     class_methods do
       def characterization_terms
         [
-          :byte_order, :compression, :height, :width, :height, :color_space,
+          :byte_order, :compression, :height, :width, :color_space,
           :profile_name, :profile_version, :orientation, :color_map, :image_producer,
           :capture_device, :scanning_software, :gps_timestamp, :latitude, :longitude,
           :file_format, :file_title, :page_count, :duration, :sample_rate,
           :format_label, :file_size, :filename, :well_formed, :last_modified,
-          :original_checksum, :mime_type
+          :original_checksum, :mime_type, :alpha_channels
         ]
       end
     end

data/app/presenters/hyrax/displays_image.rb

@@ -11,19 +11,24 @@ module Hyrax
     # @return [IIIFManifest::DisplayImage] the display image required by the manifest builder.
     def display_image
       return nil unless ::FileSet.exists?(id) && solr_document.image? && current_ability.can?(:read, id)
-      # @todo this is slow, find a better way (perhaps index iiif url):
-      original_file = ::FileSet.find(id).original_file
+
+      latest_file_id = lookup_original_file_id
+
+      return nil unless latest_file_id
 
       url = Hyrax.config.iiif_image_url_builder.call(
-        original_file.id,
+        latest_file_id,
         request.base_url,
-        Hyrax.config.iiif_image_size_default
+        Hyrax.config.iiif_image_size_default,
+        format: image_format(alpha_channels)
       )
+
       # @see https://github.com/samvera-labs/iiif_manifest
       IIIFManifest::DisplayImage.new(url,
-                                     width: 640,
-                                     height: 480,
-                                     iiif_endpoint: iiif_endpoint(original_file.id))
+                                     format: image_format(alpha_channels),
+                                     width: width,
+                                     height: height,
+                                     iiif_endpoint: iiif_endpoint(latest_file_id))
     end
 
     private
@@ -35,5 +40,18 @@ module Hyrax
           profile: Hyrax.config.iiif_image_compliance_level_uri
         )
       end
+
+      def image_format(channels)
+        channels&.include?('rgba') ? 'png' : 'jpg'
+      end
+
+      def lookup_original_file_id
+        result = original_file_id
+        if result.blank?
+          Rails.logger.warn "original_file_id for #{id} not found, falling back to Fedora."
+          result = Hyrax::VersioningService.versioned_file_id ::FileSet.find(id).original_file
+        end
+        result
+      end
   end
 end

data/app/presenters/hyrax/file_set_presenter.rb

@@ -30,6 +30,7 @@ module Hyrax
              :embargo_release_date, :lease_expiration_date,
              :depositor, :keyword, :title_or_label, :keyword,
              :date_created, :date_modified, :itemtype,
+             :original_file_id,
              to: :solr_document
 
     def single_use_links
@@ -96,9 +97,8 @@ module Hyrax
       end
 
       def fetch_parent_presenter
-        ids = ActiveFedora::SolrService.query("{!field f=member_ids_ssim}#{id}",
-                                              fl: ActiveFedora.id_field)
-                                       .map { |x| x.fetch(ActiveFedora.id_field) }
+        ids = Hyrax::SolrService.query("{!field f=member_ids_ssim}#{id}", fl: Hyrax.config.id_field)
+                                .map { |x| x.fetch(Hyrax.config.id_field) }
         Hyrax::PresenterFactory.build_for(ids: ids,
                                           presenter_class: WorkShowPresenter,
                                           presenter_args: current_ability).first

data/app/presenters/hyrax/member_presenter_factory.rb

@@ -39,10 +39,10 @@ module Hyrax
     # TODO: Extract this to ActiveFedora::Aggregations::ListSource
     def ordered_ids
       @ordered_ids ||= begin
-                         ActiveFedora::SolrService.query("proxy_in_ssi:#{id}",
-                                                         rows: 10_000,
-                                                         fl: "ordered_targets_ssim")
-                                                  .flat_map { |x| x.fetch("ordered_targets_ssim", []) }
+                         Hyrax::SolrService.query("proxy_in_ssi:#{id}",
+                                                  rows: 10_000,
+                                                  fl:   "ordered_targets_ssim")
+                                           .flat_map { |x| x.fetch("ordered_targets_ssim", []) }
                        end
     end
 
@@ -53,11 +53,11 @@ module Hyrax
       # Arbitrarily maxed at 10 thousand; had to specify rows due to solr's default of 10
       def file_set_ids
         @file_set_ids ||= begin
-                            ActiveFedora::SolrService.query("{!field f=has_model_ssim}FileSet",
-                                                            rows: 10_000,
-                                                            fl: ActiveFedora.id_field,
-                                                            fq: "{!join from=ordered_targets_ssim to=id}id:\"#{id}/list_source\"")
-                                                     .flat_map { |x| x.fetch(ActiveFedora.id_field, []) }
+                            Hyrax::SolrService.query("{!field f=has_model_ssim}FileSet",
+                                                     rows: 10_000,
+                                                     fl:   Hyrax.config.id_field,
+                                                     fq:   "{!join from=ordered_targets_ssim to=id}id:\"#{id}/list_source\"")
+                                              .flat_map { |x| x.fetch(Hyrax.config.id_field, []) }
                           end
       end
 

data/app/presenters/hyrax/presenter_factory.rb

@@ -56,10 +56,7 @@ module Hyrax
 
       # Query solr using POST so that the query doesn't get too large for a URI
       def query(query, args = {})
-        args[:q] = query
-        args[:qt] = 'standard'
-        conn = ActiveFedora::SolrService.instance.conn
-        result = conn.post('select', data: args)
+        result = Hyrax::SolrService.post(query, args)
         result.fetch('response').fetch('docs')
       end
   end

data/app/presenters/hyrax/trophy_presenter.rb

@@ -13,7 +13,7 @@ module Hyrax
     # @return [Array<TrophyPresenter>] a list of all the trophy presenters for the user
     def self.find_by_user(user)
       work_ids = user.trophies.pluck(:work_id)
-      query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids(work_ids)
+      query = Hyrax::SolrQueryBuilderService.construct_query_for_ids(work_ids)
       results = Hyrax::WorkRelation.new.search_with_conditions(query)
       results.map { |result| TrophyPresenter.new(document_model.new(result)) }
     rescue RSolr::Error::ConnectionRefused

data/app/presenters/hyrax/work_show_presenter.rb

@@ -15,7 +15,7 @@ module Hyrax
 
     # delegate fields from Hyrax::Works::Metadata to solr_document
     delegate :based_near_label, :related_url, :depositor, :identifier, :resource_type,
-             :keyword, :itemtype, :admin_set, :rights_notes, to: :solr_document
+             :keyword, :itemtype, :admin_set, :rights_notes, :access_right, :abstract, to: :solr_document
 
     # @param [SolrDocument] solr_document
     # @param [Ability] current_ability
@@ -39,7 +39,7 @@ module Hyrax
     delegate :title, :date_created, :description,
              :creator, :contributor, :subject, :publisher, :language, :embargo_release_date,
              :lease_expiration_date, :license, :source, :rights_statement, :thumbnail_id, :representative_id,
-             :rendering_ids, :member_of_collection_ids, to: :solr_document
+             :rendering_ids, :member_of_collection_ids, :alt_title, to: :solr_document
 
     def workflow
       @workflow ||= WorkflowPresenter.new(solr_document, current_ability)
@@ -116,7 +116,7 @@ module Hyrax
     end
 
     def link_name
-      current_ability.can?(:read, id) ? to_s : 'File'
+      current_ability.can?(:read, id) ? to_s : 'Private'
     end
 
     def export_as_nt

data/app/renderers/hyrax/renderers/faceted_attribute_renderer.rb

@@ -12,7 +12,7 @@ module Hyrax
         end
 
         def search_field
-          ERB::Util.h(ActiveFedora.index_field_mapper.solr_name(options.fetch(:search_field, field), :facetable, type: :string))
+          ERB::Util.h(options.fetch(:search_field, field).to_s + "_sim")
         end
     end
   end

data/app/search_builders/hyrax/catalog_search_builder.rb

@@ -79,6 +79,6 @@ class Hyrax::CatalogSearchBuilder < Hyrax::SearchBuilder
 
     # join from file id to work relationship solrized file_set_ids_ssim
     def join_for_works_from_files
-      "{!join from=#{ActiveFedora.id_field} to=file_set_ids_ssim}#{dismax_query}"
+      "{!join from=#{Hyrax.config.id_field} to=file_set_ids_ssim}#{dismax_query}"
     end
 end

data/app/search_builders/hyrax/collection_search_builder.rb

@@ -19,7 +19,7 @@ module Hyrax
 
     # @return [String] Solr field name indicating default sort order
     def sort_field
-      ActiveFedora.index_field_mapper.solr_name('title', :sortable)
+      "title_si"
     end
 
     # This overrides the models in FilterByType

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

@@ -26,8 +26,8 @@ module Hyrax
       def show_only_other_collections_of_the_same_collection_type(solr_parameters)
         solr_parameters[:fq] ||= []
         solr_parameters[:fq] += [
-          "-" + ActiveFedora::SolrQueryBuilder.construct_query_for_ids(limit_ids),
-          ActiveFedora::SolrQueryBuilder.construct_query(Collection.collection_type_gid_document_field_name => @collection.collection_type_gid)
+          "-" + Hyrax::SolrQueryBuilderService.construct_query_for_ids([limit_ids]),
+          Hyrax::SolrQueryBuilderService.construct_query(Collection.collection_type_gid_document_field_name => @collection.collection_type_gid)
         ]
         solr_parameters[:fq] += limit_clause if limit_clause # add limits to prevent illegal nesting arrangements
       end

data/app/search_builders/hyrax/deposit_search_builder.rb

@@ -17,7 +17,7 @@ module Hyrax
     end
 
     def self.depositor_field
-      @depositor_field ||= ActiveFedora.index_field_mapper.solr_name('depositor', :symbol).freeze
+      "depositor_ssim"
     end
 
     private

data/app/search_builders/hyrax/my/find_works_search_builder.rb

@@ -14,28 +14,24 @@ class Hyrax::My::FindWorksSearchBuilder < Hyrax::My::SearchBuilder
 
   def filter_on_title(solr_parameters)
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq] += [ActiveFedora::SolrQueryBuilder.construct_query(title_tesim: @q)]
+    solr_parameters[:fq] += [Hyrax::SolrQueryBuilderService.construct_query(title_tesim: @q)]
   end
 
   def show_only_other_works(solr_parameters)
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq] += [
-      "-" + ActiveFedora::SolrQueryBuilder.construct_query_for_ids([@id])
-    ]
+    solr_parameters[:fq] += ["-#{Hyrax::SolrQueryBuilderService.construct_query_for_ids([@id])}"]
   end
 
   def show_only_works_not_child(solr_parameters)
-    ids = ActiveFedora::SolrService.query("{!field f=id}#{@id}", fl: "member_ids_ssim", rows: 10_000).flat_map { |x| x.fetch("member_ids_ssim", []) }
+    ids = Hyrax::SolrService.query("{!field f=id}#{@id}", fl: "member_ids_ssim", rows: 10_000).flat_map { |x| x.fetch("member_ids_ssim", []) }
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq]  += [
-      "-" + ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids)
-    ]
+    solr_parameters[:fq] += ["-#{Hyrax::SolrQueryBuilderService.construct_query_for_ids([ids])}"]
   end
 
   def show_only_works_not_parent(solr_parameters)
     solr_parameters[:fq] ||= []
     solr_parameters[:fq]  += [
-      "-" + ActiveFedora::SolrQueryBuilder.construct_query(member_ids_ssim: @id)
+      "-" + Hyrax::SolrQueryBuilderService.construct_query(member_ids_ssim: @id)
     ]
   end