From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 24 Mar 2021 18:19:14 +0000 (+0000)
Subject: Rework configuration to use Sanitize::Config.merge
X-Git-Tag: live~1692^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f442bb9e80c07fa452d56ed6a692e0b2eeb829d3

Rework configuration to use Sanitize::Config.merge

This is the recommended approach, and works better when dealing with deeper attributes
---

diff --git a/config/initializers/sanitize.rb b/config/initializers/sanitize.rb
index 6f2e30852..609bb8734 100644
--- a/config/initializers/sanitize.rb
+++ b/config/initializers/sanitize.rb
@@ -1,8 +1,9 @@
-Sanitize::Config::OSM = Sanitize::Config::RELAXED.dup
-
-Sanitize::Config::OSM[:elements] -= %w[div style]
-Sanitize::Config::OSM[:add_attributes] = { "a" => { "rel" => "nofollow noopener noreferrer" } }
-Sanitize::Config::OSM[:remove_contents] = %w[script style]
-Sanitize::Config::OSM[:transformers] = lambda do |env|
-  env[:node].add_class("table table-sm w-auto") if env[:node_name] == "table"
-end
+Sanitize::Config::OSM = Sanitize::Config.merge(
+  Sanitize::Config::RELAXED,
+  :elements => Sanitize::Config::RELAXED[:elements] - %w[div style],
+  :add_attributes => { "a" => { "rel" => "nofollow noopener noreferrer" } },
+  :remove_contents => %w[script style],
+  :transformers => lambda do |env|
+    env[:node].add_class("table table-sm w-auto") if env[:node_name] == "table"
+  end
+)