hyrax 5.0.0.rc1 → 5.0.0.rc3

data/app/services/hyrax/statistics/collections/over_time.rb

@@ -7,7 +7,7 @@ module Hyrax
 
         def relation
           AbstractTypeRelation
-            .new(allowable_types: [Hyrax.config.collection_class])
+            .new(allowable_types: Hyrax::ModelRegistry.collection_classes)
         end
       end
     end

data/app/services/hyrax/statistics/query_service.rb

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 module Hyrax
   module Statistics
+    ##
+    # @deprecated for removal in 6.0.0
     class QueryService
+      extend Deprecation
+      self.deprecation_horizon = 'hyrax version 6.0.0'
+      deprecation_deprecate :initialize
+
       # query to find works created during the time range
       # @param [DateTime] start_datetime starting date time for range query
       # @param [DateTime] end_datetime ending date time for range query

data/app/services/hyrax/valkyrie_persist_derivatives.rb

@@ -32,7 +32,7 @@ module Hyrax
 
       filename = filename(directives)
       Hyrax.logger.debug "Uploading derivative for FileSet #{file_set.id} as #{filename}"
-      uploader.upload(io: tmpfile, filename: filename, file_set: file_set, use: file_metadata(directives))
+      uploader.upload(io: tmpfile, filename: filename, file_set: file_set, use: file_metadata(directives), mime_type: directives[:mime_type])
     end
 
     # The filepath will look something like
@@ -43,9 +43,16 @@ module Hyrax
     # @return [Hyrax::FileSet]
     def self.fileset_for_directives(directives)
       path = URI(directives.fetch(:url)).path
-      id = path.sub(Hyrax.config.derivatives_path.to_s, "")
-               .delete('/')
-               .match(/^(.*)-\w*(\.\w+)*$/) { |m| m[1] }
+      # checks if it's a file path, else assuming it is already an id
+      # Hyrax::FileSetDerivativesService#extract_full_text passes in the raw uri
+      # and not a derivative_url like the other derivative formats
+      id = if path.include?("/")
+             path.sub(Hyrax.config.derivatives_path.to_s, "")
+                 .delete('/')
+                 .match(/^(.*)-\w*(\.\w+)*$/) { |m| m[1] }
+           else
+             path
+           end
       raise "Could not extract fileset id from path #{path}" unless id
 
       Hyrax.metadata_adapter.query_service.find_by(id: id)
@@ -59,7 +66,7 @@ module Hyrax
       if directives.key?(:container)
         "Hyrax::FileMetadata::Use::#{directives[:container].upcase}".constantize
       else
-        Hyrax::FileMetadata::Use::THUMBNAIL
+        Hyrax::FileMetadata::Use::THUMBNAIL_IMAGE
       end
     end
   end

data/app/services/hyrax/valkyrie_upload.rb

@@ -34,12 +34,15 @@ class Hyrax::ValkyrieUpload
     @storage_adapter = storage_adapter
   end
 
-  def upload(filename:, file_set:, io:, use: Hyrax::FileMetadata::Use::ORIGINAL_FILE, user: nil)
+  def upload(filename:, file_set:, io:, use: Hyrax::FileMetadata::Use::ORIGINAL_FILE, user: nil, mime_type: nil) # rubocop:disable Metrics/AbcSize
+    return version_upload(file_set: file_set, io: io, user: user) if use == Hyrax::FileMetadata::Use::ORIGINAL_FILE && file_set.original_file_id && storage_adapter.supports?(:versions)
     streamfile = storage_adapter.upload(file: io, original_filename: filename, resource: file_set)
     file_metadata = Hyrax::FileMetadata(streamfile)
     file_metadata.file_set_id = file_set.id
     file_metadata.pcdm_use = [use]
     file_metadata.recorded_size = [io.size]
+    file_metadata.mime_type = mime_type if mime_type
+    file_metadata.original_filename = File.basename(filename).to_s || File.basename(io)
 
     if use == Hyrax::FileMetadata::Use::ORIGINAL_FILE
       # Set file set label.
@@ -52,17 +55,24 @@ class Hyrax::ValkyrieUpload
 
     saved_metadata = Hyrax.persister.save(resource: file_metadata)
     saved_metadata.original_filename = filename if saved_metadata.original_filename.blank?
-    Hyrax.publisher.publish("file.uploaded", metadata: saved_metadata)
 
     add_file_to_file_set(file_set: file_set,
                          file_metadata: saved_metadata,
                          user: user)
 
+    Hyrax.publisher.publish("file.uploaded", metadata: saved_metadata)
     Hyrax.publisher.publish('file.metadata.updated', metadata: saved_metadata, user: user)
 
     saved_metadata
   end
 
+  def version_upload(file_set:, io:, user:)
+    file_metadata = Hyrax.query_service.custom_queries.find_file_metadata_by(id: file_set.original_file_id)
+    Hyrax::VersioningService.create(file_metadata, user, io)
+    Hyrax.publisher.publish("file.uploaded", metadata: file_metadata)
+    ContentNewVersionEventJob.perform_later(file_set, user)
+  end
+
   # @param [Hyrax::FileSet] file_set the file set to add to
   # @param [Hyrax::FileMetadata] file_metadata the metadata object representing
   #   the file to add
@@ -70,32 +80,8 @@ class Hyrax::ValkyrieUpload
   #
   # @return [Hyrax::FileSet] updated file set
   def add_file_to_file_set(file_set:, file_metadata:, user:)
-    file_set.file_ids << file_metadata.id
-    set_file_use_ids(file_set, file_metadata)
-
+    file_set.file_ids += [file_metadata.id]
     Hyrax.persister.save(resource: file_set)
     Hyrax.publisher.publish('object.membership.updated', object: file_set, user: user)
   end
-
-  private
-
-  # @api private
-  # @param [Hyrax::FileSet] file_set the file set to add to
-  # @param [Hyrax::FileMetadata] file_metadata the metadata object representing
-  #   the file to add
-  # @return [void]
-  def set_file_use_ids(file_set, file_metadata)
-    file_metadata.pcdm_use.each do |type|
-      case type
-      when Hyrax::FileMetadata::Use::ORIGINAL_FILE
-        file_set.original_file_id = file_metadata.id
-      when Hyrax::FileMetadata::Use::THUMBNAIL
-        file_set.thumbnail_id = file_metadata.id
-      when Hyrax::FileMetadata::Use::EXTRACTED_TEXT
-        file_set.extracted_text_id = file_metadata.id
-      else
-        Hyrax.logger.warn "Unknown file use #{file_metadata.type} specified for #{file_metadata.file_identifier}"
-      end
-    end
-  end
 end

data/app/services/hyrax/versioning_service.rb

@@ -32,14 +32,12 @@ module Hyrax
     # If the resource is nil, or if it is a Hyrax::FileMetadata and versioning
     # is not supported in the storage adapter, an empty array will be returned.
     def versions
-      if resource.nil?
+      if !supports_multiple_versions?
         []
       elsif resource.is_a?(Hyrax::FileMetadata)
-        if storage_adapter.try(:"supports?", :versions)
-          storage_adapter.find_versions(id: resource.file_identifier).to_a
-        else
-          []
-        end
+        # Reverse - Valkyrie puts these most recent first, we assume most recent
+        # last.
+        storage_adapter.find_versions(id: resource.file_identifier).to_a.reverse
       else
         return resource.versions if resource.versions.is_a?(Array)
         resource.versions.all.to_a
@@ -53,6 +51,16 @@ module Hyrax
       versions.last
     end
 
+    ##
+    # Returns whether support for multiple versions exists on this
+    # +Hyrax::VersioningService+.
+    #
+    # Versioning is unsupported on nil resources or on Valkyrie resources when
+    # the configured storage adapter does not advertise versioning support.
+    def supports_multiple_versions?
+      !(resource.nil? || resource.is_a?(Hyrax::FileMetadata) && !storage_adapter.try(:"supports?", :versions))
+    end
+
     ##
     # Returns the file ID of the latest version of the file associated with this
     # Hyrax::VersioningService, or the ID of the file resource itself if no
@@ -61,7 +69,7 @@ module Hyrax
     # If the resource is nil, this method returns an empty string.
     def versioned_file_id
       latest = latest_version
-      if latest
+      if latest && !resource.is_a?(Hyrax::FileMetadata)
         if latest.respond_to?(:id)
           latest.id
         else
@@ -70,7 +78,7 @@ module Hyrax
       elsif resource.nil?
         ""
       elsif resource.is_a?(Hyrax::FileMetadata)
-        resource.file_identifier
+        latest_version&.version_id || resource.file_identifier
       else
         resource.id
       end
@@ -80,9 +88,9 @@ module Hyrax
       # Make a version and record the version committer
       # @param [ActiveFedora::File | Hyrax::FileMetadata] content
       # @param [User, String] user
-      def create(content, user = nil)
+      def create(content, user = nil, file = nil)
         use_valkyrie = content.is_a? Hyrax::FileMetadata
-        perform_create(content, user, use_valkyrie)
+        perform_create(content, user, file, use_valkyrie)
       end
 
       # @param [ActiveFedora::File | Hyrax::FileMetadata] file
@@ -102,14 +110,14 @@ module Hyrax
         user_key = user_key.user_key if user_key.respond_to?(:user_key)
         version = latest_version_of(content)
         return if version.nil?
-        version_id = content.is_a?(Hyrax::FileMetadata) ? version.id.to_s : version.uri
+        version_id = content.is_a?(Hyrax::FileMetadata) ? version.version_id.to_s : version.uri
         Hyrax::VersionCommitter.create(version_id: version_id, committer_login: user_key)
       end
 
       private
 
-      def perform_create(content, user, use_valkyrie)
-        use_valkyrie ? perform_create_through_valkyrie(content, user) : perform_create_through_active_fedora(content, user)
+      def perform_create(content, user, file, use_valkyrie)
+        use_valkyrie ? perform_create_through_valkyrie(content, file, user) : perform_create_through_active_fedora(content, user)
       rescue NotImplementedError
         Hyrax.logger.warn "Declining to create a Version for #{content}; #{self} doesn't support versioning with use_valkyrie: #{use_valkyrie}"
       end
@@ -119,8 +127,14 @@ module Hyrax
         record_committer(content, user) if user
       end
 
-      def perform_create_through_valkyrie(content, user) # no-op
-        raise NotImplementedError
+      def perform_create_through_valkyrie(content, file, user)
+        raise NotImplementedError unless Hyrax.storage_adapter.supports?(:versions)
+        Hyrax.storage_adapter.upload_version(id: content.file_identifier, file: file)
+        record_committer(content, user) if user
+      end
+
+      def storage_adapter
+        Hyrax.storage_adapter
       end
     end
   end

data/app/services/hyrax/work_uploads_handler.rb

@@ -93,7 +93,10 @@ module Hyrax
         event_payloads = files.each_with_object([]) { |file, arry| arry << make_file_set_and_ingest(file) }
         @persister.save(resource: work)
         Hyrax.publisher.publish('object.metadata.updated', object: work, user: files.first.user)
-        event_payloads.each { |payload| Hyrax.publisher.publish('file.set.attached', payload) }
+        event_payloads.each do |payload|
+          payload.delete(:job).enqueue
+          Hyrax.publisher.publish('file.set.attached', payload)
+        end
       end
     end
 
@@ -114,9 +117,7 @@ module Hyrax
       file_set.permission_manager.acl.save if file_set.permission_manager.acl.pending_changes?
       append_to_work(file_set)
 
-      ValkyrieIngestJob.perform_later(file)
-
-      { file_set: file_set, user: file.user }
+      { file_set: file_set, user: file.user, job: ValkyrieIngestJob.new(file) }
     end
 
     ##
@@ -124,7 +125,7 @@ module Hyrax
     #
     # @todo figure out how to know less about Work's ideas about FileSet use here. Maybe post-Wings, work.
     def append_to_work(file_set)
-      work.member_ids << file_set.id
+      work.member_ids += [file_set.id]
       work.representative_id = file_set.id if work.respond_to?(:representative_id) && work.representative_id.blank?
       work.thumbnail_id = file_set.id if work.respond_to?(:thumbnail_id) && work.thumbnail_id.blank?
     end

data/app/validators/hyrax/collection_membership_validator.rb

@@ -29,7 +29,7 @@ module Hyrax
         record.member_of_collections_attributes
               .each do |_k, h|
                 next if h["_destroy"] == "true"
-                collection_ids << Valkyrie::ID.new(h["id"])
+                collection_ids += [Valkyrie::ID.new(h["id"])]
               end
       end
 

data/app/views/_user_util_links.html.erb

@@ -10,7 +10,7 @@
         <span><%= current_user.name %></span>
         <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
       </a>
-      <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+      <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
         <%= link_to "My Profile", hyrax.dashboard_profile_path(current_user), class: 'dropdown-item' %>
         <%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path, class: "dropdown-item" %>
         <div class="dropdown-divider"></div>

data/app/views/catalog/_search_form.html.erb

@@ -8,7 +8,7 @@
     </label>
 
     <div class="input-group col-sm-9">
-      <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
+      <%= text_field_tag :q, current_search_parameters , 'aria-label': 'Search', class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
 
       <div class="input-group-append">
         <button type="submit" class="btn btn-primary" id="search-submit-header">

data/app/views/collections/edit_fields/_based_near.html.erb

@@ -1,8 +1,12 @@
 <%= f.input key,
-  as: :multi_value,
-  input_html: {
-    class: 'form-control',
-    data: { 'autocomplete-url' => "/authorities/search/geonames",
-            'autocomplete' => key }
-  },
-  required: f.object.required?(key) %>
+            as: :controlled_vocabulary,
+            placeholder: 'Search for a location',
+            input_html: {
+              class: 'form-control',
+              data: { 'autocomplete-url' => "/authorities/search/geonames",
+                      'autocomplete' => key }
+            },
+            ### Required for the ControlledVocabulary javascript:
+            wrapper_html: { data: { 'autocomplete-url' => "/authorities/search/geonames",
+                                    'field-name' => key }},
+            required: f.object.required?(key) %>

data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb

@@ -1,74 +1,74 @@
-          <div id="participants" class="tab-pane">
-            <div class="card labels edit-sharing-tab">
-              <div class="card-body">
-                <section class="section-add-sharing clearfix">
-                  <h2 class="h3"><%= t('.add_participants') %></h2>
-                  <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
-                  <div class="sharing-row-form">
-                    <%= simple_form_for collection_permission_template_form_for(form: @form),
-                        url: [hyrax, :admin, @form, :permission_template],
-                        html: { id: 'group-participants-form', class: 'form-inline' } do |f| %>
+<div id="participants" class="tab-pane">
+  <div class="card labels edit-sharing-tab">
+    <div class="card-body">
+      <section class="section-add-sharing clearfix">
+        <h2 class="h3"><%= t('.add_participants') %></h2>
+        <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
+        <div class="sharing-row-form">
+          <%= simple_form_for collection_permission_template_form_for(form: @form),
+           url: [hyrax, :admin, @form, :permission_template],
+           html: { id: 'group-participants-form', class: 'form-inline' } do |f| %>
 
-                        <%= f.fields_for 'access_grants_attributes',
-                            f.object.access_grants.build(agent_type: 'group'),
-                            index: 0 do |builder| %>
-                          <div class="form-group">
-                            <label><%= t('.add_group') %></label>
-                            <%= builder.hidden_field :agent_type %>
-                            <%= builder.text_field :agent_id,
-                                placeholder: "Search for a group...",
-                                class: 'form-control' %>
-                          </div>
-                          <div class="form-group">
-                            <label>as</label>
-                            <%= builder.select :access,
-                                access_options,
-                                { prompt: "Select a role..." },
-                                class: 'form-control' %>
-                          </div>
-                        <% end %>
-                        <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
+            <%= f.fields_for 'access_grants_attributes',
+             f.object.access_grants.build(agent_type: 'group'),
+             index: 0 do |builder| %>
+              <div class="form-group">
+                <label><%= t('.add_group') %></label>
+                <%= builder.hidden_field :agent_type %>
+                <%= builder.text_field :agent_id,
+                 placeholder: "Search for a group...",
+                 class: 'form-control' %>
+              </div>
+              <div class="form-group">
+                <label>as</label>
+                <%= builder.select :access,
+                    access_options,
+                    { prompt: "Select a role..." },
+                 class: 'form-control' %>
+              </div>
+            <% end %>
+            <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
 
-                    <% end %>
-                  </div>
+          <% end %>
+        </div>
 
-                  <div class="sharing-row-form">
-                    <%= simple_form_for collection_permission_template_form_for(form: @form),
-                        url: [hyrax, :admin, @form, :permission_template],
-                        html: { id: 'user-participants-form', class: 'form-inline add-users' } do |f| %>
+        <div class="sharing-row-form">
+          <%= simple_form_for collection_permission_template_form_for(form: @form),
+           url: [hyrax, :admin, @form, :permission_template],
+           html: { id: 'user-participants-form', class: 'form-inline add-users' } do |f| %>
 
-                      <%= f.fields_for 'access_grants_attributes',
-                                      f.object.access_grants.build(agent_type: 'user'),
-                                      index: 0 do |builder| %>
-                        <div class="form-group">
-                          <label><%= t('.add_user') %></label>
-                          <%= builder.hidden_field :agent_type %>
-                          <%= builder.text_field :agent_id,
-                                            placeholder: "Search for a user..." %>
-                        </div>
-                        <div class="form-group">
-                          <label>as</label>
-                          <%= builder.select :access,
-                                      access_options,
-                                      { prompt: "Select a role..." },
-                                      class: 'form-control' %>
-                        </div>
-                      <% end %>
-                      <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
-                    <% end %>
-                  </div>
+            <%= f.fields_for 'access_grants_attributes',
+             f.object.access_grants.build(agent_type: 'user'),
+             index: 0 do |builder| %>
+              <div class="form-group">
+                <label><%= t('.add_user') %></label>
+                <%= builder.hidden_field :agent_type %>
+                <%= builder.text_field :agent_id,
+                 placeholder: "Search for a user..." %>
+              </div>
+              <div class="form-group">
+                <label>as</label>
+                <%= builder.select :access,
+                    access_options,
+                    { prompt: "Select a role..." },
+                 class: 'form-control' %>
+              </div>
+            <% end %>
+            <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
+          <% end %>
+        </div>
 
-                  <p class="form-text"><%= t('hyrax.admin.admin_sets.form.note') %></p>
-                </section>
+        <p class="form-text"><%= t('hyrax.admin.admin_sets.form.note') %></p>
+      </section>
 
-                <h2 class="h3"><%= t(".current_participants") %></h2>
-                <fieldset class="admin-set-participants section-collection-sharing">
-                  
-                  <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
-                  <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>
-                  <%= render 'form_participant_table', access: 'viewers', filter: :view? %>
-                </fieldset>
+      <h2 class="h3"><%= t(".current_participants") %></h2>
+      <fieldset class="admin-set-participants section-collection-sharing">
 
-              </div><!-- /.card-body -->
-            </div>
-          </div>
+        <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
+        <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>
+        <%= render 'form_participant_table', access: 'viewers', filter: :view? %>
+      </fieldset>
+
+    </div><!-- /.card-body -->
+  </div>
+</div>

data/app/views/hyrax/admin/admin_sets/edit.html.erb

@@ -1,5 +1,5 @@
 <% provide :page_header do %>
-  <h1><span class="fa fa-edit" aria-hidden="true"></span> <%= t('.header', title: @form.title) %></h1>
+  <h1><span class="fa fa-edit" aria-hidden="true"></span> <%= t('.header', title: Array(@form.title).first) %></h1>
 <% end %>
 
 <div class="row">

data/app/views/hyrax/admin/collection_types/_form_participants.html.erb

@@ -1,6 +1,8 @@
 <h3><%= t('.add_participants') %></h3>
 <p><%= t('.instructions') %></p>
-<% access_options = options_for_select([['Manager', Hyrax::CollectionTypeParticipant::MANAGE_ACCESS], ['Creator', Hyrax::CollectionTypeParticipant::CREATE_ACCESS]]) %>
+<% access_options = options_for_select([
+    [t('hyrax.dashboard.collections.form_share.access_options.manager'), Hyrax::CollectionTypeParticipant::MANAGE_ACCESS],
+    [t('hyrax.dashboard.collections.form_share.access_options.creator'), Hyrax::CollectionTypeParticipant::CREATE_ACCESS]]) %>
 <% unless @collection_type_participant.nil? %>
 
   <section class="section-participants">

data/app/views/hyrax/admin/collection_types/index.html.erb

@@ -40,7 +40,7 @@
                  <% unless collection_type.admin_set? || collection_type.user_collection? %>
                   <button class="btn btn-danger btn-sm delete-collection-type"
                           data-collection-type="<%= collection_type.to_json %>"
-                          data-collection-type-index="<%= hyrax.dashboard_collections_path({ 'f[collection_type_gid_ssim][]' => collection_type.to_global_id.to_s, 'f[has_model_ssim][]' => 'Collection' }) %>"
+                          data-collection-type-index="<%= hyrax.dashboard_collections_path({ 'f[collection_type_gid_ssim][]' => collection_type.to_global_id.to_s }) %>"
                           data-has-collections="<%= collection_type.collections.any? %>">
                     <%= t('helpers.action.delete') %>
                   </button>

data/app/views/hyrax/base/_attribute_rows.html.erb

@@ -14,6 +14,7 @@
 <%= presenter.attribute_to_html(:related_url, render_as: :external_link, html_dl: true) %>
 <%= presenter.attribute_to_html(:resource_type, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:source, html_dl: true) %>
+<%= presenter.attribute_to_html(:extent, html_dl: true) %>
 <%= presenter.attribute_to_html(:rights_statement, render_as: :rights_statement, html_dl: true) %>
 <%= presenter.attribute_to_html(:rights_notes, html_dl: true) %>
 <%= presenter.attribute_to_html(:access_right, html_dl: true) %>

data/app/views/hyrax/base/_base_form_files_prepend.html.erb

@@ -0,0 +1,4 @@
+<%# This file is deliberately left blank for downstream implementors
+This should accept one locals:
+
+`f`: The form object %>

data/app/views/hyrax/base/_file_manager_resource_form.html.erb

@@ -1,5 +1,5 @@
 <div class="resource-form-container">
-  <%= simple_form_for [main_app, @form], remote: true, html: { id: 'resource-form', 'data-type': 'json' } do |f| %>
+  <%= simple_form_for [main_app, @form], remote: true, authenticity_token: true, html: { id: 'resource-form', 'data-type': 'json' } do |f| %>
     <%= f.input :thumbnail_id, as: :hidden, input_html: { data: {member_link: 'thumbnail_id'}} %>
     <%= f.input :representative_id, as: :hidden, input_html: { data: {member_link: 'representative_id'}} %>
   <% end %>