mjml-rb 0.2.21 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4abe3f3fbe1a4c05983bb09cb4be09e4043782a7ebfa47559237c046f96b8a4d
-  data.tar.gz: 14b40fb3904aa74c29bf48f5e1d2dcaed5eb304691ed4637ac37f8f53fe6ba8f
+  metadata.gz: f62367f40ca4f73440f35e4878e7adcfcb8002cb1011639bbe1cd55f922b7580
+  data.tar.gz: 952c39acdd8b9cf3e1f84da47b4b3dc11c4f35c4cf521cfaf30ad4c890197dc5
 SHA512:
-  metadata.gz: 35d3346d23f26f0436ee068a97889540a7090f8cc488a4c3051e8d97e7f28650bd465f8782c0dc57c4a0bf38668262249112f968f6dfb8611666a8eb926ad485
-  data.tar.gz: ca1188c564dc67a00218cd36c080f9550977a3a5a807c938bbbfa257940a85e1f9591834eea81b7c85b2eba8ad8f88c4ece92ab94db25c63ed6e981806d2357c
+  metadata.gz: bd7df7e7cb49e766d89895bf5cd38351e5ce00a5b33c28ceabbf9de99a6bc88b5f2c66eec31cec72b36506c7a0a871b170d77bea0441ba964ec17990f4411d3f
+  data.tar.gz: 11a977350b4941d6dc852e5b4a7caa0d0a7f3b5e42a4e53d0f44bbb0ccee1ce55425d4bf66bed4024c9896ec9a44d64d884f986c56f8080b0dfb8684b625de1b

data/lib/mjml-rb/renderer.rb

@@ -24,6 +24,8 @@ require_relative "components/spacer"
 
 module MjmlRb
   class Renderer
+    HTML_VOID_TAGS = %w[area base br col embed hr img input link meta param source track wbr].freeze
+
     DEFAULT_FONTS = {
       "Roboto" => "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"
     }.freeze
@@ -277,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?
 
@@ -289,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
@@ -571,12 +581,17 @@ module MjmlRb
 
     def serialize_node(node)
       attrs = node.attributes.map { |k, v| %( #{k}="#{escape_attr(v)}") }.join
-      return "<#{node.tag_name}#{attrs} />" if node.children.empty?
+      return "<#{node.tag_name}#{attrs} />" if node.children.empty? && html_void_tag?(node.tag_name)
+      return "<#{node.tag_name}#{attrs}></#{node.tag_name}>" if node.children.empty?
 
       inner = node.children.map { |child| child.text? ? child.content.to_s : serialize_node(child) }.join
       "<#{node.tag_name}#{attrs}>#{inner}</#{node.tag_name}>"
     end
 
+    def html_void_tag?(tag_name)
+      HTML_VOID_TAGS.include?(tag_name.to_s.downcase)
+    end
+
     def style_join(hash)
       hash.each_with_object([]) do |(key, value), memo|
         next if value.nil? || value.to_s.empty?

data/lib/mjml-rb/version.rb

@@ -1,3 +1,3 @@
 module MjmlRb
-  VERSION = "0.2.21".freeze
+  VERSION = "0.2.23".freeze
 end

metadata

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