hyrax 5.0.4 → 5.1.0

data/.github/workflows/main.yml

@@ -1,15 +1,15 @@
 name: Trigger Nurax build
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - 'main'
+#  push:
+#    branches:
+#      - 'main'
 
 jobs:
   trigger:
     runs-on: ubuntu-latest
     steps:
-    - uses: peter-evans/repository-dispatch@v2.1.1
+    - uses: peter-evans/repository-dispatch@v3
       with:
          token: ${{ secrets.NURAX_ACCESS_TOKEN }}
          event-type: push

data/.koppie/.env

@@ -11,7 +11,7 @@ DB_NAME=koppie
 DB_PASSWORD=hyrax_password
 DB_PORT=5432
 DB_USERNAME=hyrax_user
-FCREPO_URL=http://fedoraAdmin:fedoraAdmin@fcrepo:8080/fcrepo/rest
+FEDORA_URL=http://fedoraAdmin:fedoraAdmin@fcrepo:8080/fcrepo/rest
 FITS_SERVLET_URL=http://fits:8080/fits
 HUB_URL=http://chrome:4444/wd/hub
 HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-webapp/derivatives/

data/.koppie/Gemfile

@@ -18,27 +18,34 @@ 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 +53,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

data/.koppie/app/controllers/application_controller.rb

@@ -10,4 +10,8 @@ class ApplicationController < ActionController::Base
   with_themed_layout '1_column'
 
   protect_from_forgery with: :exception
+
+  before_action do
+    Rack::MiniProfiler.authorize_request if current_user&.admin?
+  end
 end

data/.koppie/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/.koppie/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/.koppie/app/models/user.rb

@@ -2,6 +2,9 @@ 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
@@ -19,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/.koppie/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/.koppie/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/.koppie/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/.koppie/config/application.rb

@@ -9,7 +9,8 @@ Bundler.require(*Rails.groups)
 module Koppie
   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/.koppie/config/database.yml

@@ -1,23 +1,16 @@
 default: &default
   adapter: postgresql
-  pool: <%= ENV.fetch('DB_POOL') { 5 } %>
-  timeout: <%= ENV.fetch('DB_TIMEOUT') { 5000 } %>
-  database: <%= ENV['APP_DB_NAME'] %>
-  username: <%= ENV['DB_USERNAME'] %>
-  password: <%= ENV['DB_PASSWORD'] %>
-  host: <%= ENV['DB_HOST'] %>
-  port: <%= ENV['DB_PORT'] %>
+  url: <%= ENV.fetch('DATABASE_URL') %>
 
 development:
   <<: *default
-  database: <%= ENV.fetch('APP_DB_NAME', 'nurax_pg_development') %>
 
 # 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
-  database: <%= ENV.fetch('APP_DB_NAME', 'nurax_pg_test') %>
+  url: <%= ENV.fetch('DATABASE_TEST_URL') { ENV.fetch('DATABASE_URL') } %>
 
 production:
   <<: *default

data/.koppie/config/environments/development.rb

@@ -29,6 +29,15 @@ Rails.application.configure do
     config.cache_store = :null_store
   end
 
+  # Logging
+  #
+  config.log_level = ENV.fetch("RAILS_LOG_LEVEL", 'debug')
+  config.log_formatter = ::Logger::Formatter.new
+  # log to stdout
+  logger               = ActiveSupport::Logger.new(STDOUT)
+  logger.formatter     = config.log_formatter
+  config.logger        = ActiveSupport::TaggedLogging.new(logger)
+
   # Store uploaded files on the local file system (see config/storage.yml for options)
   config.active_storage.service = :local
 
@@ -55,7 +64,7 @@ Rails.application.configure do
   config.assets.quiet = true
 
   # 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/.koppie/config/environments/production.rb

@@ -26,8 +26,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
@@ -54,7 +56,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/.koppie/config/environments/test.rb

@@ -43,7 +43,7 @@ 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
 
   config.log_level = :warn
 end

data/.koppie/config/initializers/1_valkyrie.rb

@@ -31,8 +31,8 @@ Valkyrie::MetadataAdapter.register(
 Valkyrie::MetadataAdapter.register(
   Valkyrie::Persistence::Fedora::MetadataAdapter.new(
     connection: ::Ldp::Client.new(Hyrax.config.fedora_connection_builder.call(
-      ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" })),
-    base_path: Rails.env,
+      ENV.fetch('FEDORA6_URL') { ENV.fetch('FEDORA_URL') { "http://localhost:8080/fcrepo/rest" } })),
+    base_path: ENV.fetch('FEDORA_BASE_PATH', Rails.env).gsub(/^\/|\/$/, ''),
     schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(Hyrax::SimpleSchemaLoader.new.permissive_schema_for_valkrie_adapter),
     fedora_version: 6.5,
     fedora_pairtree_count: 4,
@@ -64,8 +64,8 @@ Valkyrie.config.metadata_adapter = ENV.fetch('VALKYRIE_METADATA_ADAPTER') { :pg_
 Valkyrie::StorageAdapter.register(
   Valkyrie::Storage::Fedora.new(
     connection: ::Ldp::Client.new(Hyrax.config.fedora_connection_builder.call(
-      ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" })),
-    base_path: Rails.env,
+      ENV.fetch('FEDORA6_URL') { ENV.fetch('FEDORA_URL') { "http://localhost:8080/fcrepo/rest" } })),
+    base_path: ENV.fetch('FEDORA_BASE_PATH', Rails.env).gsub(/^\/|\/$/, ''),
     fedora_version: 6.5,
     fedora_pairtree_count: 4,
     fedora_pairtree_length: 2
@@ -73,7 +73,7 @@ Valkyrie::StorageAdapter.register(
 )
 
 Valkyrie::StorageAdapter.register(
-  Valkyrie::Storage::VersionedDisk.new(base_path: Rails.root.join("storage", "files"),
+  Valkyrie::Storage::VersionedDisk.new(base_path: ENV.fetch('HYRAX_STORAGE_PATH') { Rails.root.join("storage", "files") },
                                        file_mover: FileUtils.method(:cp)),
   :versioned_disk_storage
 )

data/.koppie/config/initializers/hyrax.rb

@@ -317,23 +317,26 @@ Qa::Authorities::Local.register_subauthority('subjects', 'Qa::Authorities::Local
 Qa::Authorities::Local.register_subauthority('languages', 'Qa::Authorities::Local::TableBasedAuthority')
 Qa::Authorities::Local.register_subauthority('genres', 'Qa::Authorities::Local::TableBasedAuthority')
 
-custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
-                  Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator,
-                  Hyrax::CustomQueries::Navigators::ParentCollectionsNavigator,
-                  Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator,
-                  Hyrax::CustomQueries::Navigators::ChildWorksNavigator,
-                  Hyrax::CustomQueries::Navigators::ParentWorkNavigator,
-                  Hyrax::CustomQueries::Navigators::FindFiles,
-                  Hyrax::CustomQueries::FindAccessControl,
-                  Hyrax::CustomQueries::FindCollectionsByType,
-                  Hyrax::CustomQueries::FindFileMetadata,
-                  Hyrax::CustomQueries::FindIdsByModel,
-                  Hyrax::CustomQueries::FindManyByAlternateIds,
-                  Hyrax::CustomQueries::FindModelsByAccess,
-                  Hyrax::CustomQueries::FindCountBy,
-                  Hyrax::CustomQueries::FindByDateRange]
-custom_queries.each do |handler|
-  Hyrax.query_service.custom_queries.register_query_handler(handler)
+Rails.application.reloader.to_prepare do
+  custom_queries = [Hyrax::CustomQueries::Navigators::CollectionMembers,
+                    Hyrax::CustomQueries::Navigators::ChildCollectionsNavigator,
+                    Hyrax::CustomQueries::Navigators::ParentCollectionsNavigator,
+                    Hyrax::CustomQueries::Navigators::ChildFileSetsNavigator,
+                    Hyrax::CustomQueries::Navigators::ChildWorksNavigator,
+                    Hyrax::CustomQueries::Navigators::ParentWorkNavigator,
+                    Hyrax::CustomQueries::Navigators::FindFiles,
+                    Hyrax::CustomQueries::FindAccessControl,
+                    Hyrax::CustomQueries::FindCollectionsByType,
+                    Hyrax::CustomQueries::FindFileMetadata,
+                    Hyrax::CustomQueries::FindIdsByModel,
+                    Hyrax::CustomQueries::FindManyByAlternateIds,
+                    Hyrax::CustomQueries::FindModelsByAccess,
+                    Hyrax::CustomQueries::FindCountBy,
+                    Hyrax::CustomQueries::FindByDateRange]
+  custom_queries.each do |handler|
+    Hyrax.query_service.custom_queries.register_query_handler(handler)
+  end
 end
 
+
 ActiveFedora.init(solr_config_path: Rails.root.join('config', 'solr.yml'))

data/.koppie/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/.koppie/config/initializers/riiif.rb

@@ -35,32 +35,35 @@ 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
 
+
   class RiiifFileResolver
     include ActiveSupport::Benchmarkable
 

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

@@ -50,9 +50,9 @@ en:
     directory:
       suffix: "@example.org"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2022 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
-    product_name: Koppie
+    product_name: Hyrax
     product_twitter_handle: "@SamveraRepo"

data/.koppie/config/puma.rb

@@ -4,19 +4,20 @@
 # 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 }
-threads threads_count, threads_count
+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 }
+port        ENV.fetch("PORT", 3000)
 
 # Specifies the `environment` that Puma will run in.
 #
-environment ENV.fetch("RAILS_ENV") { "development" }
+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" }
+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
@@ -24,14 +25,32 @@ pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).
 #
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+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!
+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/.koppie/config/routes.rb

@@ -12,6 +12,8 @@ Rails.application.routes.draw do
     concerns :searchable
   end
   devise_for :users
+  mount Hydra::RoleManagement::Engine => '/'
+
   mount Sidekiq::Web => '/sidekiq'
   mount Qa::Engine => '/authorities'
   mount Hyrax::Engine, at: '/'