hyrax 2.9.0 → 2.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c050894909dcdbe63b34640d24f9f665e3818850cf2f4c5a0d92af23ae51cf62
-  data.tar.gz: 42a5a185ee2d26c9ab54d544a8261fc2bd24c01b99903092e5d54a9c5dcee054
+  metadata.gz: '0148443e7ca6987d77b7ccbad46c89c895ae60e226565819b095293884c040cc'
+  data.tar.gz: 5a2cfda462e5415dc6c736dcbaaf4bb7b7a202fa0afe54c2819026f4559d7942
 SHA512:
-  metadata.gz: a0fab1e2979598561c1f4afd61e2434c0af3529005c7f6394f9605d5c30e4e95df45a7c23cf665ac6ee647360a27ef286870a7456b8b57a0ec17e905f8d474af
-  data.tar.gz: 55d6ffdace586396f41b327dceca10da11eeedbcee3d0be0abeafa3635574425e79fa6b8dd0ba831870b9f6d464e0067da889d46e5318051d63f00a502cff892
+  metadata.gz: faaee31b6dec44292d47981fe77d22bc9f8f40865670b9f2b1a470aca00b10193cb01931c1084a9622cb3a4e6fca5803c1b6a8a77965dca75619cc59f5da1d67
+  data.tar.gz: b3232036171e55e8166da5d4886d52b91fe6ce3f0c05018508deee6b594491df87b0d7b925b477e4d8a6a5134c0233026433d4df47d9902c28e074614dd3e18d

data/.circleci/config.yml

@@ -12,7 +12,7 @@ jobs:
         default: 1.17.3
       rails_version:
         type: string
-        default: '5.2.4.3'
+        default: '5.2.6'
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
@@ -57,7 +57,7 @@ jobs:
         default: 1.17.3
       rails_version:
         type: string
-        default: '5.2.4.3'
+        default: '5.2.6'
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
@@ -136,10 +136,10 @@ workflows:
     jobs:
       - bundle:
           ruby_version: "2.5.8"
-          rails_version: "5.2.4.3"
+          rails_version: "5.2.6"
       - build:
           ruby_version: "2.5.8"
-          rails_version: "5.2.4.3"
+          rails_version: "5.2.6"
           requires:
             - bundle
       - test:
@@ -151,10 +151,10 @@ workflows:
     jobs:
       - bundle:
           ruby_version: "2.6.6"
-          rails_version: "5.2.4.3"
+          rails_version: "5.2.6"
       - build:
           ruby_version: "2.6.6"
-          rails_version: "5.2.4.3"
+          rails_version: "5.2.6"
           requires:
             - bundle
       - test:
@@ -166,11 +166,11 @@ workflows:
     jobs:
       - bundle:
           ruby_version: "2.7.1"
-          rails_version: "5.2.4.3"
+          rails_version: "5.2.6"
           bundler_version: "2.1.2"
       - build:
           ruby_version: "2.7.1"
-          rails_version: "5.2.4.3"
+          rails_version: "5.2.6"
           bundler_version: "2.1.2"
           requires:
             - bundle

data/.regen

@@ -1 +1 @@
-3
+3.http_method

data/README.md

@@ -158,7 +158,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.2.4.3_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.9.0/template.rb
+rails _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.9.5/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/app/assets/javascripts/hyrax.js

@@ -104,6 +104,7 @@
 //= require hyrax/tabbed_form
 //= require hyrax/turbolinks_events
 //= require hyrax/i18n_helper
+//= require hyrax/skip_to_content
 
 // this needs to be after batch_select so that the form ids get setup correctly
 //= require hyrax/batch_edit

data/app/assets/javascripts/hyrax/skip_to_content.js

@@ -0,0 +1,15 @@
+// This code is to implement skip_to_content
+
+Blacklight.onLoad(function () {
+  $(".skip-to-content").click(function(event) {
+    event.preventDefault();
+    // element to focus on
+    var skipTo = '#' + $(this)[0].firstElementChild.hash.split('#')[1];
+
+    // Setting 'tabindex' to -1 takes an element out of normal
+    // tab flow but allows it to be focused via javascript
+    $(skipTo).attr('tabindex', -1).on('blur focusout', function () {
+      $(this).removeAttr('tabindex');
+    }).focus();
+  });
+});

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

@@ -145,7 +145,7 @@ module Hyrax
 
       def iiif_manifest_presenter
         IiifManifestPresenter.new(curation_concern_from_search_results).tap do |p|
-          p.hostname = request.hostname
+          p.hostname = request.base_url
           p.ability = current_ability
         end
       end

data/app/controllers/hyrax/file_sets_controller.rb

@@ -85,13 +85,18 @@ module Hyrax
           actor.revert_content(params[:revision])
         elsif params.key?(:file_set)
           if params[:file_set].key?(:files)
-            actor.update_content(params[:file_set][:files].first)
+            actor.update_content(uploaded_file_from_path)
           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/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 '#{params[:id]}' does not exist" if @user.nil?
+        redirect_to root_path, alert: "User does not exist" unless @user
       end
 
       def sort_value

data/app/jobs/embargo_expiry_job.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+class EmbargoExpiryJob < Hyrax::ApplicationJob
+  def perform
+    records_with_expired_embargos.each do |id|
+      work = ActiveFedora::Base.find(id)
+      Hyrax::Actors::EmbargoActor.new(work).destroy
+    end
+  end
+
+  ##
+  # @return [Enumerator<String>] ids for all the objects that have expired active embargoes
+  def records_with_expired_embargos
+    Hyrax::EmbargoService.assets_with_expired_embargoes.map(&:id)
+  end
+end

data/app/jobs/lease_expiry_job.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+class LeaseExpiryJob < Hyrax::ApplicationJob
+  def perform
+    records_with_expired_leases.each do |id|
+      work = ActiveFedora::Base.find(id)
+      Hyrax::Actors::LeaseActor.new(work).destroy
+    end
+  end
+
+  ##
+  # @return [Enumerator<String>] ids for all the objects that have expired active leases
+  def records_with_expired_leases
+    Hyrax::LeaseService.assets_with_expired_leases.map(&:id)
+  end
+end

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

@@ -73,7 +73,7 @@ module Hyrax
         ids = PermissionTemplateAccess.for_user(ability: self,
                                                 access: ['deposit', 'manage'])
                                       .joins(:permission_template)
-                                      .pluck('DISTINCT source_id')
+                                      .pluck(Arel.sql('DISTINCT source_id'))
         query = "_query_:\"{!raw f=has_model_ssim}AdminSet\" AND {!terms f=id}#{ids.join(',')}"
         ActiveFedora::SolrService.count(query).positive?
       end

data/app/models/concerns/hyrax/solr_document/characterization.rb

@@ -67,7 +67,7 @@ module Hyrax
       end
 
       def file_size
-        self[Solrizer.solr_name("file_size")]
+        self["file_size_lts"]
       end
 
       def filename

data/app/services/hyrax/collection_types/permissions_service.rb

@@ -13,7 +13,7 @@ module Hyrax
       #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
       def self.collection_type_ids_for_user(roles:, user: nil, ability: nil)
         return false unless user.present? || ability.present?
-        return Hyrax::CollectionType.all.pluck('DISTINCT id') if user_admin?(user, ability)
+        return Hyrax::CollectionType.all.pluck(Arel.sql('DISTINCT id')) if user_admin?(user, ability)
         Hyrax::CollectionTypeParticipant.where(agent_type: Hyrax::CollectionTypeParticipant::USER_TYPE,
                                                agent_id: user_id(user, ability),
                                                access: roles)
@@ -21,7 +21,7 @@ module Hyrax
                                           Hyrax::CollectionTypeParticipant.where(agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE,
                                                                                  agent_id: user_groups(user, ability),
                                                                                  access: roles)
-                                        ).pluck('DISTINCT hyrax_collection_type_id')
+                                        ).pluck(Arel.sql('DISTINCT hyrax_collection_type_id'))
       end
 
       # @api public
@@ -174,7 +174,7 @@ module Hyrax
       def self.agent_ids_for(collection_type:, agent_type:, access:)
         Hyrax::CollectionTypeParticipant.where(hyrax_collection_type_id: collection_type.id,
                                                agent_type: agent_type,
-                                               access: access).pluck('DISTINCT agent_id')
+                                               access: access).pluck(Arel.sql('DISTINCT agent_id'))
       end
       private_class_method :agent_ids_for
 

data/app/services/hyrax/collections/permissions_service.rb

@@ -13,7 +13,7 @@ module Hyrax
       def self.source_ids_for_user(access:, ability:, source_type: nil, exclude_groups: [])
         scope = PermissionTemplateAccess.for_user(ability: ability, access: access, exclude_groups: exclude_groups)
                                         .joins(:permission_template)
-        ids = scope.pluck('DISTINCT source_id')
+        ids = scope.pluck(Arel.sql('DISTINCT source_id'))
         return ids unless source_type
         filter_source(source_type: source_type, ids: ids)
       end

data/app/services/hyrax/contextual_path.rb

@@ -10,7 +10,7 @@ module Hyrax
 
     def show
       if parent_presenter
-        polymorphic_path([:hyrax, :parent, presenter.model_name.singular],
+        polymorphic_path([:hyrax, :parent, presenter.model_name.singular.to_sym],
                          parent_id: parent_presenter.id,
                          id: presenter.id)
       else

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

@@ -24,7 +24,7 @@ HTML Properties:
   </div>
   <div class="message has-warning hidden"></div>
   <div style="margin-top: 10px">
-    <%= link_to t('.attach_new_work'), polymorphic_path([main_app, :new, :hyrax, :parent, curation_concern.model_name.singular], parent_id: curation_concern.id), target: "_blank", class: 'btn btn-primary' %>
+    <%= link_to t('.attach_new_work'), polymorphic_path([main_app, :new, :hyrax, :parent, curation_concern.model_name.singular.to_sym], parent_id: curation_concern.id), target: "_blank", class: 'btn btn-primary' %>
   </div>
   <table class="table table-striped">
     <caption><%= t('.caption') %></caption>

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

@@ -1,3 +1,5 @@
 <%= f.full_error(:visibility) %>
 <%= f.full_error(:embargo_release_date) %>
 <%= f.full_error(:visibility_after_embargo) %>
+<%= f.full_error(:lease_expiration_date) %>
+<%= f.full_error(:visibility_after_lease) %>

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

@@ -15,7 +15,7 @@
             <ul class="dropdown-menu">
               <% presenter.valid_child_concerns.each do |concern| %>
                 <li>
-                  <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular], parent_id: presenter.id) %>
+                  <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
                 </li>
               <% end %>
             </ul>

data/app/views/hyrax/batch_uploads/_form.html.erb

@@ -7,7 +7,7 @@
   <% provide :files_tab do %>
     <p class="instructions"><%= t("hyrax.batch_uploads.files.instructions") %></p>
     <p class="switch-upload-type"><%= t("hyrax.batch_uploads.files.upload_type_instructions") %>
-      <%= link_to t("hyrax.batch_uploads.files.button_label"), [main_app, :new, Hyrax.primary_work_type.model_name.singular_route_key] %>
+      <%= link_to t("hyrax.batch_uploads.files.button_label"), [main_app, :new, Hyrax.primary_work_type.model_name.singular_route_key.to_sym] %>
     </p>
   <% end %>
   <%= render 'hyrax/base/guts4form', f: f, tabs: form_tabs_for(form: f.object) %>

data/hyrax.gemspec

@@ -50,7 +50,7 @@ SUMMARY
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
   spec.add_dependency 'hydra-derivatives', '~> 3.3'
   spec.add_dependency 'hydra-editor', '>= 3.3', '< 6.0'
-  spec.add_dependency 'hydra-head', '>= 10.6.1'
+  spec.add_dependency 'hydra-head', '>= 10.6.1', '< 12'
   spec.add_dependency 'hydra-works', '>= 0.16', '< 2.0'
   spec.add_dependency 'iiif_manifest', '>= 0.3', '< 0.6'
   spec.add_dependency 'jquery-datatables-rails', '~> 3.4'
@@ -68,7 +68,7 @@ SUMMARY
   spec.add_dependency 'posix-spawn'
   spec.add_dependency 'power_converter', '~> 0.1', '>= 0.1.2'
   spec.add_dependency 'pul_uv_rails', '~> 2.0'
-  spec.add_dependency 'qa', '~> 2.0' # questioning_authority
+  spec.add_dependency 'qa', '>= 2.0', '< 6.0' # questioning_authority
   spec.add_dependency 'rails_autolink', '~> 1.1'
   spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
   spec.add_dependency 'rdf-vocab', '< 3.1.5'

data/lib/generators/hyrax/templates/catalog_controller.rb

@@ -20,6 +20,10 @@ class CatalogController < ApplicationController
     config.view.gallery.partials = [:index_header, :index]
     config.view.slideshow.partials = [:index]
 
+    # Because too many times on Samvera tech people raise a problem regarding a failed query to SOLR.
+    # Often, it's because they inadvertantly exceeded the character limit of a GET request.
+    config.http_method = :post
+
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {
       qt: "search",

data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml

@@ -51,7 +51,7 @@ es:
       suffix: "@example.org"
     footer:
       copyright_html: "<strong>Copyright &copy; 2018 Samvera</strong> bajo licencia de Apache, Version 2.0"
-      service_html: Un servicio de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera/a>.
+      service_html: Un servicio de <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: institución
     institution_name_full: El nombre de la institución
     product_name: Hyrax

data/lib/hyrax/configuration.rb

@@ -479,10 +479,14 @@ module Hyrax
     attr_writer :translate_uri_to_id
 
     def translate_uri_to_id
-      @translate_uri_to_id ||= lambda do |uri|
-        baseparts = 2 + [(::Noid::Rails.config.template.gsub(/\.[rsz]/, '').length.to_f / 2).ceil, 4].min
-        uri.to_s.sub("#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}", '').split('/', baseparts).last
-      end
+      @translate_uri_to_id ||=
+        begin
+          baseparts = 2 + [(::Noid::Rails.config.template.gsub(/\.[rsz]/, '').length.to_f / 2).ceil, 4].min
+
+          lambda do |uri|
+            uri.to_s.split(ActiveFedora.fedora.base_path).last.split('/', baseparts).last
+          end
+        end
     end
 
     attr_writer :translate_id_to_uri

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.9.0'.freeze
+  VERSION = '2.9.5'.freeze
 end

data/template.rb

@@ -1,6 +1,6 @@
 # Hack for https://github.com/rails/rails/issues/35153
 gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
-gem 'hyrax', '2.9.0'
+gem 'hyrax', '2.9.5'
 run 'bundle install'
 generate 'hyrax:install', '-f'
 rails_command 'db:migrate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.5
 platform: ruby
 authors:
 - Justin Coyne
@@ -11,10 +11,10 @@ authors:
 - Jeremy Friesen
 - Trey Pendragon
 - Esmé Cowles
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -327,6 +327,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.6.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -334,6 +337,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.6.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: hydra-works
   requirement: !ruby/object:Gem::Requirement
@@ -580,16 +586,22 @@ dependencies:
   name: qa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
@@ -1287,6 +1299,7 @@ files:
 - app/assets/javascripts/hyrax/select_submit.js
 - app/assets/javascripts/hyrax/select_work_type.es6
 - app/assets/javascripts/hyrax/single_use_links_manager.js
+- app/assets/javascripts/hyrax/skip_to_content.js
 - app/assets/javascripts/hyrax/sort_and_per_page.es6
 - app/assets/javascripts/hyrax/sorting.js
 - app/assets/javascripts/hyrax/tabbed_form.es6
@@ -1502,6 +1515,7 @@ files:
 - app/jobs/content_update_event_job.rb
 - app/jobs/create_derivatives_job.rb
 - app/jobs/create_work_job.rb
+- app/jobs/embargo_expiry_job.rb
 - app/jobs/event_job.rb
 - app/jobs/file_set_attached_event_job.rb
 - app/jobs/fixity_check_job.rb
@@ -1518,6 +1532,7 @@ files:
 - app/jobs/ingest_job.rb
 - app/jobs/ingest_local_file_job.rb
 - app/jobs/inherit_permissions_job.rb
+- app/jobs/lease_expiry_job.rb
 - app/jobs/resolrize_job.rb
 - app/jobs/stream_notifications_job.rb
 - app/jobs/user_edit_profile_event_job.rb
@@ -2443,7 +2458,7 @@ homepage: http://github.com/samvera/hyrax
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -2458,8 +2473,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user
   interface for common repository features. Hyrax offers the ability to create repository