hyrax 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c050894909dcdbe63b34640d24f9f665e3818850cf2f4c5a0d92af23ae51cf62
-  data.tar.gz: 42a5a185ee2d26c9ab54d544a8261fc2bd24c01b99903092e5d54a9c5dcee054
+  metadata.gz: fdad61bdb40ae80fa4693bf81f3fc42a581943bdb77bee4fbaaa10367ae0bb9c
+  data.tar.gz: e83ba7521508d26a4e520fc6ab002be912594c78f1fabc066c8d5b887733ba3c
 SHA512:
-  metadata.gz: a0fab1e2979598561c1f4afd61e2434c0af3529005c7f6394f9605d5c30e4e95df45a7c23cf665ac6ee647360a27ef286870a7456b8b57a0ec17e905f8d474af
-  data.tar.gz: 55d6ffdace586396f41b327dceca10da11eeedbcee3d0be0abeafa3635574425e79fa6b8dd0ba831870b9f6d464e0067da889d46e5318051d63f00a502cff892
+  metadata.gz: b8bf649b4432aeaa409734defa1773e5be9ef8ffe5993a02ede4a41aed7c541ff4c0b6eb312ade95bfd6710317b98ff6bf076f79e637ed5e4c25df6773680dac
+  data.tar.gz: 9deb1668640448edc64ff4576205dc9d5268692d43f730b361756b8f62bb794439b20ce88dc5a740afdd25349ea08b3884b27408d0f2726875861934402f51c7

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
+    let 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/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/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/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.1'.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.1'
 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.1
 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: 2020-12-12 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.2
+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