mjml-rb 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c0d1fcf5bc3d3da63f1e883fbf9fc1c5d596f23e2d1845b52fac3a2795c15ec
-  data.tar.gz: 96945245aea91b2d4cb94336a2d29a58eb6c5cbf332ac76e2828f581f4e31a4f
+  metadata.gz: 288347d54c01e4a6c60ed76c71ed988cb74f8a88eed9de7d7fb06cf740bd79e5
+  data.tar.gz: 369dc21e8dd16555318abfd6bc4cfa28649e4bbcce10a8a9b9b6f0613c87fb90
 SHA512:
-  metadata.gz: 2ab219c36a7dfb49bc89ce1f7b6da2dc8d5089e60bfb640b2f2606783d8f27ee5560133274935d0f6aee96ac076cdfac346c4d85775452a2933f2a47ff9d87e0
-  data.tar.gz: d3fea2c9c4cd07a967d62dc07ff16328c0b61cc7f20b108209f21c7d5f8eb061040eaf5085875c0bb09a81d56607e08e9efa3cfd83d147f296a5a8308687cca9
+  metadata.gz: 3bf2de79918958b9d4cd9b66191e6b2b52c5494d97d961a129d2d9db7193690a8616063c1168245ced32c736a24caca07aeda5945747d44a972568894b79fd01
+  data.tar.gz: e4e56ca10989e917fb5b4d14b4d090099b1003c97599d0dd57330a35c09981dee2424568e00a1b144050d5c564da86e5bf713cbf098065585a985b78a48a2039

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:
@@ -59,14 +61,14 @@ The table below tracks current JS-to-Ruby migration status for MJML components i
 | `mj-navbar` | migrated | Implemented in `navbar.rb`, including `base-url` propagation and breakpoint-aware hamburger CSS. |
 | `mj-navbar-link` | migrated | Implemented in `navbar.rb` as an ending-tag navbar child component. |
 | `mj-raw` | migrated | Implemented in `raw.rb`, including head insertion and top-level `position="file-start"` output before the doctype. |
-| `mj-head` | partial | Core tags such as `mj-title`, `mj-preview`, `mj-style`, `mj-font`, and `mj-attributes` are supported. |
+| `mj-head` | migrated | Implemented in `head.rb` and dispatches supported head children through component handlers. |
 | `mj-attributes` | migrated | Implemented in `attributes.rb`, including npm-style `mj-class` descendant defaults. |
 | `mj-all` | partial | Supported through `mj-attributes`. |
 | `mj-class` | migrated | Supported through `attributes.rb`, including nested per-tag descendant defaults. |
-| `mj-title` | partial | Supported through head context. |
-| `mj-preview` | partial | Supported through head context. |
-| `mj-style` | partial | Supported, including inline CSS application. |
-| `mj-font` | partial | Supported for font link injection. |
+| `mj-title` | migrated | Implemented in `head.rb`. |
+| `mj-preview` | migrated | Implemented in `head.rb`. |
+| `mj-style` | migrated | Implemented in `head.rb`, including inline-style registration. |
+| `mj-font` | migrated | Implemented in `head.rb`. |
 | `mj-carousel` | not migrated | Declared in dependency rules but no renderer implementation yet. |
 | `mj-carousel-image` | not migrated | Declared in dependency rules but no renderer implementation yet. |
 | `mj-breakpoint` | migrated | Supported in `mj-head` and used to control desktop column media-query widths. |

data/lib/mjml-rb/components/breakpoint.rb

@@ -20,6 +20,11 @@ module MjmlRb
       def render(tag_name:, node:, context:, attrs:, parent:)
         ""
       end
+
+      def handle_head(node, context)
+        width = node.attributes["width"].to_s.strip
+        context[:breakpoint] = width unless width.empty?
+      end
     end
   end
 end

data/lib/mjml-rb/components/head.rb

@@ -0,0 +1,59 @@
+require_relative "base"
+
+module MjmlRb
+  module Components
+    class Head < Base
+      TAGS = %w[mj-head mj-title mj-preview mj-style mj-font].freeze
+
+      ALLOWED_ATTRIBUTES = {
+        "mj-style" => {
+          "inline" => "string"
+        },
+        "mj-font" => {
+          "name" => "string",
+          "href" => "string"
+        }
+      }.freeze
+
+      class << self
+        def allowed_attributes_for(tag_name)
+          ALLOWED_ATTRIBUTES[tag_name] || {}
+        end
+
+        def allowed_attributes
+          {}
+        end
+      end
+
+      def tags
+        TAGS
+      end
+
+      def render(tag_name:, node:, context:, attrs:, parent:)
+        ""
+      end
+
+      def handle_head(node, context)
+        case node.tag_name
+        when "mj-head"
+          node.element_children.each do |child|
+            component = renderer.send(:component_for, child.tag_name)
+            component.handle_head(child, context) if component&.respond_to?(:handle_head)
+          end
+        when "mj-title"
+          context[:title] = raw_inner(node).strip
+        when "mj-preview"
+          context[:preview] = raw_inner(node).strip
+        when "mj-style"
+          css = raw_inner(node)
+          context[:head_styles] << css
+          context[:inline_styles] << css if node.attributes["inline"] == "inline"
+        when "mj-font"
+          name = node.attributes["name"]
+          href = node.attributes["href"]
+          context[:fonts][name] = href if name && href
+        end
+      end
+    end
+  end
+end

data/lib/mjml-rb/components/html_attributes.rb

@@ -3,7 +3,7 @@ require_relative "base"
 module MjmlRb
   module Components
     class HtmlAttributes < Base
-      TAGS = %w[mj-selector mj-html-attribute].freeze
+      TAGS = %w[mj-html-attributes mj-selector mj-html-attribute].freeze
 
       ALLOWED_ATTRIBUTES = {
         "mj-selector" => {
@@ -27,6 +27,28 @@ module MjmlRb
       def render(tag_name:, node:, context:, attrs:, parent:)
         render_children(node, context, parent: parent)
       end
+
+      def handle_head(node, context)
+        node.element_children.each do |selector|
+          next unless selector.tag_name == "mj-selector"
+
+          path = selector.attributes["path"].to_s.strip
+          next if path.empty?
+
+          custom_attrs = selector.element_children.each_with_object({}) do |child, memo|
+            next unless child.tag_name == "mj-html-attribute"
+
+            name = child.attributes["name"].to_s.strip
+            next if name.empty?
+
+            memo[name] = child.text_content
+          end
+          next if custom_attrs.empty?
+
+          context[:html_attributes][path] ||= {}
+          context[:html_attributes][path].merge!(custom_attrs)
+        end
+      end
     end
   end
 end

data/lib/mjml-rb/components/raw.rb

@@ -16,6 +16,10 @@ module MjmlRb
       def render(tag_name:, node:, context:, attrs:, parent:)
         raw_inner(node)
       end
+
+      def handle_head(node, context)
+        context[:head_raw] << raw_inner(node)
+      end
     end
   end
 end

data/lib/mjml-rb/renderer.rb

@@ -5,6 +5,7 @@ require_relative "components/attributes"
 require_relative "components/body"
 require_relative "components/breakpoint"
 require_relative "components/button"
+require_relative "components/head"
 require_relative "components/hero"
 require_relative "components/image"
 require_relative "components/navbar"
@@ -71,76 +72,13 @@ module MjmlRb
       return context unless head
 
       head.element_children.each do |node|
-        case node.tag_name
-        when "mj-title"
-          context[:title] = node.text_content.strip
-        when "mj-preview"
-          context[:preview] = node.text_content.strip
-        when "mj-style"
-          context[:head_styles] << node.text_content
-          context[:inline_styles] << node.text_content if node.attributes["inline"] == "inline"
-        when "mj-font"
-          name = node.attributes["name"]
-          href = node.attributes["href"]
-          context[:fonts][name] = href if name && href
-        when "mj-breakpoint"
-          width = node.attributes["width"].to_s.strip
-          context[:breakpoint] = width unless width.empty?
-        when "mj-attributes"
-          if (component = component_for(node.tag_name)) && component.respond_to?(:handle_head)
-            component.handle_head(node, context)
-          else
-            absorb_attribute_node(node, context)
-          end
-        when "mj-html-attributes"
-          absorb_html_attributes_node(node, context)
-        when "mj-raw"
-          context[:head_raw] << raw_inner(node)
-        end
+        component = component_for(node.tag_name)
+        component.handle_head(node, context) if component&.respond_to?(:handle_head)
       end
 
       context
     end
 
-    def absorb_attribute_node(attributes_node, context)
-      attributes_node.element_children.each do |child|
-        case child.tag_name
-        when "mj-all"
-          context[:global_defaults].merge!(child.attributes)
-        when "mj-class"
-          name = child.attributes["name"]
-          next unless name
-
-          context[:classes][name] = child.attributes.reject { |k, _| k == "name" }
-        else
-          context[:tag_defaults][child.tag_name] ||= {}
-          context[:tag_defaults][child.tag_name].merge!(child.attributes)
-        end
-      end
-    end
-
-    def absorb_html_attributes_node(html_attributes_node, context)
-      html_attributes_node.element_children.each do |selector|
-        next unless selector.tag_name == "mj-selector"
-
-        path = selector.attributes["path"].to_s.strip
-        next if path.empty?
-
-        custom_attrs = selector.element_children.each_with_object({}) do |child, memo|
-          next unless child.tag_name == "mj-html-attribute"
-
-          name = child.attributes["name"].to_s.strip
-          next if name.empty?
-
-          memo[name] = child.text_content
-        end
-        next if custom_attrs.empty?
-
-        context[:html_attributes][path] ||= {}
-        context[:html_attributes][path].merge!(custom_attrs)
-      end
-    end
-
     def build_html_document(content, context)
       title = context[:title].to_s
       preview = context[:preview]
@@ -271,14 +209,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 +227,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)
@@ -402,6 +371,7 @@ module MjmlRb
         registry = {}
         # Register component classes here as they are implemented.
         register_component(registry, Components::Body.new(self))
+        register_component(registry, Components::Head.new(self))
         register_component(registry, Components::Attributes.new(self))
         register_component(registry, Components::Breakpoint.new(self))
         register_component(registry, Components::Accordion.new(self))
@@ -412,6 +382,7 @@ module MjmlRb
         register_component(registry, Components::Raw.new(self))
         register_component(registry, Components::Text.new(self))
         register_component(registry, Components::Divider.new(self))
+        register_component(registry, Components::HtmlAttributes.new(self))
         register_component(registry, Components::Table.new(self))
         register_component(registry, Components::Social.new(self))
         register_component(registry, Components::Section.new(self))

data/lib/mjml-rb/version.rb

@@ -1,3 +1,3 @@
 module MjmlRb
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.5".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.5
 platform: ruby
 authors:
 - Andrei Andriichuk
@@ -61,6 +61,7 @@ files:
 - lib/mjml-rb/components/button.rb
 - lib/mjml-rb/components/column.rb
 - lib/mjml-rb/components/divider.rb
+- lib/mjml-rb/components/head.rb
 - lib/mjml-rb/components/hero.rb
 - lib/mjml-rb/components/html_attributes.rb
 - lib/mjml-rb/components/image.rb