diff --git a/Gemfile b/Gemfile index eb531bc27..7db0bf560 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ end gem 'bootsnap', require: false gem 'puma' -gem 'rails', '~> 7.0.8' +gem 'rails', '~> 7.1.5' gem 'jquery-rails', '~> 4.0' gem 'haml', '~> 5.0' gem 'json' @@ -71,7 +71,6 @@ gem 'rest-client' # for etsource gem 'git', github: 'bradhe/ruby-git' gem 'fnv' -gem 'msgpack' gem 'parallel' gem 'ruby-progressbar' @@ -107,7 +106,7 @@ group :test, :development do gem 'factory_bot_rails' gem 'pry-byebug' gem 'pry-rails' - gem 'rspec-rails', '~> 6.0' + gem 'rspec-rails', '~> 7.0' gem 'watchr' gem 'rubocop', '~> 1.27', require: false diff --git a/Gemfile.lock b/Gemfile.lock index a5e8eae85..8f00e96b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,63 +75,68 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8.5) - actionpack (= 7.0.8.5) - activesupport (= 7.0.8.5) + actioncable (7.1.5.1) + actionpack (= 7.1.5.1) + activesupport (= 7.1.5.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.5) - actionpack (= 7.0.8.5) - activejob (= 7.0.8.5) - activerecord (= 7.0.8.5) - activestorage (= 7.0.8.5) - activesupport (= 7.0.8.5) + zeitwerk (~> 2.6) + actionmailbox (7.1.5.1) + actionpack (= 7.1.5.1) + activejob (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.5) - actionpack (= 7.0.8.5) - actionview (= 7.0.8.5) - activejob (= 7.0.8.5) - activesupport (= 7.0.8.5) + actionmailer (7.1.5.1) + actionpack (= 7.1.5.1) + actionview (= 7.1.5.1) + activejob (= 7.1.5.1) + activesupport (= 7.1.5.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8.5) - actionview (= 7.0.8.5) - activesupport (= 7.0.8.5) - rack (~> 2.0, >= 2.2.4) + rails-dom-testing (~> 2.2) + actionpack (7.1.5.1) + actionview (= 7.1.5.1) + activesupport (= 7.1.5.1) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.5) - actionpack (= 7.0.8.5) - activerecord (= 7.0.8.5) - activestorage (= 7.0.8.5) - activesupport (= 7.0.8.5) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.5.1) + actionpack (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.5) - activesupport (= 7.0.8.5) + actionview (7.1.5.1) + activesupport (= 7.1.5.1) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.5) - activesupport (= 7.0.8.5) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.5.1) + activesupport (= 7.1.5.1) globalid (>= 0.3.6) - activemodel (7.0.8.5) - activesupport (= 7.0.8.5) + activemodel (7.1.5.1) + activesupport (= 7.1.5.1) activemodel-serializers-xml (1.0.3) activemodel (>= 5.0.0.a) activesupport (>= 5.0.0.a) builder (~> 3.1) - activerecord (7.0.8.5) - activemodel (= 7.0.8.5) - activesupport (= 7.0.8.5) + activerecord (7.1.5.1) + activemodel (= 7.1.5.1) + activesupport (= 7.1.5.1) + timeout (>= 0.4.0) activerecord-session_store (2.1.0) actionpack (>= 6.1) activerecord (>= 6.1) @@ -143,17 +148,24 @@ GEM activemodel (>= 6.0) activemodel-serializers-xml (~> 1.0) activesupport (>= 6.0) - activestorage (7.0.8.5) - actionpack (= 7.0.8.5) - activejob (= 7.0.8.5) - activerecord (= 7.0.8.5) - activesupport (= 7.0.8.5) + activestorage (7.1.5.1) + actionpack (= 7.1.5.1) + activejob (= 7.1.5.1) + activerecord (= 7.1.5.1) + activesupport (= 7.1.5.1) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8.5) + activesupport (7.1.5.1) + base64 + benchmark (>= 0.3) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) + mutex_m + securerandom (>= 0.3) tzinfo (~> 2.0) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) @@ -165,11 +177,12 @@ GEM ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) base64 (0.2.0) + benchmark (0.4.0) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - bigdecimal (3.1.8) + bigdecimal (3.1.9) bindata (2.5.0) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) @@ -198,22 +211,23 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) config (4.1.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) - connection_pool (2.4.1) + connection_pool (2.5.0) crass (1.0.6) csv (3.3.0) dalli (3.2.3) - date (3.3.4) + date (3.4.1) debug_inspector (1.1.0) deep_merge (1.2.2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - diff-lcs (1.5.0) + diff-lcs (1.6.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) + drb (2.2.1) dry-configurable (1.0.1) dry-core (~> 1.0, < 2) zeitwerk (~> 2.6) @@ -260,7 +274,7 @@ GEM equalizer (0.0.11) erb-formatter (0.7.3) syntax_tree (~> 6.0) - erubi (1.13.0) + erubi (1.13.1) execjs (2.8.1) factory_bot (6.2.0) activesupport (>= 5.0.0) @@ -291,7 +305,7 @@ GEM http-cookie (1.0.4) domain_name (~> 0.5) http_accept_language (2.1.1) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) ice_nine (0.11.2) importmap-rails (2.0.3) @@ -301,6 +315,11 @@ GEM inline_svg (1.10.0) activesupport (>= 3.0) nokogiri (>= 1.6) + io-console (0.8.0) + irb (1.15.1) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) @@ -337,12 +356,13 @@ GEM libv8-node (16.10.0.0-arm64-darwin) libv8-node (16.10.0.0-x86_64-darwin) libv8-node (16.10.0.0-x86_64-linux) + libv8-node (16.10.0.0-x86_64-linux-musl) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) local_time (2.1.0) - logger (1.6.1) - loofah (2.22.0) + logger (1.6.6) + loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -350,44 +370,53 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) method_source (1.1.0) mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) mini_mime (1.1.5) - mini_portile2 (2.8.7) + mini_portile2 (2.8.8) mini_racer (0.6.2) libv8-node (~> 16.10.0.0) - minitest (5.25.1) - msgpack (1.4.5) + minitest (5.25.5) + msgpack (1.8.0) multi_json (1.15.0) + mutex_m (0.3.0) mysql2 (0.5.6) net-http (0.6.0) uri - net-imap (0.4.10) + net-imap (0.5.6) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.1) net-protocol netrc (0.11.0) newrelic_rpm (8.5.0) - nio4r (2.7.3) - nokogiri (1.16.7) + nio4r (2.7.4) + nokogiri (1.18.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.16.7-aarch64-linux) + nokogiri (1.18.4-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.4-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.4-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.4-arm-linux-musl) racc (~> 1.4) - nokogiri (1.16.7-arm64-darwin) + nokogiri (1.18.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.7-x86_64-darwin) + nokogiri (1.18.4-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.7-x86_64-linux) + nokogiri (1.18.4-x86_64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.4-x86_64-linux-musl) racc (~> 1.4) numo-narray (0.9.2.0) omniauth (2.1.2) @@ -416,7 +445,10 @@ GEM parallel (1.22.1) parser (3.2.0.0) ast (~> 2.4.1) + pp (0.6.2) + prettyprint prettier_print (1.2.1) + prettyprint (0.2.0) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) @@ -425,6 +457,9 @@ GEM pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) + psych (5.2.3) + date + stringio public_suffix (5.0.0) puma (5.6.9) nio4r (~> 2.0) @@ -442,22 +477,27 @@ GEM rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) - rack-test (2.1.0) + rack-session (1.0.2) + rack (< 3) + rack-test (2.2.0) rack (>= 1.3) - rails (7.0.8.5) - actioncable (= 7.0.8.5) - actionmailbox (= 7.0.8.5) - actionmailer (= 7.0.8.5) - actionpack (= 7.0.8.5) - actiontext (= 7.0.8.5) - actionview (= 7.0.8.5) - activejob (= 7.0.8.5) - activemodel (= 7.0.8.5) - activerecord (= 7.0.8.5) - activestorage (= 7.0.8.5) - activesupport (= 7.0.8.5) + rackup (1.0.1) + rack (< 3) + webrick + rails (7.1.5.1) + actioncable (= 7.1.5.1) + actionmailbox (= 7.1.5.1) + actionmailer (= 7.1.5.1) + actionpack (= 7.1.5.1) + actiontext (= 7.1.5.1) + actionview (= 7.1.5.1) + activejob (= 7.1.5.1) + activemodel (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) bundler (>= 1.15.0) - railties (= 7.0.8.5) + railties (= 7.1.5.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -466,47 +506,52 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) + rails-html-sanitizer (1.6.2) loofah (~> 2.21) - nokogiri (~> 1.14) - railties (7.0.8.5) - actionpack (= 7.0.8.5) - activesupport (= 7.0.8.5) - method_source + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (7.1.5.1) + actionpack (= 7.1.5.1) + activesupport (= 7.1.5.1) + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) + rdoc (6.12.0) + psych (>= 4.0.0) redis-client (0.22.2) connection_pool regexp_parser (2.6.1) + reline (0.6.0) + io-console (~> 0.5) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rexml (3.3.9) - rspec-core (3.12.0) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.0) + rspec-core (3.13.3) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-rails (6.0.1) - actionpack (>= 6.1) - activesupport (>= 6.1) - railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) - rspec-support (3.12.0) + rspec-support (~> 3.13.0) + rspec-rails (7.1.1) + actionpack (>= 7.0) + activesupport (>= 7.0) + railties (>= 7.0) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-support (3.13.2) rubocop (1.42.0) json (~> 2.3) parallel (~> 1.10) @@ -533,6 +578,7 @@ GEM ruby-progressbar (1.11.0) ruby_deep_clone (0.8.0) rubyzip (2.3.2) + securerandom (0.4.1) selenium-webdriver (4.7.1) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) @@ -571,6 +617,7 @@ GEM stackprof (0.2.25) stimulus-rails (1.3.4) railties (>= 6.0.0) + stringio (3.1.5) swd (2.0.3) activesupport (>= 3) attr_required (>= 0.0.5) @@ -583,6 +630,7 @@ GEM tailwindcss-ruby tailwindcss-ruby (3.4.14) tailwindcss-ruby (3.4.14-aarch64-linux) + tailwindcss-ruby (3.4.14-arm-linux) tailwindcss-ruby (3.4.14-arm64-darwin) tailwindcss-ruby (3.4.14-x86_64-darwin) tailwindcss-ruby (3.4.14-x86_64-linux) @@ -594,7 +642,7 @@ GEM thor (1.3.2) thread_safe (0.3.6) tilt (2.0.10) - timeout (0.4.1) + timeout (0.4.3) turbine-graph (0.1.3) turbo-rails (2.0.11) actionpack (>= 6.0.0) @@ -627,8 +675,10 @@ GEM activesupport faraday (~> 2.0) faraday-follow_redirects + webrick (1.9.1) websocket (1.2.9) - websocket-driver (0.7.6) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) @@ -637,10 +687,17 @@ GEM PLATFORMS aarch64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux + arm-linux-gnu + arm-linux-musl arm64-darwin ruby x86_64-darwin x86_64-linux + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES activerecord-session_store @@ -679,7 +736,6 @@ DEPENDENCIES listen local_time mini_racer - msgpack mysql2 newrelic_rpm numo-narray @@ -690,12 +746,12 @@ DEPENDENCIES puma quintel_merit! rack-cors - rails (~> 7.0.8) + rails (~> 7.1.5) rails-controller-testing rake refinery! rest-client - rspec-rails (~> 6.0) + rspec-rails (~> 7.0) rubel! rubocop (~> 1.27) rubocop-performance @@ -728,4 +784,4 @@ RUBY VERSION ruby 3.1.1p18 BUNDLED WITH - 2.3.8 + 2.6.6 diff --git a/app/controllers/api/v3/saved_scenarios_controller.rb b/app/controllers/api/v3/saved_scenarios_controller.rb index 2078240ea..6090acd1e 100644 --- a/app/controllers/api/v3/saved_scenarios_controller.rb +++ b/app/controllers/api/v3/saved_scenarios_controller.rb @@ -13,10 +13,6 @@ class SavedScenariosController < BaseController authorize!(:write, @scenario) end - before_action(only: %i[discard undiscard]) do - authorize!(:destroy, @scenario) - end - def index query = { page: params[:page], limit: params[:limit] }.compact.to_query response = my_etm_client.get("/api/v1/saved_scenarios?#{query}") diff --git a/app/controllers/api/v3/scenario_version_tags_controller.rb b/app/controllers/api/v3/scenario_version_tags_controller.rb index 5cd4cad4d..010d2ee13 100644 --- a/app/controllers/api/v3/scenario_version_tags_controller.rb +++ b/app/controllers/api/v3/scenario_version_tags_controller.rb @@ -7,11 +7,6 @@ class ScenarioVersionTagsController < BaseController before_action :validate_scenario_version_tag, only: :update - before_action only: %i[batch] do - # Only check that the user can read. We restrict the search in the action. - authorize!(:read, Scenario) - end - # GET api/v3/scenarios/:id/version def show render json: ScenarioVersionSerializer.new(scenario) diff --git a/app/models/scenario.rb b/app/models/scenario.rb index f5974e81d..90f731ea1 100644 --- a/app/models/scenario.rb +++ b/app/models/scenario.rb @@ -15,7 +15,7 @@ class Scenario < ApplicationRecord store :user_values store :balanced_values - serialize :active_couplings, Array + serialize :active_couplings, type: Array store :metadata, coder: JSON has_many :scenario_users, dependent: :destroy diff --git a/app/models/user_sortable.rb b/app/models/user_sortable.rb index 30206195f..57b6e29be 100644 --- a/app/models/user_sortable.rb +++ b/app/models/user_sortable.rb @@ -7,7 +7,7 @@ module UserSortable extend ActiveSupport::Concern included do - serialize :order, Array + serialize :order, type: Array belongs_to :scenario validates_with Atlas::UserSortableValidator, diff --git a/bin/setup b/bin/setup index ec47b79b3..3cd5a9d78 100755 --- a/bin/setup +++ b/bin/setup @@ -5,7 +5,7 @@ require "fileutils" 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 diff --git a/config/application.rb b/config/application.rb index 2b49f1bcc..f20cbe35f 100644 --- a/config/application.rb +++ b/config/application.rb @@ -11,6 +11,11 @@ class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. config.load_defaults 7.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(assets tasks)) + # Configuration for the application, engines, and railties goes here. # # These settings can be overridden in specific environments using the files @@ -21,9 +26,6 @@ class Application < Rails::Application # config.time_zone = 'Central Time (US & Canada)' config.time_zone = 'Etc/UTC' - config.autoload_paths << Rails.root.join("lib") - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de @@ -32,6 +34,7 @@ class Application < Rails::Application config.i18n.default_locale = :en config.active_support.deprecation = :log + config.active_support.message_serializer = :message_pack config.encoding = "utf-8" diff --git a/config/environments/development.rb b/config/environments/development.rb index 7e77af31c..31f33850a 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -8,7 +8,7 @@ # 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 + config.enable_reloading = true # Do not eager load code on boot. config.eager_load = false @@ -92,10 +92,12 @@ # Uncomment if you wish to allow Action Cable access from any origin. # config.action_cable.disable_request_forgery_protection = true + # Raise error when a before_action's only/except options reference missing actions + config.action_controller.raise_on_missing_callback_actions = true + config.after_initialize do # Start ETSource reloader only when running as a server (i.e., not as a rake # task). Etsource::Reloader.start! if ENV['CI'] != 'true' && Settings.etsource_live_reload end - end diff --git a/config/environments/production.rb b/config/environments/production.rb index dcdcd5e7a..dc292a4fe 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -4,7 +4,7 @@ # 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 diff --git a/config/environments/test.rb b/config/environments/test.rb index f569aa668..f68543a06 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -8,8 +8,8 @@ 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 @@ -29,7 +29,7 @@ config.cache_store = :memory_store, { size: 16 * (1024**3) } # 16 Mb # Raise exceptions instead of rendering exception templates. - config.action_dispatch.show_exceptions = false + config.action_dispatch.show_exceptions = :none # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false @@ -63,6 +63,9 @@ # 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 + # Mail options for Devise. config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } end diff --git a/config/initializers/new_framework_defaults_7_1.rb b/config/initializers/new_framework_defaults_7_1.rb new file mode 100644 index 000000000..3dc295db6 --- /dev/null +++ b/config/initializers/new_framework_defaults_7_1.rb @@ -0,0 +1,280 @@ +# Be sure to restart your server when you modify this file. +# +# This file eases your Rails 7.1 framework defaults upgrade. +# +# Uncomment each configuration one by one to switch to the new default. +# Once your application is ready to run with all new defaults, you can remove +# this file and set the `config.load_defaults` to `7.1`. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. +# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html + +### +# No longer add autoloaded paths into `$LOAD_PATH`. This means that you won't be able +# to manually require files that are managed by the autoloader, which you shouldn't do anyway. +# +# This will reduce the size of the load path, making `require` faster if you don't use bootsnap, or reduce the size +# of the bootsnap cache if you use it. +# +# To set this configuration, add the following line to `config/application.rb` (NOT this file): +# config.add_autoload_paths_to_load_path = false + +### +# Remove the default X-Download-Options headers since it is used only by Internet Explorer. +# If you need to support Internet Explorer, add back `"X-Download-Options" => "noopen"`. +#++ +# Rails.application.config.action_dispatch.default_headers = { +# "X-Frame-Options" => "SAMEORIGIN", +# "X-XSS-Protection" => "0", +# "X-Content-Type-Options" => "nosniff", +# "X-Permitted-Cross-Domain-Policies" => "none", +# "Referrer-Policy" => "strict-origin-when-cross-origin" +# } + +### +# Do not treat an `ActionController::Parameters` instance +# as equal to an equivalent `Hash` by default. +#++ +# Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false + +### +# Active Record Encryption now uses SHA-256 as its hash digest algorithm. +# +# There are 3 scenarios to consider. +# +# 1. If you have data encrypted with previous Rails versions, and you have +# +config.active_support.key_generator_hash_digest_class+ configured as SHA1 (the default +# before Rails 7.0), you need to configure SHA-1 for Active Record Encryption too: +#++ +# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA1 +# +# 2. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA256 (the new default +# in 7.0), then you need to configure SHA-256 for Active Record Encryption: +#++ +# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA256 +# +# 3. If you don't currently have data encrypted with Active Record encryption, you can disable this setting to +# configure the default behavior starting 7.1+: +#++ +# Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false + +### +# No longer run after_commit callbacks on the first of multiple Active Record +# instances to save changes to the same database row within a transaction. +# Instead, run these callbacks on the instance most likely to have internal +# state which matches what was committed to the database, typically the last +# instance to save. +#++ +# Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false + +### +# Configures SQLite with a strict strings mode, which disables double-quoted string literals. +# +# SQLite has some quirks around double-quoted string literals. +# It first tries to consider double-quoted strings as identifier names, but if they don't exist +# it then considers them as string literals. Because of this, typos can silently go unnoticed. +# For example, it is possible to create an index for a non existing column. +# See https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted for more details. +#++ +# Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true + +### +# Disable deprecated singular associations names. +#++ +# Rails.application.config.active_record.allow_deprecated_singular_associations_name = false + +### +# Enable the Active Job `BigDecimal` argument serializer, which guarantees +# roundtripping. Without this serializer, some queue adapters may serialize +# `BigDecimal` arguments as simple (non-roundtrippable) strings. +# +# When deploying an application with multiple replicas, old (pre-Rails 7.1) +# replicas will not be able to deserialize `BigDecimal` arguments from this +# serializer. Therefore, this setting should only be enabled after all replicas +# have been successfully upgraded to Rails 7.1. +#++ +# Rails.application.config.active_job.use_big_decimal_serializer = true + +### +# Specify if an `ArgumentError` should be raised if `Rails.cache` `fetch` or +# `write` are given an invalid `expires_at` or `expires_in` time. +# Options are `true`, and `false`. If `false`, the exception will be reported +# as `handled` and logged instead. +#++ +# Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true + +### +# Specify whether Query Logs will format tags using the SQLCommenter format +# (https://open-telemetry.github.io/opentelemetry-sqlcommenter/), or using the legacy format. +# Options are `:legacy` and `:sqlcommenter`. +#++ +# Rails.application.config.active_record.query_log_tags_format = :sqlcommenter + +### +# Specify the default serializer used by `MessageEncryptor` and `MessageVerifier` +# instances. +# +# The legacy default is `:marshal`, which is a potential vector for +# deserialization attacks in cases where a message signing secret has been +# leaked. +# +# In Rails 7.1, the new default is `:json_allow_marshal` which serializes and +# deserializes with `ActiveSupport::JSON`, but can fall back to deserializing +# with `Marshal` so that legacy messages can still be read. +# +# In Rails 7.2, the default will become `:json` which serializes and +# deserializes with `ActiveSupport::JSON` only. +# +# Alternatively, you can choose `:message_pack` or `:message_pack_allow_marshal`, +# which serialize with `ActiveSupport::MessagePack`. `ActiveSupport::MessagePack` +# can roundtrip some Ruby types that are not supported by JSON, and may provide +# improved performance, but it requires the `msgpack` gem. +# +# For more information, see +# https://guides.rubyonrails.org/v7.1/configuring.html#config-active-support-message-serializer +# +# If you are performing a rolling deploy of a Rails 7.1 upgrade, wherein servers +# that have not yet been upgraded must be able to read messages from upgraded +# servers, first deploy without changing the serializer, then set the serializer +# in a subsequent deploy. +#++ +# Rails.application.config.active_support.message_serializer = :json_allow_marshal + +### +# Enable a performance optimization that serializes message data and metadata +# together. This changes the message format, so messages serialized this way +# cannot be read by older versions of Rails. However, messages that use the old +# format can still be read, regardless of whether this optimization is enabled. +# +# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have +# not yet been upgraded must be able to read messages from upgraded servers, +# leave this optimization off on the first deploy, then enable it on a +# subsequent deploy. +#++ +# Rails.application.config.active_support.use_message_serializer_for_metadata = true + +### +# Set the maximum size for Rails log files. +# +# `config.load_defaults 7.1` does not set this value for environments other than +# development and test. +#++ +# if Rails.env.local? +# Rails.application.config.log_file_size = 100 * 1024 * 1024 +# end + +### +# Enable raising on assignment to attr_readonly attributes. The previous +# behavior would allow assignment but silently not persist changes to the +# database. +#++ +# Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true + +### +# Enable validating only parent-related columns for presence when the parent is mandatory. +# The previous behavior was to validate the presence of the parent record, which performed an extra query +# to get the parent every time the child record was updated, even when parent has not changed. +#++ +# Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false + +### +# Enable precompilation of `config.filter_parameters`. Precompilation can +# improve filtering performance, depending on the quantity and types of filters. +#++ +# Rails.application.config.precompile_filter_parameters = true + +### +# Enable before_committed! callbacks on all enrolled records in a transaction. +# The previous behavior was to only run the callbacks on the first copy of a record +# if there were multiple copies of the same record enrolled in the transaction. +#++ +# Rails.application.config.active_record.before_committed_on_all_records = true + +### +# Disable automatic column serialization into YAML. +# To keep the historic behavior, you can set it to `YAML`, however it is +# recommended to explicitly define the serialization method for each column +# rather than to rely on a global default. +#++ +# Rails.application.config.active_record.default_column_serializer = nil + +### +# Enable a performance optimization that serializes Active Record models +# in a faster and more compact way. +# +# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have +# not yet been upgraded must be able to read caches from upgraded servers, +# leave this optimization off on the first deploy, then enable it on a +# subsequent deploy. +#++ +# Rails.application.config.active_record.marshalling_format_version = 7.1 + +### +# Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model. +# This matches the behaviour of all other callbacks. +# In previous versions of Rails, they ran in the inverse order. +#++ +# Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true + +### +# Whether a `transaction` block is committed or rolled back when exited via `return`, `break` or `throw`. +#++ +# Rails.application.config.active_record.commit_transaction_on_non_local_return = true + +### +# Controls when to generate a value for has_secure_token declarations. +#++ +# Rails.application.config.active_record.generate_secure_token_on = :initialize + +### +# ** Please read carefully, this must be configured in config/application.rb ** +# +# Change the format of the cache entry. +# +# Changing this default means that all new cache entries added to the cache +# will have a different format that is not supported by Rails 7.0 +# applications. +# +# Only change this value after your application is fully deployed to Rails 7.1 +# and you have no plans to rollback. +# When you're ready to change format, add this to `config/application.rb` (NOT +# this file): +# config.active_support.cache_format_version = 7.1 + +### +# Configure Action View to use HTML5 standards-compliant sanitizers when they are supported on your +# platform. +# +# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action View to use HTML5-compliant +# sanitizers if they are supported, else fall back to HTML4 sanitizers. +# +# In previous versions of Rails, Action View always used `Rails::HTML4::Sanitizer` as its vendor. +#++ +# Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor + +### +# Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your +# platform. +# +# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action Text to use HTML5-compliant +# sanitizers if they are supported, else fall back to HTML4 sanitizers. +# +# In previous versions of Rails, Action Text always used `Rails::HTML4::Sanitizer` as its vendor. +#++ +# Rails.application.config.action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor + +### +# Configure the log level used by the DebugExceptions middleware when logging +# uncaught exceptions during requests. +#++ +# Rails.application.config.action_dispatch.debug_exception_log_level = :error + +### +# Configure the test helpers in Action View, Action Dispatch, and rails-dom-testing to use HTML5 +# parsers. +# +# Nokogiri::HTML5 isn't supported on JRuby, so JRuby applications must set this to :html4. +# +# In previous versions of Rails, these test helpers always used an HTML4 parser. +#++ +# Rails.application.config.dom_testing_default_html_version = :html5 diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb index 00f64d71b..7db3b9577 100644 --- a/config/initializers/permissions_policy.rb +++ b/config/initializers/permissions_policy.rb @@ -1,11 +1,13 @@ +# Be sure to restart your server when you modify this file. + # Define an application-wide HTTP permissions policy. For further -# information see https://developers.google.com/web/updates/2018/06/feature-policy -# -# Rails.application.config.permissions_policy do |f| -# f.camera :none -# f.gyroscope :none -# f.microphone :none -# f.usb :none -# f.fullscreen :self -# f.payment :self, "https://secure.example.com" +# information see: https://developers.google.com/web/updates/2018/06/feature-policy + +# Rails.application.config.permissions_policy do |policy| +# policy.camera :none +# policy.gyroscope :none +# policy.microphone :none +# policy.usb :none +# policy.fullscreen :self +# policy.payment :self, "https://secure.example.com" # end diff --git a/lib/capistrano/tasks/database.rake b/lib/capistrano/tasks/database.rake deleted file mode 100644 index 110f72c4a..000000000 --- a/lib/capistrano/tasks/database.rake +++ /dev/null @@ -1,45 +0,0 @@ -def system_v(cmd) - info "Execute '#{cmd}'" - system cmd -end - -desc 'Copy database from the server to your local database' -task db2local: ['deploy:set_rails_env'] do - on roles(:app) do - within current_path do - filename = nil - - info 'Creating DB export' - - with rails_env: fetch(:rails_env) do - filename = capture(:rake, 'db:dump_sql').strip - end - - download!(current_path.join(filename), filename) - execute(:rm, current_path.join(filename)) - - local_conf = YAML.load_file('config/database.yml')['development'] - - username = local_conf['username'] - password = local_conf['password'] - database = local_conf['database'] - - credentials = [ - "--user=#{ username }", - password && "--password=#{ password }" - ].compact.join(' ') - - info 'Importing database' - - system_v "gunzip -f #{ filename }" - - system_v "mysqladmin -f #{ credentials } drop #{ database }" - system_v "mysqladmin #{ credentials } create #{ database }" - system_v "mysql #{ credentials } #{ database } < #{ filename.chomp('.gz') }" - - system_v "rm #{ filename.chomp('.gz') }" - - info 'Finished importing database' - end - end -end diff --git a/lib/capistrano/tasks/deploy.rake b/lib/capistrano/tasks/deploy.rake deleted file mode 100644 index 27eb7f3d8..000000000 --- a/lib/capistrano/tasks/deploy.rake +++ /dev/null @@ -1,57 +0,0 @@ -namespace :deploy do - task :app_config do - on roles(:app) do - within(release_path) { execute :rake, 'deploy:app_config' } - end - end # setup_config - - desc <<-DESC - Imports a specific revision of ETSource - - Provide the task with an ETSOURCE_REV environment variable whose value is - a commit reference from the ETSource repository. This commit will be loaded - on the server. If you choose not to provide an ETSOURCE_REV variable, the - revision from the currently-running application will be used. - - See etsource:load rake task' - DESC - task :etsource do - on roles(:app) do - # During a deploy, current_release is the same as latest_release; however - # when running the task standalone, it is not. Therefore the variable - # containing the path of the previous ETEngine release differs depending - # on the context. - # if current_path == release_path - # # Not a deploy; running standalone. - # this_release = old_release = current_release - # else - # # This is a deploy. - # old_release = previous_release - # this_release = release_path - # end - - rev = - if ENV['ETSOURCE_REV'] - ENV['ETSOURCE_REV'] - else - begin - within(deploy_path.join('shared/etsource')) { capture('git rev-parse HEAD') } - rescue - raise <<-MESSAGE.gsub(/^\s+/, '') - Unknown existing ETSource version, and no ETSOURCE_REV was provided. - If this is a cold deploy, be sure to tell ETEngine which version of - ETSource to use by supplying the ETSOURCE_REV. - - ETSOURCE_REV=some_commit_id cap deploy - MESSAGE - end - end - - within release_path do - with etsource_ref: rev.strip, rails_env: fetch(:rails_env) do - execute :rake, 'deploy:load_etsource deploy:calculate_datasets' - end - end - end - end -end diff --git a/lib/capistrano/tasks/memcached.rake b/lib/capistrano/tasks/memcached.rake deleted file mode 100644 index 2370de61c..000000000 --- a/lib/capistrano/tasks/memcached.rake +++ /dev/null @@ -1,21 +0,0 @@ -namespace :memcached do - desc 'Start memcached' - task :start do - on(roles(:app)) { sudo '/etc/init.d/memcached start' } - end - - desc 'Stop memcached' - task :stop do - on(roles(:app)) { sudo '/etc/init.d/memcached stop' } - end - - desc 'Restart memcached' - task :restart do - on(roles(:app)) { sudo '/etc/init.d/memcached restart' } - end - - desc 'Flush memcached - this assumes memcached is on port 11211' - task :flush do - on(roles(:app)) { execute "echo 'flush_all' | nc -q 1 localhost 11211" } - end -end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 16fe3cbb6..0f63db6d8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -41,7 +41,7 @@ config.mock_with :rspec # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures - config.fixture_path = "#{::Rails.root}/spec/fixtures" + config.fixture_paths = ["#{::Rails.root}/spec/fixtures"] # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false