mjml-rb 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c0d1fcf5bc3d3da63f1e883fbf9fc1c5d596f23e2d1845b52fac3a2795c15ec
-  data.tar.gz: 96945245aea91b2d4cb94336a2d29a58eb6c5cbf332ac76e2828f581f4e31a4f
+  metadata.gz: 4bb6667d87d9376e60199a47e987e10cfb496be78c4bd549f71fa049c2618aff
+  data.tar.gz: 98f63a171ea6a2d5b1dd6212c86a13cdd2eabf71c1ab9f12d15f8c83a04e30d2
 SHA512:
-  metadata.gz: 2ab219c36a7dfb49bc89ce1f7b6da2dc8d5089e60bfb640b2f2606783d8f27ee5560133274935d0f6aee96ac076cdfac346c4d85775452a2933f2a47ff9d87e0
-  data.tar.gz: d3fea2c9c4cd07a967d62dc07ff16328c0b61cc7f20b108209f21c7d5f8eb061040eaf5085875c0bb09a81d56607e08e9efa3cfd83d147f296a5a8308687cca9
+  metadata.gz: 33c9d050ef8ebd560b92a513391957c9fd2ebea43023d3977c5c06fe154bc7eef1bf6646abbf555dcbf6f53d4900461cceb89daaf0e3b2be36d3e08cec445b38
+  data.tar.gz: 839a5ddbe4448b2c86b9b015d59468e8f2553a78432cf6371bdb6d061c850568850bde0316fd9be6ac548a0bc17715900d233cd1538cff03785383f29d960240

data/README.md

@@ -8,6 +8,8 @@
 > and not all components or attributes are fully implemented yet.
 > **Do not use in production without thorough testing of every template against
 > the official npm renderer.** API and output format may change without notice.
+> This is a **fully open source project**, and help is welcome:
+> feedback, bug reports, test cases, optimizations, proposals, and pull requests.
 > No warranty of any kind is provided.
 
 This directory contains a Ruby-first implementation of the main MJML user-facing tooling:

data/lib/mjml-rb/renderer.rb

@@ -271,14 +271,10 @@ module MjmlRb
       rules.each do |selector, attrs|
         next if selector.empty? || attrs.empty?
 
-        begin
-          document.css(selector).each do |node|
-            attrs.each do |name, value|
-              node[name] = value.to_s
-            end
+        select_nodes(document, selector).each do |node|
+          attrs.each do |name, value|
+            node[name] = value.to_s
           end
-        rescue Nokogiri::CSS::SyntaxError
-          next
         end
       end
 
@@ -293,18 +289,53 @@ module MjmlRb
       parse_inline_css_rules(css_blocks.join("\n")).each do |selector, declarations|
         next if selector.empty? || declarations.empty?
 
-        begin
-          document.css(selector).each do |node|
-            merge_inline_style!(node, declarations)
-          end
-        rescue Nokogiri::CSS::SyntaxError
-          next
+        select_nodes(document, selector).each do |node|
+          merge_inline_style!(node, declarations)
         end
       end
 
       document.to_html
     end
 
+    def select_nodes(document, selector)
+      document.css(selector)
+    rescue Nokogiri::CSS::SyntaxError, Nokogiri::XML::XPath::SyntaxError
+      fallback_select_nodes(document, selector)
+    end
+
+    def fallback_select_nodes(document, selector)
+      return [] unless selector.include?(":lang(")
+
+      lang_values = selector.scan(/:lang\(([^)]+)\)/).flatten.map do |value|
+        value.to_s.strip.gsub(/\A['"]|['"]\z/, "").downcase
+      end.reject(&:empty?)
+      return [] if lang_values.empty?
+
+      base_selector = selector.gsub(/:lang\(([^)]+)\)/, "").strip
+      base_selector = "*" if base_selector.empty?
+
+      document.css(base_selector).select do |node|
+        lang_values.all? { |lang| lang_matches?(node, lang) }
+      end
+    rescue Nokogiri::CSS::SyntaxError, Nokogiri::XML::XPath::SyntaxError
+      []
+    end
+
+    def lang_matches?(node, lang)
+      current = node
+
+      while current
+        value = current["lang"]
+        if value && !value.empty?
+          normalized = value.downcase
+          return normalized == lang || normalized.start_with?("#{lang}-")
+        end
+        current = current.parent
+      end
+
+      false
+    end
+
     def parse_inline_css_rules(css)
       stripped_css = strip_css_comments(css.to_s)
       plain_css = strip_css_at_rules(stripped_css)

data/lib/mjml-rb/version.rb

@@ -1,3 +1,3 @@
 module MjmlRb
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.4".freeze
 end

metadata

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