hyrax 2.9.5 → 3.0.0.pre.beta1

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

@@ -15,20 +15,6 @@ module Hyrax::Controller
     hyrax.dashboard_path
   end
 
-  ##
-  # @deprecated this helper is no longer used by Hyrax; if you need access to
-  #   this presenter on every page, you may need to readd it manually.
-  #
-  # A presenter for selecting a work type to create this is needed here because
-  # the selector is in the header on every page.
-  def create_work_presenter
-    Deprecation.warn(self, "The `create_work_presenter` helper is deprecated " \
-                           "for removal in Hyrax 3.0. The work selector has " \
-                           "been removed the masthead in Hyrax 2.1.")
-
-    Hyrax::SelectTypeListPresenter.new(current_user)
-  end
-
   # Ensure that the locale choice is persistent across requests
   def default_url_options
     super.merge(locale: I18n.locale)

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

@@ -29,7 +29,6 @@ module Hyrax
       end
 
       def send_local_file_contents
-        return unless stale?(last_modified: local_file_last_modified, template: false)
         self.status = 200
         prepare_local_file_headers
         # For derivatives stored on the local file system
@@ -66,7 +65,7 @@ module Hyrax
         response.headers['Content-Type'] = local_file_mime_type
         response.headers['Content-Length'] ||= local_file_size.to_s
         # Prevent Rack::ETag from calculating a digest over body
-        response.headers['Last-Modified'] ||= local_file_last_modified.httpdate
+        response.headers['Last-Modified'] = local_file_last_modified.utc.strftime("%a, %d %b %Y %T GMT")
         self.content_type = local_file_mime_type
       end
 

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

@@ -10,11 +10,10 @@ module Hyrax
       with_themed_layout :decide_layout
       copy_blacklight_config_from(::CatalogController)
 
-      class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class, :iiif_manifest_builder
+      class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class
       self.show_presenter = Hyrax::WorkShowPresenter
       self.work_form_service = Hyrax::WorkFormService
       self.search_builder_class = WorkSearchBuilder
-      self.iiif_manifest_builder = (Flipflop.cache_work_iiif_manifest? ? Hyrax::CachingIiifManifestBuilder.new : Hyrax::ManifestBuilderService.new)
       attr_accessor :curation_concern
       helper_method :curation_concern, :contextual_path
 
@@ -128,28 +127,14 @@ module Hyrax
 
     def manifest
       headers['Access-Control-Allow-Origin'] = '*'
-
-      json = iiif_manifest_builder.manifest_for(presenter: iiif_manifest_presenter)
-
       respond_to do |wants|
-        wants.json { render json: json }
-        wants.html { render json: json }
+        wants.json { render json: manifest_builder.to_h }
+        wants.html { render json: manifest_builder.to_h }
       end
     end
 
     private
 
-      def iiif_manifest_builder
-        self.class.iiif_manifest_builder
-      end
-
-      def iiif_manifest_presenter
-        IiifManifestPresenter.new(curation_concern_from_search_results).tap do |p|
-          p.hostname = request.base_url
-          p.ability = current_ability
-        end
-      end
-
       def user_collections
         collections_service.search_results(:deposit)
       end
@@ -172,6 +157,10 @@ module Hyrax
         @form = work_form_service.build(curation_concern, current_ability, self)
       end
 
+      def manifest_builder
+        ::IIIFManifest::ManifestFactory.new(presenter)
+      end
+
       def actor
         @actor ||= Hyrax::CurationConcern.actor
       end

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -50,13 +50,6 @@ module Hyrax
       obj.attributes = work_params(admin_set_id: obj.admin_set_id).except(*visibility_params)
       obj.date_modified = Time.current.ctime
 
-      if params[:visibility]
-        Deprecation.warn(self, "visibility is not submitted by the Hyrax UI and is deprecated " \
-                               "for removal in Hyrax 3.0. Please use " \
-                               "#{form_class.model_name.param_key}[visibility] instead.")
-        obj.visibility = params[:visibility]
-      end
-
       InheritPermissionsJob.perform_now(obj)
       VisibilityCopyJob.perform_now(obj)
 

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

@@ -279,10 +279,10 @@ module Hyrax
           public_files = []
           uploaded_file_ids.each_with_index do |ufi, i|
             if ufi.include?('public')
-              update_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
+              update_logo_info(ufi, params["alttext"][i], params["linkurl"][i])
               public_files << ufi
             else # brand new one, insert in the database
-              logo_info = create_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
+              logo_info = create_logo_info(ufi, params["alttext"][i], params["linkurl"][i])
               public_files << logo_info.local_path
             end
           end
@@ -458,17 +458,6 @@ module Hyrax
         def params_for_query
           params.merge(q: params[:cq])
         end
-
-        # Only accept HTTP|HTTPS urls;
-        # @return <String> the url
-        def verify_linkurl(linkurl)
-          url = Loofah.scrub_fragment(linkurl, :prune).to_s
-          url if valid_url?(url)
-        end
-
-        def valid_url?(url)
-          (url =~ URI.regexp(['http', 'https']))
-        end
     end
   end
 end

data/app/controllers/hyrax/depositors_controller.rb

@@ -45,10 +45,12 @@ module Hyrax
       end
 
       def send_proxy_depositor_added_messages(grantor, grantee)
-        message_to_grantee = "#{grantor.name} has assigned you as a proxy depositor"
-        message_to_grantor = "You have assigned #{grantee.name} as a proxy depositor"
-        Hyrax::MessengerService.deliver(::User.batch_user, grantor, message_to_grantor, "Proxy Depositor Added")
-        Hyrax::MessengerService.deliver(::User.batch_user, grantee, message_to_grantee, "Proxy Depositor Added")
+        message_to_grantee = I18n.t('hyrax.notifications.proxy_depositor_added.grantee_message', grantor: grantor.name)
+        message_to_grantor = I18n.t('hyrax.notifications.proxy_depositor_added.grantor_message', grantee: grantee.name)
+        Hyrax::MessengerService.deliver(::User.batch_user, grantor, message_to_grantor,
+                                        I18n.t('hyrax.notifications.proxy_depositor_added.subject'))
+        Hyrax::MessengerService.deliver(::User.batch_user, grantee, message_to_grantee,
+                                        I18n.t('hyrax.notifications.proxy_depositor_added.subject'))
       end
 
       def decide_layout

data/app/controllers/hyrax/downloads_controller.rb

@@ -43,16 +43,7 @@ module Hyrax
         authorize! :download, params[asset_param_key]
       rescue CanCan::AccessDenied
         unauthorized_image = Rails.root.join("app", "assets", "images", "unauthorized.png")
-        if File.exist? unauthorized_image
-          send_file unauthorized_image, status: :unauthorized
-        else
-          Deprecation.warn(self, "redirect_to default_image is deprecated and will be removed from Hyrax 3.0 (copy unauthorized.png image to directory assets/images instead)")
-          redirect_to default_image
-        end
-      end
-
-      def default_image
-        ActionController::Base.helpers.image_path 'default.png'
+        send_file unauthorized_image, status: :unauthorized
       end
 
       # Overrides Hydra::Controller::DownloadBehavior#load_file, which is hard-coded to assume files are in BasicContainer.

data/app/controllers/hyrax/file_sets_controller.rb

@@ -85,18 +85,13 @@ module Hyrax
           actor.revert_content(params[:revision])
         elsif params.key?(:file_set)
           if params[:file_set].key?(:files)
-            actor.update_content(uploaded_file_from_path)
+            actor.update_content(params[:file_set][:files].first)
           else
             update_metadata
           end
         end
       end
 
-      def uploaded_file_from_path
-        uploaded_file = CarrierWave::SanitizedFile.new(params[:file_set][:files].first)
-        Hyrax::UploadedFile.create(user_id: current_user.id, file: uploaded_file)
-      end
-
       def after_update_response
         respond_to do |wants|
           wants.html do

data/app/controllers/hyrax/single_use_links_controller.rb

@@ -18,22 +18,22 @@ module Hyrax
     end
 
     def create_download
-      @su = SingleUseLink.create itemId: params[:id], path: hyrax.download_path(id: params[:id])
-      render plain: hyrax.download_single_use_link_url(@su.downloadKey)
+      @su = SingleUseLink.create item_id: params[:id], path: hyrax.download_path(id: params[:id])
+      render plain: hyrax.download_single_use_link_url(@su.download_key)
     end
 
     def create_show
-      @su = SingleUseLink.create(itemId: params[:id], path: asset_show_path)
-      render plain: hyrax.show_single_use_link_url(@su.downloadKey)
+      @su = SingleUseLink.create(item_id: params[:id], path: asset_show_path)
+      render plain: hyrax.show_single_use_link_url(@su.download_key)
     end
 
     def index
-      links = SingleUseLink.where(itemId: params[:id]).map { |link| show_presenter.new(link) }
+      links = SingleUseLink.where(item_id: params[:id]).map { |link| show_presenter.new(link) }
       render partial: 'hyrax/file_sets/single_use_link_rows', locals: { single_use_links: links }
     end
 
     def destroy
-      SingleUseLink.find_by_downloadKey(params[:link_id]).destroy
+      SingleUseLink.find_by_download_key(params[:link_id]).destroy
       head :ok
     end
 

data/app/controllers/hyrax/single_use_links_viewer_controller.rb

@@ -18,7 +18,7 @@ module Hyrax
     end
 
     def show
-      _, document_list = search_results(id: single_use_link.itemId)
+      _, document_list = search_results(id: single_use_link.item_id)
       curation_concern = document_list.first
 
       # Authorize using SingleUseLinksViewerController::Ability
@@ -30,7 +30,7 @@ module Hyrax
 
       # create a dowload link that is single use for the user since we do not just want to show metadata we want to access it too
       @su = single_use_link.create_for_path hyrax.download_path(curation_concern.id)
-      @download_link = hyrax.download_single_use_link_path(@su.downloadKey)
+      @download_link = hyrax.download_single_use_link_path(@su.download_key)
     end
 
     private
@@ -51,7 +51,7 @@ module Hyrax
       end
 
       def single_use_link
-        @single_use_link ||= SingleUseLink.find_by_downloadKey!(params[:id])
+        @single_use_link ||= SingleUseLink.find_by_download_key!(params[:id])
       end
 
       def not_found_exception
@@ -59,7 +59,7 @@ module Hyrax
       end
 
       def asset
-        @asset ||= ActiveFedora::Base.find(single_use_link.itemId)
+        @asset ||= ActiveFedora::Base.find(single_use_link.item_id)
       end
 
       def current_ability
@@ -88,7 +88,7 @@ module Hyrax
 
           @single_use_link = single_use_link
           can :read, [ActiveFedora::Base, ::SolrDocument] do |obj|
-            single_use_link.valid? && single_use_link.itemId == obj.id && single_use_link.destroy!
+            single_use_link.valid? && single_use_link.item_id == obj.id && single_use_link.destroy!
           end
         end
       end

data/app/controllers/hyrax/users_controller.rb

@@ -41,7 +41,7 @@ module Hyrax
 
       def find_user
         @user = ::User.from_url_component(params[:id])
-        redirect_to root_path, alert: "User does not exist" unless @user
+        redirect_to root_path, alert: "User '#{params[:id]}' does not exist" if @user.nil?
       end
 
       def sort_value

data/app/forms/hyrax/forms/workflow_responsibility_form.rb

@@ -12,9 +12,9 @@ module Hyrax
         @model ||= Sipity::WorkflowResponsibility.new
       end
 
-      # def to_model
-      #   model_instance
-      # end
+      def to_model
+        model_instance
+      end
 
       delegate :model_name, :to_key, :workflow_role_id, :persisted?, :save!, to: :model_instance
 

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -12,7 +12,6 @@ module Hyrax
     include Hyrax::ChartsHelper
     include Hyrax::DashboardHelperBehavior
     include Hyrax::IiifHelper
-    include Hyrax::WorkFormHelper
 
     # Which translations are available for the user to select
     # @return [Hash<String,String>] locale abbreviations as keys and flags as values

data/app/indexers/hyrax/collection_indexer.rb

@@ -11,7 +11,9 @@ module Hyrax
     def generate_solr_document
       super.tap do |solr_doc|
         # Makes Collections show under the "Collections" tab
-        solr_doc['generic_type_sim'] = ["Collection"]
+        Solrizer.set_field(solr_doc, 'generic_type', 'Collection', :facetable)
+        # Index the size of the collection in bytes
+        solr_doc[Solrizer.solr_name(:bytes, STORED_LONG)] = object.bytes
         solr_doc['visibility_ssi'] = object.visibility
 
         object.in_collections.each do |col|

data/app/indexers/hyrax/deep_indexing_service.rb

@@ -67,13 +67,13 @@ module Hyrax
       # @param [Array] val an array of two elements, first is a string (the uri) and the second is a hash with one key: `:label`
       def append_label_and_uri(solr_doc, solr_field_key, field_info, val)
         val = val.solrize
-        create_and_insert_terms_handler.create_and_insert_terms(solr_field_key,
-                                                                val.first,
-                                                                field_info.behaviors, solr_doc)
+        self.class.create_and_insert_terms(solr_field_key,
+                                           val.first,
+                                           field_info.behaviors, solr_doc)
         return unless val.last.is_a? Hash
-        create_and_insert_terms_handler.create_and_insert_terms("#{solr_field_key}_label",
-                                                                label(val),
-                                                                field_info.behaviors, solr_doc)
+        self.class.create_and_insert_terms("#{solr_field_key}_label",
+                                           label(val),
+                                           field_info.behaviors, solr_doc)
       end
 
       # Use this method to append a string value from a controlled vocabulary field
@@ -83,12 +83,12 @@ module Hyrax
       # @param [Hash] field_info
       # @param [String] val
       def append_label(solr_doc, solr_field_key, field_info, val)
-        create_and_insert_terms_handler.create_and_insert_terms(solr_field_key,
-                                                                val,
-                                                                field_info.behaviors, solr_doc)
-        create_and_insert_terms_handler.create_and_insert_terms("#{solr_field_key}_label",
-                                                                val,
-                                                                field_info.behaviors, solr_doc)
+        self.class.create_and_insert_terms(solr_field_key,
+                                           val,
+                                           field_info.behaviors, solr_doc)
+        self.class.create_and_insert_terms("#{solr_field_key}_label",
+                                           val,
+                                           field_info.behaviors, solr_doc)
       end
 
       # Return a label for the solrized term:
@@ -98,14 +98,5 @@ module Hyrax
       def label(val)
         val.last[:label].split('$').first
       end
-
-      # create_and_insert_terms was moved to ActiveFedora::Indexing::Inserter
-      # in ActiveFedora 12. broker calls to it through here to ensure an
-      # implementation is available
-      def create_and_insert_terms_handler
-        return self.class if self.class.respond_to?(:create_and_insert_terms)
-
-        'ActiveFedora::Indexing::Inserter'.constantize
-      end
   end
 end

data/app/indexers/hyrax/file_set_indexer.rb

@@ -27,8 +27,6 @@ module Hyrax
         solr_doc['duration_tesim']          = object.duration
         solr_doc['sample_rate_tesim']       = object.sample_rate
         solr_doc['original_checksum_tesim'] = object.original_checksum
-        solr_doc['alpha_channels_ssi']      = object.try(:alpha_channels)
-        solr_doc['original_file_id_ssi']    = original_file_id
       end
     end
 
@@ -39,15 +37,6 @@ module Hyrax
         object.original_file.digest.first.to_s
       end
 
-      def original_file_id
-        return unless object.original_file
-        if object.original_file.versions.present?
-          ActiveFedora::File.uri_to_id(object.current_content_version_uri)
-        else
-          object.original_file.id
-        end
-      end
-
       def file_format
         if object.mime_type.present? && object.format_label.present?
           "#{object.mime_type.split('/').last} (#{object.format_label.join(', ')})"

data/app/jobs/import_url_job.rb

@@ -21,19 +21,17 @@ class ImportUrlJob < Hyrax::ApplicationJob
     operation.performing!
     user = User.find_by_user_key(file_set.depositor)
     uri = URI(file_set.import_url)
-    name = file_set.label
-
     @file_set = file_set
     @operation = operation
 
-    unless BrowseEverything::Retriever.can_retrieve?(uri, headers)
+    unless can_retrieve?(uri)
       send_error('Expired URL')
       return false
     end
 
     # @todo Use Hydra::Works::AddExternalFileToFileSet instead of manually
     #       copying the file here. This will be gnarly.
-    copy_remote_file(uri, name, headers) do |f|
+    copy_remote_file(uri, headers) do |f|
       # reload the FileSet once the data is copied since this is a long running task
       file_set.reload
 
@@ -46,16 +44,25 @@ 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
     # metadata.
     # @param uri [URI] the uri of the file to download
-    # @param name [String] the human-readable name of the file
-    # @param headers [Hash] the HTTP headers for the GET request (these may contain an authentication token)
     # @yield [IO] the stream to write to
-    def copy_remote_file(uri, name, headers = {})
-      filename = File.basename(name)
+    def copy_remote_file(uri, headers = {})
+      filename = File.basename(uri.path)
       dir = Dir.mktmpdir
       Rails.logger.debug("ImportUrlJob: Copying <#{uri}> to #{dir}")
 
@@ -85,7 +92,7 @@ class ImportUrlJob < Hyrax::ApplicationJob
     # @param f [IO] the stream to write to
     def write_file(uri, f, headers)
       retriever = BrowseEverything::Retriever.new
-      uri_spec = ActiveSupport::HashWithIndifferentAccess.new(url: uri, headers: headers)
+      uri_spec = { 'url' => uri }.merge(headers)
       retriever.retrieve(uri_spec) do |chunk|
         f.write(chunk)
       end