hyrax 5.0.4 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc6adf0f9c62325c3f4131eb7264f543818e25f38b2d85ea1d96c0f877ffe934
-  data.tar.gz: 2d8aebcc3a2064ab0af8d45121df00e20197862ecd3b9d166ca9fcfcdcf7b02b
+  metadata.gz: ddbf266b8b67364db933bf1b60129204b7f9055c3ff396d36bbfd5ba0a752868
+  data.tar.gz: a0f8fca6c5cfb7213ffaf321be7930e80a2a974ee4b33b5c8b3cc3ab24816409
 SHA512:
-  metadata.gz: c006cdfa3fe00dbcfafb470bdd115c2a5131bef1a2209588d3f42fd71b9b0598435c85a47b4e2405f1fa22314fa0552819d9560c10d73d9ce8055701c4e8c21b
-  data.tar.gz: 689bb72271db54acf6564a7107fc298f41106d1c2c512429717ba3ff7a398f9d1071a7f8b230086676d9b228717948a5226c098486559c7eb84c733334939a11
+  metadata.gz: 2ffab98229bd3ee47dc292dce9a71db483326125cc76419b386e7fc34c4698a9b288926f2f1bf572730f9f8249c205b2a5fce46a93f002e0d23fa47b97b89bf5
+  data.tar.gz: 47beca282a262f8016054dba544b273e0b7206d2e5f6dce83441189354fa1ef99188545fa270ce6449e8ce50019136e8b7b0cd02ab536f90d544c16c68a19841

data/.dassie/.env

@@ -1,4 +1,5 @@
 ANALYTICS_START_DATE=2021-08-21
+APP_NAME=dassie
 BUNDLE_GEMFILE=Gemfile.dassie
 BUNDLE_PATH=/app/bundle
 CH12N_TOOL=fits_servlet
@@ -38,7 +39,10 @@ SOLR_TEST_URL=http://solr:8983/solr/hyrax_test
 SOLR_URL=http://solr:8983/solr/hyrax
 TB_RSPEC_OPTIONS=--force-color --format RspecJunitFormatter --out rspec.xml
 TB_RSPEC_FORMATTER=progress
+VALKYRIE_FCREPO_URL=http://fedoraAdmin:fedoraAdmin@fedora6:8080/fcrepo/rest
 VALKYRIE_ID_TYPE=string
+VALKYRIE_METADATA_ADAPTER=pg_metadata
 VALKYRIE_SOLR_HOST=solr
 VALKYRIE_SOLR_PORT=8983
+VALKYRIE_STORAGE_ADAPTER=versioned_disk_storage
 VALKYRIE_TRANSITION=false

data/.dassie/Gemfile

@@ -18,27 +18,35 @@ gem 'devise-guests', '~> 0.8'
 # Required because grpc and google-protobuf gem's binaries are not compatible with Alpine Linux.
 # To install the package in Alpine: `apk add ruby-grpc`
 # The pinned versions should match the version provided by the Alpine packages.
+
+
 if RUBY_PLATFORM =~ /musl/
-  path '/usr/lib/ruby/gems/3.2.0' do
-    gem 'google-protobuf', '~> 3.24.4', force_ruby_platform: true
-    gem 'grpc', '~> 1.59.3', force_ruby_platform: true
-  end
+# # Disabled due to dependency mismatches in Alpine packages (grpc 1.62.1 needs protobuf ~> 3.25)
+#   path '/usr/lib/ruby/gems/3.3.0' do
+  gem 'google-protobuf', force_ruby_platform: true
+  gem 'grpc', force_ruby_platform: true
+#   end
 end
 
+gem 'hydra-role-management'
 gemspec name: 'hyrax', path: ENV.fetch('HYRAX_ENGINE_PATH', '..')
 gem 'jbuilder', '~> 2.5'
 gem 'jquery-rails'
+gem 'okcomputer'
 gem 'pg', '~> 1.3'
 gem 'puma'
-gem 'rails', '~> 6.1', '>= 6.1.7.10'
+gem 'rack-mini-profiler', require: ['prepend_net_http_patch']
+gem 'rails', '~> 7.2', '< 8.0'
 gem 'riiif', '~> 2.1'
 gem 'rsolr', '>= 1.0', '< 3'
 gem 'sass-rails', '~> 6.0'
-gem 'sidekiq', '~> 6.4'
+gem 'sidekiq', '~> 7.0'
+gem 'stackprof', require: false
 gem 'turbolinks', '~> 5'
 gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem 'uglifier', '>= 1.3.0'
+gem 'activerecord-nulldb-adapter', '~> 1.1'
 
 group :development do
   gem 'better_errors' # add command line in browser when errors
@@ -46,10 +54,6 @@ group :development do
 
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
-  gem 'listen', '>= 3.0.5', '< 3.2'
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
 group :development, :test do
@@ -57,4 +61,4 @@ group :development, :test do
   gem 'pry-doc'
   gem 'pry-rails'
   gem 'pry-rescue'
-end
+end

data/.dassie/app/controllers/application_controller.rb

@@ -9,4 +9,8 @@ class ApplicationController < ActionController::Base
   include Hyrax::ThemedLayoutController
 
   with_themed_layout '1_column'
+
+  before_action do
+    Rack::MiniProfiler.authorize_request if current_user&.admin?
+  end
 end

data/.dassie/app/helpers/hyrax_helper.rb

@@ -3,4 +3,8 @@ module HyraxHelper
   include ::BlacklightHelper
   include Hyrax::BlacklightOverride
   include Hyrax::HyraxHelperBehavior
+
+  def application_name
+    ENV.fetch('APP_NAME') { super }.titleize
+  end
 end

data/.dassie/app/models/ability.rb

@@ -17,5 +17,9 @@ class Ability
     # if user_groups.include? 'special_group'
     #   can [:create], ActiveFedora::Base
     # end
+
+    if current_user.admin?
+      can [:create, :show, :add_user, :remove_user, :index, :edit, :update, :destroy], Role
+    end
   end
 end

data/.dassie/app/models/user.rb

@@ -1,6 +1,10 @@
 class User < ApplicationRecord
   # Connects this user object to Hydra behaviors.
   include Hydra::User
+
+  # Connects this user object to Role-management behaviors.
+  include Hydra::RoleManagement::UserRoles
+
   # Connects this user object to Hyrax behaviors.
   include Hyrax::User
   include Hyrax::UserUsageStats
@@ -18,4 +22,11 @@ class User < ApplicationRecord
   def to_s
     email
   end
+
+  # Groups include roles and those set by #groups= (especially in specs)
+  def groups
+    g = roles.map(&:name)
+    g += group_service.fetch_groups(user: self)
+    g
+  end
 end

data/.dassie/app/views/shared/_footer.html.erb

@@ -0,0 +1,17 @@
+<footer class="navbar navbar-dark bg-dark site-footer">
+  <div class="container-fluid">
+    <div class="navbar-text text-left">
+      <p><%= t('hyrax.footer.service_html') %> <%= t('hyrax.product_name') %> v<%= Hyrax::VERSION %></p>
+      <p>Commit <%= link_to ENV.fetch('BUILD_GITSHA', "Unknown")[0..6],
+                            "https://github.com/samvera/hyrax/commit/#{ENV.fetch('BUILD_GITSHA', 'main')}" %>
+        Built at <%= ENV.fetch('BUILD_TIMESTAMP', 'Unknown') %>
+      </p>
+    </div>
+    <div class="navbar-right">
+      <div class="navbar-text text-right">
+        <p><%= t('hyrax.footer.copyright_html', current_year: Time.current.year) %></p>
+        <p><%= t('hyrax.background_attribution_html') %></p>
+      </div>
+    </div>
+  </div>
+</footer>

data/.dassie/bin/rails

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/.dassie/bin/rake

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/.dassie/config/application.rb

@@ -9,7 +9,8 @@ Bundler.require(*Rails.groups)
 module Dassie
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.0
+    config.load_defaults 7.2
+    config.add_autoload_paths_to_load_path = true
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers

data/.dassie/config/database.yml

@@ -0,0 +1,18 @@
+default: &default
+  adapter: postgresql
+  url: <%= ENV.fetch('DATABASE_URL') %>
+
+development:
+  <<: *default
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  url: <%= ENV.fetch('DATABASE_TEST_URL') { ENV.fetch('DATABASE_URL') } %>
+
+production:
+  <<: *default
+  encoding: unicode
+  pool: 50

data/.dassie/config/environments/development.rb

@@ -65,7 +65,7 @@ Rails.application.configure do
   config.assets.prefix = '/dev-assets'
 
   # Raises error for missing translations
-  config.action_view.raise_on_missing_translations = true
+  config.i18n.raise_on_missing_translations = true
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.

data/.dassie/config/environments/production.rb

@@ -23,8 +23,10 @@ Rails.application.configure do
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = Uglifier.new(harmony: true)
-  # config.assets.css_compressor = :sass
+  config.assets.configure do |env|
+    env.js_compressor = :uglifier
+    # env.css_compressor = :sass
+  end
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
@@ -51,7 +53,7 @@ Rails.application.configure do
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.
-  config.log_level = :debug
+  config.log_level = ENV.fetch("RAILS_LOG_LEVEL", :debug).to_sym
 
   # Prepend all log lines with the following tags.
   config.log_tags = [ :request_id ]

data/.dassie/config/environments/test.rb

@@ -43,5 +43,5 @@ Rails.application.configure do
   config.active_support.deprecation = :stderr
 
   # Raises error for missing translations
-  config.action_view.raise_on_missing_translations = true
+  config.i18n.raise_on_missing_translations = true
 end

data/.dassie/config/fedora.yml

@@ -1,15 +1,15 @@
 development:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || ENV['FCREPO_PORT'] || 8984 %>/<%= ENV['FCREPO_REST_PATH'] || 'rest' %>
-  base_path: <%= ENV['FCREPO_DEV_BASE_PATH'] || ENV['FCREPO_BASE_PATH'] || '/dev' %>
+  url: <%= ENV.fetch('FEDORA_URL') { "http://#{ENV['FCREPO_HOST'] || 'localhost'}:#{ENV['FCREPO_DEVELOPMENT_PORT'] || ENV['FCREPO_PORT'] || 8984 }/#{ENV['FCREPO_REST_PATH'] || 'rest'}" } %>
+  base_path: <%= ENV['FEDORA_BASE_PATH'] || ENV['FCREPO_DEV_BASE_PATH'] || ENV['FCREPO_BASE_PATH'] || '/dev' %>
 test:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || ENV['FCREPO_PORT'] || 8986 %>/<%= ENV['FCREPO_REST_PATH'] || 'rest' %>
-  base_path: <%= ENV['FCREPO_TEST_BASE_PATH'] || ENV['FCREPO_BASE_PATH'] || '/test' %>
+  url: <%= ENV.fetch('FEDORA_URL') { "http://#{ENV['FCREPO_HOST'] || 'localhost'}:#{ENV['FCREPO_DEVELOPMENT_PORT'] || ENV['FCREPO_PORT'] || 8986 }/#{ENV['FCREPO_REST_PATH'] || 'rest'}" } %>
+  base_path: <%= ENV['FEDORA_BASE_PATH'] || ENV['FCREPO_TEST_BASE_PATH'] || ENV['FCREPO_BASE_PATH'] || '/test' %>
 production:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://<%= ENV['FCREPO_HOST'] || 'localhost' %>:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || ENV['FCREPO_PORT'] || 8983 %>/<%= ENV['FCREPO_REST_PATH'] || 'rest' %>
-  base_path: <%= ENV['FCREPO_BASE_PATH'] || '/prod' %>
+  url: <%= ENV.fetch('FEDORA_URL') { "http://#{ENV['FCREPO_HOST'] || 'localhost'}:#{ENV['FCREPO_PORT'] || 8984 }/#{ENV['FCREPO_REST_PATH'] || 'rest'}" } %>
+  base_path: <%= ENV['FEDORA_BASE_PATH'] || ENV['FCREPO_BASE_PATH'] || '/prod' %>

data/.dassie/config/initializers/profiler.rb

@@ -0,0 +1,5 @@
+require 'stackprof'
+require 'rack-mini-profiler'
+
+# initialization is skipped so trigger it
+Rack::MiniProfilerRails.initialize!(Rails.application)

data/.dassie/config/initializers/riiif.rb

@@ -35,29 +35,31 @@ end
 module Hyrax
   # Adds file locking to Riiif::File
   # @see RiiifFileResolver
-  class RiiifFile < Riiif::File
-    include ActiveSupport::Benchmarkable
-
-    attr_reader :id
-    def initialize(input_path, tempfile = nil, id:)
-      super(input_path, tempfile)
-      raise(ArgumentError, "must specify id") if id.blank?
-      @id = id
-    end
+  Rails.application.reloader.to_prepare do
+    class RiiifFile < Riiif::File
+      include ActiveSupport::Benchmarkable
+
+      attr_reader :id
+      def initialize(input_path, tempfile = nil, id:)
+        super(input_path, tempfile)
+        raise(ArgumentError, "must specify id") if id.blank?
+        @id = id
+      end
 
-    # Wrap extract in a read lock and benchmark it
-    def extract(transformation, image_info = nil)
-      Riiif::Image.file_resolver.file_locks[id].with_read_lock do
-        benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
-          super
+      # Wrap extract in a read lock and benchmark it
+      def extract(transformation, image_info = nil)
+        Riiif::Image.file_resolver.file_locks[id].with_read_lock do
+          benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
+            super
+          end
         end
       end
-    end
 
-    private
+      private
 
-    def logger
-      Hyrax.logger
+      def logger
+        Hyrax.logger
+      end
     end
   end
 

data/.dassie/config/locales/hyrax.en.yml

@@ -50,7 +50,7 @@ en:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2018 Samvera</strong> Licensed under the Apache License, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; %{current_year} Samvera</strong> Licensed under the Apache License, Version 2.0"
       service_html: A service of <a href="http://samvera.org/" class="navbar-link" target="_blank">Samvera</a>.
     institution_name: Institution
     institution_name_full: The Institution Name

data/.dassie/config/puma.rb

@@ -1,6 +1,56 @@
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
-threads threads_count, threads_count
-port        ENV.fetch("PORT") { 3000 }
-environment ENV.fetch("RAILS_ENV") { "development" }
-pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers: a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum; this matches the default thread size of Active Record.
+#
+threads_count = ENV.fetch("RAILS_MAX_THREADS", 5).to_i
+threads 1, threads_count - 2
+
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+#
+port        ENV.fetch("PORT", 3000)
+
+# Specifies the `environment` that Puma will run in.
+#
+rails_env = ENV.fetch("RAILS_ENV", 'development')
+environment rails_env
+
+# Specifies the `pidfile` that Puma will use.
+pidfile ENV.fetch("PIDFILE", 'tmp/pids/server.pid')
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked webserver processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+workers ENV.fetch('WEB_CONCURRENCY', 1)
+
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory.
+#
+preload_app!
+
+# Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart
+
+# Embedded Sidekiq https://github.com/sidekiq/sidekiq/wiki/Embedding
+if ENV.fetch('SIDEKIQ_MODE', false) == 'embed'
+  embedded_sidekiq = nil
+
+  on_worker_boot do
+    embedded_sidekiq = Sidekiq.configure_embed do |config|
+      config.logger.level = ENV.fetch("RAILS_LOG_LEVEL", 'debug')
+      config.queues = %w[ingest batch default]
+      config.concurrency = ENV.fetch('SIDEKIQ_WORKERS', 2) # Adjust max `threads` above accordingly
+    end
+    embedded_sidekiq.run
+  end
+
+  on_worker_shutdown do
+    embedded_sidekiq&.stop
+  end
+end

data/.dassie/config/routes.rb

@@ -13,6 +13,8 @@ Rails.application.routes.draw do
     concerns :searchable
   end
   devise_for :users
+  mount Hydra::RoleManagement::Engine => '/'
+
   mount Qa::Engine => '/authorities'
   mount Hyrax::Engine, at: '/'
   resources :welcome, only: 'index'

data/.dassie/db/migrate/20250328100249_user_roles.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class UserRoles < ActiveRecord::Migration[5.0]
+  def up
+    create_table :roles do |t|
+      t.string :name
+    end
+    create_table :roles_users, id: false do |t|
+      t.references :role
+      t.references :user
+    end
+    add_index :roles_users, %i[role_id user_id]
+    add_index :roles_users, %i[user_id role_id]
+  end
+
+  def down
+    drop_table :roles_users
+    drop_table :roles
+  end
+end