The server cannot process the request due to a client error. Please check the request and try again. If you’re the application owner check the logs for more information.
+Continue to CalNet to sign in.
+ <%= f.submit 'Continue to CalNet' %> +<% end %> diff --git a/bin/setup b/bin/setup index ec47b79..be3db3c 100755 --- a/bin/setup +++ b/bin/setup @@ -1,11 +1,10 @@ #!/usr/bin/env ruby require "fileutils" -# path to your application root. APP_ROOT = File.expand_path("..", __dir__) def system!(*args) - system(*args) || abort("\n== Command #{args} failed ==") + system(*args, exception: true) end FileUtils.chdir APP_ROOT do @@ -14,7 +13,6 @@ FileUtils.chdir APP_ROOT do # Add necessary setup steps to this file. puts "== Installing dependencies ==" - system! "gem install bundler --conservative" system("bundle check") || system!("bundle install") # puts "\n== Copying sample files ==" @@ -28,6 +26,9 @@ FileUtils.chdir APP_ROOT do puts "\n== Removing old logs and tempfiles ==" system! "bin/rails log:clear tmp:clear" - puts "\n== Restarting application server ==" - system! "bin/rails restart" + unless ARGV.include?("--skip-server") + puts "\n== Starting development server ==" + STDOUT.flush # flush the output before exec(2) so that it displays + exec "bin/dev" + end end diff --git a/config/application.rb b/config/application.rb index 539a5aa..0cf1595 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,17 +1,13 @@ -# ------------------------------------------------------------ -# Standard Rails initialization - -require File.expand_path('boot', __dir__) +require_relative 'boot' require 'rails' +# Pick the frameworks you want: require 'active_model/railtie' +require 'active_job/railtie' require 'active_record/railtie' +require 'active_storage/engine' require 'action_controller/railtie' require 'action_view/railtie' -require 'sprockets/railtie' - -# TODO: figure out why Bundler.require() doesn't pick this up -require 'berkeley_library/logging/railtie' # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. @@ -24,7 +20,20 @@ module UCBEARS class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 7.0 + config.load_defaults 8.0 + + # Please, add to the `ignore` list any other `lib` subdirectories that do + # not contain `.rb` files, or that should not be reloaded or eager loaded. + # Common ones are `templates`, `generators`, or `middleware`, for example. + config.autoload_lib(ignore: %w[tasks]) + + # Configuration for the application, engines, and railties goes here. + # + # These settings can be overridden in specific environments using the files + # in config/environments, which are processed later. + # + # config.time_zone = "Central Time (US & Canada)" + # config.eager_load_paths << Rails.root.join("extras") # Don't generate system test files. config.generators.system_tests = nil @@ -35,9 +44,9 @@ class Application < Rails::Application # TODO: fail fast if ENV not configured? BerkeleyLibrary::Alma::Config.default! - # CAS configuration - # - NOTE: overridden in production.rb - config.cas_host = ENV.fetch('CAS_HOST') { 'auth-test.berkeley.edu' } + config.x.cas_host = ENV.fetch('CAS_HOST') do + Rails.env.production? ? 'auth.berkeley.edu' : 'auth-test.berkeley.edu' + end config.after_initialize do BuildInfo.log! diff --git a/config/environments/development.rb b/config/environments/development.rb index 6ce8ee5..883b0ba 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,16 +1,10 @@ -# Read .env in local dev, but not in Docker -require 'berkeley_library/docker' -require 'dotenv/load' unless BerkeleyLibrary::Docker.running_in_container? - require 'active_support/core_ext/integer/time' Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - # In the development environment your application's code is reloaded any time - # it changes. This slows down response time but is perfect for development - # since you don't have to restart the web server when you make code changes. - config.cache_classes = false + # Make code changes take effect immediately without server restart. + config.enable_reloading = true # Do not eager load code on boot. config.eager_load = false @@ -18,60 +12,60 @@ # Show full error reports. config.consider_all_requests_local = true - # Enabling Lograge - config.lograge.enabled = true - - # Enable server timing + # Enable server timing. config.server_timing = true - # Enable/disable caching. By default caching is disabled. - # Run rails dev:cache to toggle caching. + # Enable/disable Action Controller caching. By default Action Controller caching is disabled. + # Run rails dev:cache to toggle Action Controller caching. if Rails.root.join('tmp/caching-dev.txt').exist? config.action_controller.perform_caching = true config.action_controller.enable_fragment_cache_logging = true - + config.public_file_server.headers = { 'cache-control' => "public, max-age=#{2.days.to_i}" } config.cache_store = :memory_store - config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{2.days.to_i}" - } else config.action_controller.perform_caching = false - config.cache_store = :null_store end + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log - # Raise exceptions for disallowed deprecations. - config.active_support.disallowed_deprecation = :raise - - # Tell Active Support which deprecation messages to disallow. - config.active_support.disallowed_deprecation_warnings = [] - # Raise an error on page load if there are pending migrations. config.active_record.migration_error = :page_load # Highlight code that triggered database queries in logs. config.active_record.verbose_query_logs = true - # Suppress logger output for asset requests. - config.assets.quiet = true + # Append comments with runtime information tags to SQL queries in logs. + config.active_record.query_log_tags_enabled = true - # Use simple polling - config.file_watcher = ActiveSupport::FileUpdateChecker + # Highlight code that enqueued background job in logs. + config.active_job.verbose_enqueue_logs = true + + # Allow cross-origin requests in development. + config.action_dispatch.default_headers['Access-Control-Allow-Origin'] = '*' - # Do not fallback to assets pipeline if a precompiled asset is missed. - # config.assets.compile = false + # Suppress logger output for asset requests. + config.assets.quiet = true - # A few tweaks to help with hotloading: + # Expand assets for easier debugging. config.assets.debug = true - config.assets.check_precompiled_asset = false - config.assets.compile = true + + # Use simple polling-style file watcher. + config.file_watcher = ActiveSupport::FileUpdateChecker # Raises error for missing translations. # config.i18n.raise_on_missing_translations = true - default_headers = config.action_dispatch.default_headers ||= {} - default_headers['Access-Control-Allow-Origin'] = '*' + # Annotate rendered view with file names. + config.action_view.annotate_rendered_view_with_filenames = true + + # Raise error when a before_action's only/except options reference missing actions. + config.action_controller.raise_on_missing_callback_actions = true + + # Apply autocorrection by RuboCop to files generated by `bin/rails generate`. + # config.generators.apply_rubocop_autocorrect_after_generate! end diff --git a/config/environments/production.rb b/config/environments/production.rb index af2598f..bb42154 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -4,62 +4,74 @@ # Settings specified here will take precedence over those in config/application.rb. # Code is not reloaded between requests. - config.cache_classes = true + config.enable_reloading = false - # Eager load code on boot. This eager loads most of Rails and - # your application in memory, allowing both threaded web servers - # and those relying on copy on write to perform better. - # Rake tasks automatically ignore this option for performance. + # Eager load code on boot for better performance and memory savings (ignored by Rake tasks). config.eager_load = true - # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false - config.action_controller.perform_caching = true + # Full error reports are disabled. + config.consider_all_requests_local = false - # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] - # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). - # config.require_master_key = true + # Turn on fragment caching in view templates. + config.action_controller.perform_caching = true - # Serve static files, because we don't run nginx in front. + # Serve static files from the app server. config.public_file_server.enabled = true - # Compress CSS using a preprocessor. - # config.assets.css_compressor = :sass - # Do not fallback to assets pipeline if a precompiled asset is missed. config.assets.compile = false + # Cache assets for far-future expiry since they are all digest stamped. + config.public_file_server.headers = { 'cache-control' => "public, max-age=#{1.year.to_i}" } + # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.asset_host = 'http://assets.example.com' + # config.asset_host = "http://assets.example.com" - # Specifies the header that your server uses for sending files. - # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Assume all access to the app is happening through a SSL-terminating reverse proxy. + config.assume_ssl = true # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true + config.force_ssl = true - # Use the lowest log level to ensure availability of diagnostic information - # when problems arise. - config.log_level = :debug + # Skip http-to-https redirect for the default health check endpoint. + # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } } - # Prepend all log lines with the following tags. config.log_tags = [:request_id] - # Use a different cache store in production. + # Change to "debug" to log everything (including potentially personally-identifiable information!) + config.log_level = ENV.fetch('RAILS_LOG_LEVEL', 'info') + + # Prevent health checks from clogging up the logs. + config.silence_healthcheck_path = '/up' + + # Don't log any deprecations. + config.active_support.report_deprecations = false + + # Replace the default in-process memory cache store with a durable alternative. # config.cache_store = :mem_cache_store + # Replace the default in-process and non-durable queuing backend for Active Job. + # config.active_job.queue_adapter = :resque + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to # the I18n.default_locale when a translation cannot be found). config.i18n.fallbacks = true - # Don't log any deprecations. - config.active_support.report_deprecations = false - # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false - # CAS configuration - # - NOTE: overrides application.rb - config.cas_host = ENV.fetch('CAS_HOST') { 'auth.berkeley.edu' } + # Only use :id for inspections in production. + config.active_record.attributes_for_inspect = [:id] + + # Enable DNS rebinding protection and other `Host` header attacks. + # config.hosts = [ + # "example.com", # Allow requests from example.com + # /.*\.example\.com/ # Allow requests from subdomains like `www.example.com` + # ] + # + # Skip DNS rebinding protection for the default health check endpoint. + # config.host_authorization = { exclude: ->(request) { request.path == "/up" } } end diff --git a/config/environments/test.rb b/config/environments/test.rb index 0c7070b..0aa2122 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,5 +1,3 @@ -require 'active_support/core_ext/integer/time' - # The test environment is used exclusively to run your application's # test suite. You never need to work with it otherwise. Remember that # your test database is "scratch space" for the test suite and is wiped @@ -8,46 +6,45 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - # Turn false under Spring and add config.action_view.cache_template_loading = true. - config.cache_classes = true + # While tests run files are not watched, reloading is not necessary. + config.enable_reloading = false - # Eager loading loads your whole application. When running a single test locally, - # this probably isn't necessary. It's a good idea to do in a continuous integration - # system, or in some way before deploying your code. - config.eager_load = false + # Eager loading loads your entire application. When running a single test locally, + # this is usually not necessary, and can slow down your test suite. However, it's + # recommended that you enable it in continuous integration systems to ensure eager + # loading is working properly before deploying your code. + config.eager_load = ENV['CI'].present? - # Configure public file server for tests with Cache-Control for performance. - config.public_file_server.enabled = true - config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{1.hour.to_i}" - } + # Configure public file server for tests with cache-control for performance. + config.public_file_server.headers = { 'cache-control' => 'public, max-age=3600' } - # Show full error reports and disable caching. - config.consider_all_requests_local = true - config.action_controller.perform_caching = false + # Show full error reports. + config.consider_all_requests_local = true config.cache_store = :null_store - # Raise exceptions instead of rendering exception templates. - config.action_dispatch.show_exceptions = false + # Render exception templates for rescuable exceptions and raise for other exceptions. + config.action_dispatch.show_exceptions = :rescuable # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr - # Raise exceptions for disallowed deprecations. - config.active_support.disallowed_deprecation = :raise - - # Tell Active Support which deprecation messages to disallow. - config.active_support.disallowed_deprecation_warnings = [] - # Raises error for missing translations. # config.i18n.raise_on_missing_translations = true - # Test mode short-circuits the entire auth flow OmniAuth.config.test_mode = true + # Annotate rendered view with file names. + # config.action_view.annotate_rendered_view_with_filenames = true + + # Raise error when a before_action's only/except options reference missing actions. + config.action_controller.raise_on_missing_callback_actions = true + config.iiif_base_url = 'http://iipsrv.test/iiif/' config.lending_root = 'spec/data/lending' end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 404859e..ee1f11b 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -5,21 +5,3 @@ # Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path -# Add Yarn node_modules folder to the asset load path. -# Rails.application.config.assets.paths << Rails.root.join('node_modules') - -# Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in the app/assets -# folder are already added. -Rails.application.config.assets.precompile += %w[*.png] - -Rails.application.config.assets.precompile += %w[ - application.js - items.js - terms.js - viewer.js - marc-reload.js -] -# Rails.application.config.assets.configure do |env| -# env.css_compressor = :sass -# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb index 4a994e1..f72dcdf 100644 --- a/config/initializers/filter_parameter_logging.rb +++ b/config/initializers/filter_parameter_logging.rb @@ -1,4 +1,8 @@ # Be sure to restart your server when you modify this file. -# Configure sensitive parameters which will be filtered from the log file. -Rails.application.config.filter_parameters += [:password] +# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file. +# Use this to limit dissemination of sensitive information. +# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors. +Rails.application.config.filter_parameters += %i[ + passw email secret token _key crypt salt certificate otp ssn cvv cvc +] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 57443f7..10ab3de 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -1,3 +1,20 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, "\\1en" +# inflect.singular /^(ox)en/i, "\\1" +# inflect.irregular "person", "people" +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym "RESTful" +# end + ActiveSupport::Inflector.inflections do |inflect| - %w[IIIF UCBLIT UCBEARS].each { |a| inflect.acronym(a) } + %w[IIIF UCBLIT UCBEARS].each { |acronym| inflect.acronym(acronym) } end diff --git a/config/initializers/okcomputer.rb b/config/initializers/okcomputer.rb index 21e24ac..6164d34 100644 --- a/config/initializers/okcomputer.rb +++ b/config/initializers/okcomputer.rb @@ -1,4 +1,4 @@ -require 'health_checks' +require Rails.root.join('app/lib/health_checks') OkComputer.logger = Rails.logger OkComputer.check_in_parallel = true diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 3bc511e..a4398e1 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -19,11 +19,13 @@ provider :cas, name: :calnet, - host: Rails.application.config.cas_host, + host: Rails.application.config.x.cas_host, login_url: '/cas/login', service_validate_url: '/cas/p3/serviceValidate', fetch_raw_info: fetch_raw_info + OmniAuth.config.allowed_request_methods = %i[post] + # Override the default 'puts' logger that Omniauth uses. OmniAuth.config.logger = Rails.logger end diff --git a/config/initializers/pagy.rb b/config/initializers/pagy.rb index 4aa3464..ef3c8cf 100644 --- a/config/initializers/pagy.rb +++ b/config/initializers/pagy.rb @@ -1,232 +1,51 @@ # frozen_string_literal: true -# Pagy initializer file (5.6.4) -# Customize only what you really need and notice that the core Pagy works also without any of the following lines. -# Should you just cherry pick part of this file, please maintain the require-order of the extras - -# Pagy DEFAULT Variables -# See https://ddnexus.github.io/pagy/api/pagy#variables -# All the Pagy::DEFAULT are set for all the Pagy instances but can be overridden per instance by just passing them to -# Pagy.new|Pagy::Countless.new|Pagy::Calendar::*.new or any of the #pagy* controller methods - -# Instance variables -# See https://ddnexus.github.io/pagy/api/pagy#instance-variables -# Pagy::DEFAULT[:page] = 1 # default -# Pagy::DEFAULT[:items] = 20 # default -# Pagy::DEFAULT[:outset] = 0 # default +# Pagy initializer file (43.2.10) +# See https://ddnexus.github.io/pagy/resources/initializer/ # TODO: something more configurable -Pagy::DEFAULT[:items] = 2 if Rails.env.development? - -# Other Variables -# See https://ddnexus.github.io/pagy/api/pagy#other-variables -# Pagy::DEFAULT[:size] = [1,4,4,1] # default -# Pagy::DEFAULT[:page_param] = :page # default -# The :params can be also set as a lambda e.g ->(params){ params.exclude('useless').merge!('custom' => 'useful') } -# Pagy::DEFAULT[:params] = {} # default -# Pagy::DEFAULT[:fragment] = '#fragment' # example -# Pagy::DEFAULT[:link_extra] = 'data-remote="true"' # example -# Pagy::DEFAULT[:i18n_key] = 'pagy.item_name' # default -# Pagy::DEFAULT[:cycle] = true # example - -# Extras -# See https://ddnexus.github.io/pagy/extras - -# Backend Extras +Pagy.options[:limit] = 2 if Rails.env.development? +Pagy.options[:limit] = 5 if Rails.env.test? -# Array extra: Paginate arrays efficiently, avoiding expensive array-wrapping and without overriding -# See https://ddnexus.github.io/pagy/extras/array -# require 'pagy/extras/array' - -# Calendar extra: Add pagination filtering by calendar time unit (year, quarter, month, week, day) -# See https://ddnexus.github.io/pagy/extras/calendar -# require 'pagy/extras/calendar' -# Default for each unit -# Pagy::Calendar::Year::DEFAULT[:order] = :asc # Time direction of pagination -# Pagy::Calendar::Year::DEFAULT[:format] = '%Y' # strftime format -# -# Pagy::Calendar::Quarter::DEFAULT[:order] = :asc # Time direction of pagination -# Pagy::Calendar::Quarter::DEFAULT[:format] = '%Y-Q%q' # strftime format -# -# Pagy::Calendar::Month::DEFAULT[:order] = :asc # Time direction of pagination -# Pagy::Calendar::Month::DEFAULT[:format] = '%Y-%m' # strftime format -# -# Pagy::Calendar::Week::DEFAULT[:order] = :asc # Time direction of pagination -# Pagy::Calendar::Week::DEFAULT[:format] = '%Y-%W' # strftime format -# Pagy::Calendar::Week::DEFAULT[:offset] = 0 # Day offset from Sunday (0: Sunday; 1: Monday;... 6: Saturday) -# -# Pagy::Calendar::Day::DEFAULT[:order] = :asc # Time direction of pagination -# Pagy::Calendar::Day::DEFAULT[:format] = '%Y-%m-%d' # strftime format +############ Global Options ################################################################ +# See https://ddnexus.github.io/pagy/toolbox/options/ for details. +# Add your global options below. They will be applied globally. +# For example: # -# Uncomment the following lines, if you need calendar localization without using the I18n extra -# module LocalizePagyCalendar -# def localize(time, opts) -# ::I18n.l(time, **opts) -# end -# end -# Pagy::Calendar.prepend LocalizePagyCalendar - -# Countless extra: Paginate without any count, saving one query per rendering -# See https://ddnexus.github.io/pagy/extras/countless -# require 'pagy/extras/countless' -# Pagy::DEFAULT[:countless_minimal] = false # default (eager loading) - -# Elasticsearch Rails extra: Paginate `ElasticsearchRails::Results` objects -# See https://ddnexus.github.io/pagy/extras/elasticsearch_rails -# default :pagy_search method: change only if you use also -# the searchkick or meilisearch extra that defines the same -# Pagy::DEFAULT[:elasticsearch_rails_search_method] = :pagy_search -# require 'pagy/extras/elasticsearch_rails' - -# Headers extra: http response headers (and other helpers) useful for API pagination -# See http://ddnexus.github.io/pagy/extras/headers -require 'pagy/extras/headers' -# Pagy::DEFAULT[:headers] = { page: 'Current-Page', -# items: 'Page-Items', -# count: 'Total-Count', -# pages: 'Total-Pages' } # default -# TODO: put links in JSON response instead - -# Meilisearch extra: Paginate `Meilisearch` result objects -# See https://ddnexus.github.io/pagy/extras/meilisearch -# default :pagy_search method: change only if you use also -# the elasticsearch_rails or searchkick extra that define the same method -# Pagy::DEFAULT[:meilisearch_search_method] = :pagy_search -# require 'pagy/extras/meilisearch' - -# Metadata extra: Provides the pagination metadata to Javascript frameworks like Vue.js, react.js, etc. -# See https://ddnexus.github.io/pagy/extras/metadata -# you must require the shared internal extra (BEFORE the metadata extra) ONLY if you need also the :sequels -# require 'pagy/extras/shared' -# require 'pagy/extras/metadata' -# For performance reasons, you should explicitly set ONLY the metadata you use in the frontend -# Pagy::DEFAULT[:metadata] = %i[scaffold_url page prev next last] # example - -# Searchkick extra: Paginate `Searchkick::Results` objects -# See https://ddnexus.github.io/pagy/extras/searchkick -# default :pagy_search method: change only if you use also -# the elasticsearch_rails or meilisearch extra that defines the same -# DEFAULT[:searchkick_search_method] = :pagy_search -# require 'pagy/extras/searchkick' -# uncomment if you are going to use Searchkick.pagy_search -# Searchkick.extend Pagy::Searchkick - -# Frontend Extras - -# Bootstrap extra: Add nav, nav_js and combo_nav_js helpers and templates for Bootstrap pagination -# See https://ddnexus.github.io/pagy/extras/bootstrap -# require 'pagy/extras/bootstrap' - -# Bulma extra: Add nav, nav_js and combo_nav_js helpers and templates for Bulma pagination -# See https://ddnexus.github.io/pagy/extras/bulma -# require 'pagy/extras/bulma' - -# Foundation extra: Add nav, nav_js and combo_nav_js helpers and templates for Foundation pagination -# See https://ddnexus.github.io/pagy/extras/foundation -# require 'pagy/extras/foundation' +# Pagy.options[:limit] = 10 # Limit the items per page +# Pagy.options[:client_max_limit] = 100 # The client can request a limit up to 100 +# Pagy.options[:max_pages] = 200 # Allow only 200 pages +# Pagy.options[:jsonapi] = true # Use JSON:API compliant URLs -# Materialize extra: Add nav, nav_js and combo_nav_js helpers for Materialize pagination -# See https://ddnexus.github.io/pagy/extras/materialize -# require 'pagy/extras/materialize' - -# Navs extra: Add nav_js and combo_nav_js javascript helpers -# Notice: the other frontend extras add their own framework-styled versions, -# so require this extra only if you need the unstyled version -# See https://ddnexus.github.io/pagy/extras/navs -# require 'pagy/extras/navs' - -# Semantic extra: Add nav, nav_js and combo_nav_js helpers for Semantic UI pagination -# See https://ddnexus.github.io/pagy/extras/semantic -# require 'pagy/extras/semantic' - -# UIkit extra: Add nav helper and templates for UIkit pagination -# See https://ddnexus.github.io/pagy/extras/uikit -# require 'pagy/extras/uikit' - -# Multi size var used by the *_nav_js helpers -# See https://ddnexus.github.io/pagy/extras/navs#steps -# Pagy::DEFAULT[:steps] = { 0 => [2,3,3,2], 540 => [3,5,5,3], 720 => [5,7,7,5] } # example - -# Feature Extras - -# Gearbox extra: Automatically change the number of items per page depending on the page number -# See https://ddnexus.github.io/pagy/extras/gearbox -# require 'pagy/extras/gearbox' -# set to false only if you want to make :gearbox_extra an opt-in variable -# Pagy::DEFAULT[:gearbox_extra] = false # default true -# Pagy::DEFAULT[:gearbox_items] = [15, 30, 60, 100] # default - -# Items extra: Allow the client to request a custom number of items per page with an optional selector UI -# See https://ddnexus.github.io/pagy/extras/items -# require 'pagy/extras/items' -# set to false only if you want to make :items_extra an opt-in variable -# Pagy::DEFAULT[:items_extra] = false # default true -# Pagy::DEFAULT[:items_param] = :items # default -# Pagy::DEFAULT[:max_items] = 100 # default - -# Overflow extra: Allow for easy handling of overflowing pages -# See https://ddnexus.github.io/pagy/extras/overflow -# require 'pagy/extras/overflow' -# Pagy::DEFAULT[:overflow] = :empty_page # default (other options: :last_page and :exception) - -# Support extra: Extra support for features like: incremental, infinite, auto-scroll pagination -# See https://ddnexus.github.io/pagy/extras/support -# require 'pagy/extras/support' - -# Trim extra: Remove the page=1 param from links -# See https://ddnexus.github.io/pagy/extras/trim -# require 'pagy/extras/trim' -# set to false only if you want to make :trim_extra an opt-in variable -# Pagy::DEFAULT[:trim_extra] = false # default true - -# Standalone extra: Use pagy in non Rack environment/gem -# See https://ddnexus.github.io/pagy/extras/standalone -# require 'pagy/extras/standalone' -# Pagy::DEFAULT[:url] = 'http://www.example.com/subdir' # optional default - -# Rails - -# Rails: extras assets path required by the helpers that use javascript -# (pagy*_nav_js, pagy*_combo_nav_js, and pagy_items_selector_js) -# See https://ddnexus.github.io/pagy/extras#javascript -# Rails.application.config.assets.paths << Pagy.root.join('javascripts') - -# I18n - -# Pagy internal I18n: ~18x faster using ~10x less memory than the i18n gem -# See https://ddnexus.github.io/pagy/api/frontend#i18n -# Notice: No need to configure anything in this section if your app uses only "en" -# or if you use the i18n extra below +############ JavaScript #################################################################### +# See https://ddnexus.github.io/pagy/resources/javascript/ for details. +# Examples for Rails: +# For apps with an assets pipeline +# Rails.application.config.assets.paths << Pagy::ROOT.join('javascripts') # -# Examples: -# load the "de" built-in locale: -# Pagy::I18n.load(locale: 'de') -# -# load the "de" locale defined in the custom file at :filepath: -# Pagy::I18n.load(locale: 'de', filepath: 'path/to/pagy-de.yml') -# -# load the "de", "en" and "es" built-in locales: -# (the first passed :locale will be used also as the default_locale) -# Pagy::I18n.load({ locale: 'de' }, -# { locale: 'en' }, -# { locale: 'es' }) +# For apps with a javascript builder (e.g. esbuild, webpack, etc.) +# javascript_dir = Rails.root.join('app/javascript') +# Pagy.sync_javascript(javascript_dir, 'pagy.mjs') if Rails.env.development? + +############# Overriding Pagy::I18n Lookup ################################################# +# Refer to https://ddnexus.github.io/pagy/resources/i18n/ for details. +# Override the I18n lookup by dropping your custom dictionary in some pagy dir. +# Example for Rails: # -# load the "en" built-in locale, a custom "es" locale, -# and a totally custom locale complete with a custom :pluralize proc: -# (the first passed :locale will be used also as the default_locale) -# Pagy::I18n.load({ locale: 'en' }, -# { locale: 'es', filepath: 'path/to/pagy-es.yml' }, -# { locale: 'xyz', # not built-in -# filepath: 'path/to/pagy-xyz.yml', -# pluralize: lambda{ |count| ... } ) +# Pagy::I18n.pathnames << Rails.root.join('config/locales/pagy') -# I18n extra: uses the standard i18n gem which is ~18x slower using ~10x more memory -# than the default pagy internal i18n (see above) -# See https://ddnexus.github.io/pagy/extras/i18n -# require 'pagy/extras/i18n' +############# I18n Gem Translation ######################################################### +# See https://ddnexus.github.io/pagy/resources/i18n/ for details. +# +# Pagy.translate_with_the_slower_i18n_gem! -# Default i18n key -# Pagy::DEFAULT[:i18n_key] = 'pagy.item_name' # default +############# Calendar Localization for non-en locales #################################### +# See https://ddnexus.github.io/pagy/toolbox/paginators/calendar#localization for details. +# Add your desired locales to the list and uncomment the following line to enable them, +# regardless of whether you use the I18n gem for translations or not, whether with +# Rails or not. +# +# Pagy::Calendar.localize_with_rails_i18n_gem(*your_locales) # When you are done setting your own default freeze it, so it will not get changed accidentally -Pagy::DEFAULT.freeze +Pagy.options.freeze diff --git a/config/puma.rb b/config/puma.rb index 0593712..565587c 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,43 +1,41 @@ -# 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. +# This configuration file will be evaluated by Puma. The top-level methods that +# are invoked here are part of Puma's configuration DSL. For more information +# about methods provided by the DSL, see https://puma.io/puma/Puma/DSL.html. # -max_threads_count = ENV.fetch('RAILS_MAX_THREADS', 5) -min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count } -threads min_threads_count, max_threads_count - -# Specifies the `worker_timeout` threshold that Puma will use to wait before -# terminating a worker in development environments. +# Puma starts a configurable number of processes (workers) and each process +# serves each request in a thread from an internal thread pool. # -worker_timeout 3600 if ENV.fetch('RAILS_ENV', 'development') == 'development' - -# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# You can control the number of workers using ENV["WEB_CONCURRENCY"]. You +# should only set this value when you want to run 2 or more workers. The +# default is already 1. # -port ENV.fetch('PORT', 3000) - -# Specifies the `environment` that Puma will run in. +# The ideal number of threads per worker depends both on how much time the +# application spends waiting for IO operations and on how much you wish to +# prioritize throughput over latency. # -environment ENV.fetch('RAILS_ENV') { 'development' } - -# 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 web server 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). +# As a rule of thumb, increasing the number of threads will increase how much +# traffic a given process can handle (throughput), but due to CRuby's +# Global VM Lock (GVL) it has diminishing returns and will degrade the +# response time (latency) of the application. # -# workers ENV.fetch("WEB_CONCURRENCY") { 2 } - -# 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. +# The default is set to 5 threads as it's deemed a decent compromise between +# throughput and latency for the average Rails application. # -# preload_app! +# Any libraries that use a connection pool or another resource pool should +# be configured to provide at least as many connections as the number of +# threads. This includes Active Record's `pool` parameter in `database.yml`. +threads_count = ENV.fetch('RAILS_MAX_THREADS', 5) +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +port ENV.fetch('PORT', 3000) # Allow puma to be restarted by `bin/rails restart` command. plugin :tmp_restart + +# Run the Solid Queue supervisor inside of Puma for single-server deployments +plugin :solid_queue if ENV['SOLID_QUEUE_IN_PUMA'] + +# Specify the PID file. Defaults to tmp/pids/server.pid in development. +# In other environments, only set the PID file if requested. +pidfile ENV['PIDFILE'] if ENV['PIDFILE'] diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 0000000..db2757d --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("artifacts/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use bin/rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket-<%= Rails.env %> + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket-<%= Rails.env %> + +# Use bin/rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name-<%= Rails.env %> + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/migrate/20260226192155_add_service_name_to_active_storage_blobs.active_storage.rb b/db/migrate/20260226192155_add_service_name_to_active_storage_blobs.active_storage.rb new file mode 100644 index 0000000..a15c6ce --- /dev/null +++ b/db/migrate/20260226192155_add_service_name_to_active_storage_blobs.active_storage.rb @@ -0,0 +1,22 @@ +# This migration comes from active_storage (originally 20190112182829) +class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0] + def up + return unless table_exists?(:active_storage_blobs) + + unless column_exists?(:active_storage_blobs, :service_name) + add_column :active_storage_blobs, :service_name, :string + + if configured_service = ActiveStorage::Blob.service.name + ActiveStorage::Blob.unscoped.update_all(service_name: configured_service) + end + + change_column :active_storage_blobs, :service_name, :string, null: false + end + end + + def down + return unless table_exists?(:active_storage_blobs) + + remove_column :active_storage_blobs, :service_name + end +end diff --git a/db/migrate/20260226192156_create_active_storage_variant_records.active_storage.rb b/db/migrate/20260226192156_create_active_storage_variant_records.active_storage.rb new file mode 100644 index 0000000..94ac83a --- /dev/null +++ b/db/migrate/20260226192156_create_active_storage_variant_records.active_storage.rb @@ -0,0 +1,27 @@ +# This migration comes from active_storage (originally 20191206030411) +class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0] + def change + return unless table_exists?(:active_storage_blobs) + + # Use Active Record's configured type for primary key + create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t| + t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type + t.string :variation_digest, null: false + + t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true + t.foreign_key :active_storage_blobs, column: :blob_id + end + end + + private + def primary_key_type + config = Rails.configuration.generators + config.options[config.orm][:primary_key_type] || :primary_key + end + + def blobs_primary_key_type + pkey_name = connection.primary_key(:active_storage_blobs) + pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name } + pkey_column.bigint? ? :bigint : pkey_column.type + end +end diff --git a/db/migrate/20260226192157_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb b/db/migrate/20260226192157_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb new file mode 100644 index 0000000..93c8b85 --- /dev/null +++ b/db/migrate/20260226192157_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb @@ -0,0 +1,8 @@ +# This migration comes from active_storage (originally 20211119233751) +class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0] + def change + return unless table_exists?(:active_storage_blobs) + + change_column_null(:active_storage_blobs, :checksum, true) + end +end diff --git a/db/schema.rb b/db/schema.rb index 8b97ffe..966c151 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,9 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2021_12_29_223302) do +ActiveRecord::Schema[8.0].define(version: 2026_02_26_192157) do # These are extensions that must be enabled in order to support this database - enable_extension "plpgsql" + enable_extension "pg_catalog.plpgsql" create_table "items", force: :cascade do |t| t.string "directory" diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index ec8a4b9..c7387c1 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -5,6 +5,7 @@ services: build: !reset environment: - CAPYBARA_SAVE_PATH=/opt/app/artifacts + - SECRET_KEY_BASE=${SECRET_KEY_BASE} env_file: !reset [] image: ${DOCKER_APP_IMAGE} depends_on: @@ -22,10 +23,6 @@ services: volumes: !override - artifacts:/build - selenium-chrome: - depends_on: - - selenium - adminer: !reset volumes: diff --git a/docker-compose.yml b/docker-compose.yml index fa428a5..e394823 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,6 @@ services: - db - iipsrv - selenium - - selenium-chrome environment: &app-environment LIT_LENDING_ROOT: spec/data/lending LIT_IIIF_BASE_URL: http://iipsrv.test/iiif/ @@ -77,35 +76,18 @@ services: - iipsrv.test selenium: - image: selenium/hub + image: selenium/standalone-chromium networks: default: aliases: - selenium.test ports: - - 4442:4442 - - 4443:4443 - 4444:4444 + - 7900:7900 + shm_size: 512mb volumes: - ./:/build:rw - selenium-chrome: - depends_on: - - selenium - environment: - - SE_EVENT_BUS_HOST=selenium - - SE_EVENT_BUS_PUBLISH_PORT=4442 - - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - image: seleniarm/node-chromium:latest - ports: - # @note Use `open vnc://localhost:55900` to view the chrome session. - # Doesn't work if you pass the "headless" option via Capybara. - # Password = "secret" - - 55900:5900 - volumes: - - /dev/shm:/dev/shm:rw - - ./:/build:rw - adminer: image: adminer restart: always diff --git a/lib/tasks/js.rake b/lib/tasks/js.rake index 06c61b1..a11bcfd 100644 --- a/lib/tasks/js.rake +++ b/lib/tasks/js.rake @@ -60,8 +60,8 @@ module BerkeleyLibrary # @param silence_errors [Boolean] whether to warn when the eslint command returns a nonzero exit status. # @return [Integer] 0 for success, nonzero value for failure # @yieldparam exit_status [Integer] 0 for success, nonzero value for failure - def write_to_console(silence_errors: true, &block) - run_cmd(eslint_cmd, silence_errors:, &block) + def write_to_console(silence_errors: true, &) + run_cmd(eslint_cmd, silence_errors:, &) end # Fixes any detected problems that can be auto-fixed. @@ -76,7 +76,7 @@ module BerkeleyLibrary def ensure_report_path! report_path.tap do |p| - FileUtils.rm(p) if File.exist?(p) + FileUtils.rm_f(p) report_dir = File.dirname(p) FileUtils.mkdir_p(report_dir) unless File.directory?(report_dir) end @@ -85,7 +85,7 @@ module BerkeleyLibrary def eslint_cmd(*args) %w[yarn eslint].tap do |cmd| cmd.concat(args) - cmd.concat(%w[--ext .js,.vue]) + cmd.push('--ext', '.js,.vue') cmd.concat(js_dirs) end end diff --git a/package.json b/package.json index 18cf1a7..c931660 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "start": "webpack-dev-server --config webpack.config.js --hot --progress --color --port 3035" }, "devDependencies": { + "baseline-browser-mapping": "^2.10.0", "webpack-dev-server": "^5.2.2" } } diff --git a/public/400.html b/public/400.html new file mode 100644 index 0000000..282dbc8 --- /dev/null +++ b/public/400.html @@ -0,0 +1,114 @@ + + + + + + +The server cannot process the request due to a client error. Please check the request and try again. If you’re the application owner check the logs for more information.
+You may have mistyped the address or the page may have moved.
-If you are the application owner check the logs for more information.
-The page you were looking for doesn’t exist. You may have mistyped the address or the page may have moved. If you’re the application owner check the logs for more information.
+Maybe you tried to change something you didn't have access to.
-If you are the application owner check the logs for more information.
-The change you wanted was rejected. Maybe you tried to change something you didn’t have access to. If you’re the application owner check the logs for more information.
+If you are the application owner check the logs for more information.
-We’re sorry, but something went wrong.
If you’re the application owner check the logs for more information.