diff --git a/config/application.rb b/config/application.rb index 93c3dd68a48f3d0465ada874c3e3c35345d42d00..1305ffe84aa8b412bb258672c9e906e4131baf78 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,7 +22,7 @@ Bundler.require(*Rails.groups) module Osuny class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 7.0 + config.load_defaults 7.1 # 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. diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb index 7ecab59ed1031b3ed39753af3663515fdac24247..958d56d7b41045066bb324a3258265f1ded6d8d7 100644 --- a/config/initializers/active_storage.rb +++ b/config/initializers/active_storage.rb @@ -1,41 +1,37 @@ -require 'active_storage/record' -require 'active_storage/attachment' -require 'active_storage/filename' - -ActiveStorage::Engine.config.active_storage.content_types_to_serve_as_binary.delete('image/svg+xml') - -# Hook ActiveStorage::Attachment to add brand_id to attachments records -ActiveStorage::Attachment.class_eval do - after_save :denormalize_university_id_for_blob - - def denormalize_university_id_for_blob - university_id = case self.record.class.name - when 'University' - self.record.id - when 'ActiveStorage::VariantRecord' - self.record.blob.university_id - else - self.record.university_id +# https://stackoverflow.com/questions/8895103/how-can-i-keep-my-initializer-configuration-from-being-lost-in-development-mode +Rails.application.config.to_prepare do + ActiveStorage::Engine.config.active_storage.content_types_to_serve_as_binary.delete('image/svg+xml') + + # Hook ActiveStorage::Attachment to add brand_id to attachments records + ActiveStorage::Attachment.class_eval do + after_save :denormalize_university_id_for_blob + + def denormalize_university_id_for_blob + university_id = case self.record.class.name + when 'University' + self.record.id + when 'ActiveStorage::VariantRecord' + self.record.blob.university_id + else + self.record.university_id + end + + self.blob.update_column(:university_id, university_id) end - - self.blob.update_column(:university_id, university_id) end -end -# Override ActiveStorage::Filename#sanitized to remove accents and all special chars -# Base method: https://github.com/rails/rails/blob/v6.1.3/activestorage/app/models/active_storage/filename.rb#L57 -ActiveStorage::Filename.class_eval do - def sanitized - base_filename = base.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: "�") - .strip - .tr("\u{202E}%$|:;/\t\r\n\\", "-") - .parameterize(preserve_case: true) - [base_filename, extension_with_delimiter].join('') + # Override ActiveStorage::Filename#sanitized to remove accents and all special chars + # Base method: https://github.com/rails/rails/blob/v6.1.3/activestorage/app/models/active_storage/filename.rb#L57 + ActiveStorage::Filename.class_eval do + def sanitized + base_filename = base.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: "�") + .strip + .tr("\u{202E}%$|:;/\t\r\n\\", "-") + .parameterize(preserve_case: true) + [base_filename, extension_with_delimiter].join('') + end end -end -# https://stackoverflow.com/questions/8895103/how-can-i-keep-my-initializer-configuration-from-being-lost-in-development-mode -Rails.application.config.to_prepare do module ActiveStorageGitPathStatic extend ActiveSupport::Concern diff --git a/config/initializers/new_framework_defaults_7_1.rb b/config/initializers/new_framework_defaults_7_1.rb deleted file mode 100644 index f4ffebf19a11e9912891a3e141d2d51900c671da..0000000000000000000000000000000000000000 --- a/config/initializers/new_framework_defaults_7_1.rb +++ /dev/null @@ -1,224 +0,0 @@ -# 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. -Rails.application.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", - "X-Download-Options" => "noopen" -} - -# 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. Important: If you have -# data encrypted with previous Rails versions, there are two scenarios to consider: -# -# 1. If 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 -# -# 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 <tt>has_secure_token</tt> 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/test/fixtures/communication/extranet/document/categories.yml b/test/fixtures/communication/extranet/document/categories.yml index 408048f8654703ae92ba6e88cb32ba40b40d39da..9e84af3636ef600fd7d2664f0000a62ed7e2f7ac 100644 --- a/test/fixtures/communication/extranet/document/categories.yml +++ b/test/fixtures/communication/extranet/document/categories.yml @@ -23,11 +23,11 @@ # one: - extranet: one - university: one - name: MyString + extranet: default_extranet + university: default_university + name: First category two: - extranet: two - university: two - name: MyString + extranet: default_extranet + university: default_university + name: Second category diff --git a/test/fixtures/communication/extranet/document/kinds.yml b/test/fixtures/communication/extranet/document/kinds.yml index 8e70f233729b7d4852995ad79296c8e27e6b18cf..d264807c657e0d79a0ea1959b8fa9e98d35e527d 100644 --- a/test/fixtures/communication/extranet/document/kinds.yml +++ b/test/fixtures/communication/extranet/document/kinds.yml @@ -23,11 +23,11 @@ # one: - extranet: one - university: one - name: MyString + extranet: default_extranet + university: default_university + name: First kind two: - extranet: two - university: two - name: MyString + extranet: default_extranet + university: default_university + name: Second kind diff --git a/test/fixtures/communication/extranet/documents.yml b/test/fixtures/communication/extranet/documents.yml index fb4fa23733ee89bef580ed42a2418d63d9d1b4cd..8bf4c25c860629b59f73752c2daa726caefd9e60 100644 --- a/test/fixtures/communication/extranet/documents.yml +++ b/test/fixtures/communication/extranet/documents.yml @@ -30,14 +30,14 @@ one: name: MyString - university: one - extranet: one + university: default_university + extranet: default_extranet published: false published_at: 2023-03-08 16:55:05 two: name: MyString - university: two - extranet: two + university: default_university + extranet: default_extranet published: false published_at: 2023-03-08 16:55:05 diff --git a/test/fixtures/communication/extranet/post/categories.yml b/test/fixtures/communication/extranet/post/categories.yml index 3fef9b12885806f6c433f538f5f7a06a97bb4ac4..398f696b47f02f7dcc50830b5519b1d246b0af8a 100644 --- a/test/fixtures/communication/extranet/post/categories.yml +++ b/test/fixtures/communication/extranet/post/categories.yml @@ -25,11 +25,11 @@ one: name: MyString slug: MyString - extranet: one - university: one + extranet: default_extranet + university: default_university two: name: MyString slug: MyString - extranet: two - university: two + extranet: default_extranet + university: default_university diff --git a/test/fixtures/communication/extranet/posts.yml b/test/fixtures/communication/extranet/posts.yml index 8a32ef0aa33745f14d129926818dadbf5ebbc646..49cb7c1a3281ea4e5f8030af764f7ef3a79a98c6 100644 --- a/test/fixtures/communication/extranet/posts.yml +++ b/test/fixtures/communication/extranet/posts.yml @@ -38,9 +38,9 @@ one: title: MyString published: false published_at: 2023-03-07 15:57:51 - author: one - extranet: one - university: one + author: pa + extranet: default_extranet + university: default_university featured_image_alt: MyString featured_image_credit: MyText slug: MyString @@ -50,9 +50,9 @@ two: title: MyString published: false published_at: 2023-03-07 15:57:51 - author: two - extranet: two - university: two + author: pa + extranet: default_extranet + university: default_university featured_image_alt: MyString featured_image_credit: MyText slug: MyString diff --git a/test/fixtures/university/apps.yml b/test/fixtures/university/apps.yml index 09f154e0b504b29af65474e4102fff684c7e4b81..de96963d78356c0f355281081e8432b49f959054 100644 --- a/test/fixtures/university/apps.yml +++ b/test/fixtures/university/apps.yml @@ -22,10 +22,10 @@ one: name: MyString - university: one + university: default_university token: MyString two: name: MyString - university: two + university: default_university token: MyOtherString diff --git a/test/fixtures/user/favorites.yml b/test/fixtures/user/favorites.yml index 8e2a7153d68f6ddd25efbaaf00bdce5e51cb0aa2..0ba389615c7bdad2881ad4a0a82d7f550f70c3a8 100644 --- a/test/fixtures/user/favorites.yml +++ b/test/fixtures/user/favorites.yml @@ -20,11 +20,9 @@ # one: - user: one - about: one - about_type: About + user: admin + about: website_with_github (Communication::Website) two: - user: two - about: two - about_type: About + user: admin + about: website_with_gitlab (Communication::Website)