mjml-rb 0.2.22 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb97af0d72ddb5898c28c33ccc0efafc27532f3709062f563f8d3d39fdcc642b
-  data.tar.gz: 2bb9d55e089309e74ab77766360b3c2a094c633a73ba8fb1fa4599780813dab4
+  metadata.gz: 4840c5584afa1ff603e996338a128d5808ae46742f084d03c0e34391259616f9
+  data.tar.gz: ef16089bc907e5e5f649e10adac5389b27a25c63f3ee20aea3cb28db0e78da82
 SHA512:
-  metadata.gz: a0fbd53af9fc541a29f0d70e123efb0d390f9023a1388f8d1f6ef23ff1ad3aa6a16a0a410975744f03d934538cb99766620ebca44ba561272ce845057dc86277
-  data.tar.gz: 40f1fdcf06405a730a37b7d095fa6d92270e09cfd21c8fce71a2bcd8c79da52ef1f72175bfc9766395d011bec3582731b4a66135bd5f0ac8978d6c117c96e82f
+  metadata.gz: d378634ab4a2905f65e3831292cb0b55ae22dca61a310bb4c6bf62e77610dfec609cd3d130324c99836a37fc61a34a64c0433fd80729ffcaa9073f528c8c1bee
+  data.tar.gz: ea309a490a424440393727cd6e022f4c7372449e6e4f22a7506e8593051b7544d3a96e4af87846fc2d38a472c03aa97fe13fcc9c2ddfb8761912138238dc8210

data/lib/mjml-rb/parser.rb

@@ -92,9 +92,13 @@ module MjmlRb
     end
 
     def normalize_html_void_tags(content)
-      # Remove closing tags for void elements (e.g. </br>, </hr>).
-      # These are invalid in both HTML and XML but appear in legacy content.
-      content = content.gsub(/<\/(#{HTML_VOID_TAGS.join("|")})\s*>/i, "")
+      # Legacy mail templates sometimes emit invalid closing </br> tags.
+      # Browser-style recovery treats them as actual line breaks, so preserve that.
+      content = content.gsub(%r{</br\s*>}i, "<br />")
+
+      # Remove other closing tags for void elements (e.g. </hr>, </img>).
+      # These are invalid in both HTML and XML and HTML5 recovery drops them.
+      content = content.gsub(/<\/(#{(HTML_VOID_TAGS - ["br"]).join("|")})\s*>/i, "")
 
       # Self-close opening void tags that aren't already self-closed.
       pattern = /<(#{HTML_VOID_TAGS.join("|")})(\s[^<>]*?)?>/i

data/lib/mjml-rb/renderer.rb

@@ -279,7 +279,7 @@ module MjmlRb
       css_blocks = unique_strings(context[:inline_styles]).reject { |css| css.nil? || css.strip.empty? }
       return html if css_blocks.empty?
 
-      document = Nokogiri::HTML(html)
+      document = parse_html_document(html)
       parse_inline_css_rules(css_blocks.join("\n")).each do |selector, declarations|
         next if selector.empty? || declarations.empty?
 
@@ -291,6 +291,14 @@ module MjmlRb
       document.to_html
     end
 
+    def parse_html_document(html)
+      if defined?(Nokogiri::HTML5)
+        Nokogiri::HTML5(html)
+      else
+        Nokogiri::HTML(html)
+      end
+    end
+
     def select_nodes(document, selector)
       document.css(selector)
     rescue Nokogiri::CSS::SyntaxError, Nokogiri::XML::XPath::SyntaxError

data/lib/mjml-rb/version.rb

@@ -1,3 +1,3 @@
 module MjmlRb
-  VERSION = "0.2.22".freeze
+  VERSION = "0.2.24".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mjml-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.24
 platform: ruby
 authors:
 - Andrei Andriichuk