From 455070f2ea576775fe28f0bb2d01a6b62d2dc7d0 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 4 Apr 2022 13:56:40 -0300
Subject: [PATCH] normalizar todas las strings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

convierte la codificación de windows/osx en unicode normalizado.
---
 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         | 9 ++++++---
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/models/metadata_markdown.rb b/app/models/metadata_markdown.rb
index 1e8b4fc8..7816ec33 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
+    string.unicode_normalize(:nfkc)
   end
 end
diff --git a/app/models/metadata_markdown_content.rb b/app/models/metadata_markdown_content.rb
index 92a1ab21..cb4124db 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", '')
+    string.tr("\r", '').unicode_normalize(:nfkc)
   end
 end
diff --git a/app/models/metadata_permalink.rb b/app/models/metadata_permalink.rb
index 59b68461..9b0c063c 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.gsub('..', '/').gsub('./', '').squeeze('/')
+    value  = value.strip.unicode_normalize(:nfkc).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 95aac4d4..28bfe82a 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,
+    sanitizer.sanitize(string.strip.unicode_normalize(:nfkc),
                        tags: [],
                        attributes: []).strip.html_safe
   end
diff --git a/app/models/metadata_template.rb b/app/models/metadata_template.rb
index 5baa7a4a..a72f8e83 100644
--- a/app/models/metadata_template.rb
+++ b/app/models/metadata_template.rb
@@ -184,9 +184,12 @@ MetadataTemplate = Struct.new(:site, :document, :name, :label, :type,
     return if string.nil?
     return string unless string.is_a? String
 
-    sanitizer.sanitize(string.tr("\r", ''),
-                       tags: allowed_tags,
-                       attributes: allowed_attributes).strip.html_safe
+    sanitizer
+      .sanitize(string.tr("\r", '').unicode_normalize(:nfkc),
+                tags: allowed_tags,
+                attributes: allowed_attributes)
+      .strip
+      .html_safe
   end
 
   def sanitizer