From eb7d0679bbc411d8f2afe831a23d958bc0e91abd Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 28 Apr 2022 10:34:57 -0300
Subject: [PATCH] normalizar strings sin romperlas
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

en castellano no nos afectó pero en árabe rompe el significado
---
 .../active_storage/direct_uploads_controller_decorator.rb       | 2 +-
 app/lib/action_dispatch/http/uploaded_file_decorator.rb         | 2 +-
 app/models/metadata_markdown.rb                                 | 2 +-
 app/models/metadata_markdown_content.rb                         | 2 +-
 app/models/metadata_permalink.rb                                | 2 +-
 app/models/metadata_string.rb                                   | 2 +-
 app/models/metadata_template.rb                                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/active_storage/direct_uploads_controller_decorator.rb b/app/controllers/active_storage/direct_uploads_controller_decorator.rb
index 3052f974..c62dae2a 100644
--- a/app/controllers/active_storage/direct_uploads_controller_decorator.rb
+++ b/app/controllers/active_storage/direct_uploads_controller_decorator.rb
@@ -19,7 +19,7 @@ module ActiveStorage
       # stack.
       def blob_args
         params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, metadata: {}).to_h.symbolize_keys.tap do |ba|
-          ba[:filename] = ba[:filename].unicode_normalize(:nfkc)
+          ba[:filename] = ba[:filename].unicode_normalize
         end
       end
     end
diff --git a/app/lib/action_dispatch/http/uploaded_file_decorator.rb b/app/lib/action_dispatch/http/uploaded_file_decorator.rb
index c171c81c..0bdebdc0 100644
--- a/app/lib/action_dispatch/http/uploaded_file_decorator.rb
+++ b/app/lib/action_dispatch/http/uploaded_file_decorator.rb
@@ -11,7 +11,7 @@ module ActionDispatch
         # Devolver el nombre de archivo con caracteres unicode
         # normalizados
         def original_filename
-          @original_filename.unicode_normalize(:nfkc)
+          @original_filename.unicode_normalize
         end
       end
     end
diff --git a/app/models/metadata_markdown.rb b/app/models/metadata_markdown.rb
index 7816ec33..a09e351c 100644
--- a/app/models/metadata_markdown.rb
+++ b/app/models/metadata_markdown.rb
@@ -12,6 +12,6 @@ class MetadataMarkdown < MetadataText
   # markdown y se eliminan autolinks.  Mejor es habilitar la generación
   # SAFE de CommonMark en la configuración del sitio.
   def sanitize(string)
-    string.unicode_normalize(:nfkc)
+    string.unicode_normalize
   end
 end
diff --git a/app/models/metadata_markdown_content.rb b/app/models/metadata_markdown_content.rb
index cb4124db..75088e30 100644
--- a/app/models/metadata_markdown_content.rb
+++ b/app/models/metadata_markdown_content.rb
@@ -25,6 +25,6 @@ class MetadataMarkdownContent < MetadataText
   # markdown y se eliminan autolinks.  Mejor es deshabilitar la
   # generación SAFE de CommonMark en la configuración del sitio.
   def sanitize(string)
-    string.tr("\r", '').unicode_normalize(:nfkc)
+    string.tr("\r", '').unicode_normalize
   end
 end
diff --git a/app/models/metadata_permalink.rb b/app/models/metadata_permalink.rb
index 9b0c063c..30ad32cc 100644
--- a/app/models/metadata_permalink.rb
+++ b/app/models/metadata_permalink.rb
@@ -19,7 +19,7 @@ class MetadataPermalink < MetadataString
   # puntos suspensivos, la primera / para que siempre sea relativa y
   # agregamos una / al final si la ruta no tiene extensión.
   def sanitize(value)
-    value  = value.strip.unicode_normalize(:nfkc).gsub('..', '/').gsub('./', '').squeeze('/')
+    value  = value.strip.unicode_normalize.gsub('..', '/').gsub('./', '').squeeze('/')
     value  = value[1..-1] if value.start_with? '/'
     value += '/' if File.extname(value).blank?
 
diff --git a/app/models/metadata_string.rb b/app/models/metadata_string.rb
index 28bfe82a..c1d888b1 100644
--- a/app/models/metadata_string.rb
+++ b/app/models/metadata_string.rb
@@ -17,7 +17,7 @@ class MetadataString < MetadataTemplate
   def sanitize(string)
     return '' if string.blank?
 
-    sanitizer.sanitize(string.strip.unicode_normalize(:nfkc),
+    sanitizer.sanitize(string.strip.unicode_normalize,
                        tags: [],
                        attributes: []).strip.html_safe
   end
diff --git a/app/models/metadata_template.rb b/app/models/metadata_template.rb
index a72f8e83..ddcd100e 100644
--- a/app/models/metadata_template.rb
+++ b/app/models/metadata_template.rb
@@ -185,7 +185,7 @@ MetadataTemplate = Struct.new(:site, :document, :name, :label, :type,
     return string unless string.is_a? String
 
     sanitizer
-      .sanitize(string.tr("\r", '').unicode_normalize(:nfkc),
+      .sanitize(string.tr("\r", '').unicode_normalize,
                 tags: allowed_tags,
                 attributes: allowed_attributes)
       .strip