mjml-rb 0.2.29 → 0.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd5e68ad11e8256180f4be4f8d00e86f647327695c9391904eb4ddd31ddc7ad
-  data.tar.gz: a7f4f27a8db1ab489a3ae5d2e4e52f556fed859cfc5c8d33beb6ea29a581e6e9
+  metadata.gz: 512c35b10aab7894e19942c4c881e3f08c127c8660c587192a0f9bc3972092cd
+  data.tar.gz: d18d2c2bc8bbdf369af791ebc41841b3b762d85e4811b5cdb408ff66a45dd3e7
 SHA512:
-  metadata.gz: 34a43b990be0b2cb7176e8c4736f17a79adc327a67ab91bab09b80af9d5776ad908f18bfba5cf41cdb7ea7ff5a40ea3e2b1cfd088eb3db99e23eab8132023ade
-  data.tar.gz: c5dd780d2529994abcc89680862d29dcba174fa6b085e5d0c3fa588ab0048899c010d9ce4ff9565289459d95c86004ffa6bd328920782746ce94241433e4bc9e
+  metadata.gz: 46e4bb2310909df561685b8307543662bb90ab02678e2db7f81bf9ff0139ddc62a7aa12982bbbd97b0b416b4b0ca5dc5478cda8694f846a303060d7e27915921
+  data.tar.gz: d2ab3041d34a146c49528cb3c7e63c1f3acaab077f565707057626bacb77df5578787ce7ea955ed8e1e9884442c66aabde30af8411ddc552e418e39d8386f0fa

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

@@ -42,11 +42,18 @@ module MjmlRb
         css_class = attrs["css-class"]
         a = self.class.default_attributes.merge(attrs)
 
-        pct_str          = width_pct.to_f.to_s.sub(/\.?0+$/, "")
-        col_class_suffix = pct_str.gsub(".", "-")
-        context[:column_widths][col_class_suffix] = pct_str if context[:column_widths]
+        explicit_width = a["width"]
+        if explicit_width && explicit_width.strip.end_with?("px")
+          px_val = explicit_width.to_f.to_s.sub(/\.?0+$/, "")
+          col_class_name = "mj-column-px-#{px_val.gsub('.', '-')}"
+          context[:column_widths][col_class_name] = "#{px_val}px" if context[:column_widths]
+        else
+          pct_str = width_pct.to_f.to_s.sub(/\.?0+$/, "")
+          col_class_name = "mj-column-per-#{pct_str.gsub('.', '-')}"
+          context[:column_widths][col_class_name] = "#{pct_str}%" if context[:column_widths]
+        end
 
-        col_class = "mj-column-per-#{col_class_suffix} mj-outlook-group-fix"
+        col_class = "#{col_class_name} mj-outlook-group-fix"
         col_class = "#{col_class} #{css_class}" if css_class && !css_class.empty?
 
         vertical_align = a["vertical-align"]

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

@@ -26,10 +26,10 @@ module MjmlRb
         css_class = a["css-class"]
 
         pct_str = width_pct.to_f.to_s.sub(/\.?0+$/, "")
-        class_suffix = pct_str.gsub(".", "-")
-        context[:column_widths][class_suffix] = pct_str if context[:column_widths]
+        col_class_name = "mj-column-per-#{pct_str.gsub('.', '-')}"
+        context[:column_widths][col_class_name] = "#{pct_str}%" if context[:column_widths]
 
-        group_class = "mj-column-per-#{class_suffix} mj-outlook-group-fix"
+        group_class = "#{col_class_name} mj-outlook-group-fix"
         group_class = "#{group_class} #{css_class}" if css_class && !css_class.empty?
 
         group_width = group_container_width(context, a, width_pct)

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

@@ -502,7 +502,12 @@ module MjmlRb
       end
 
       # Generate Outlook IE conditional wrappers around each column/group.
+      # Mirrors npm section's getChildContext() by setting containerWidth to
+      # the section's box width so that column children compute correct widths.
       def render_section_columns(node, context, box_width)
+        previous_container_width = context[:container_width]
+        context[:container_width] = "#{box_width}px"
+
         columns = node.element_children.select { |e| %w[mj-column mj-group].include?(e.tag_name) }
         return render_children(node, context, parent: "mj-section") if columns.empty?
 
@@ -517,9 +522,16 @@ module MjmlRb
           columns.each_with_index.map do |col, i|
             col_attrs = resolved_attributes(col, context)
             v_align   = col_attrs["vertical-align"] || "top"
-            col_px    = (box_width.to_f * widths[i] / 100.0).round
-
-            td_open  = %(<!--[if mso | IE]><td class="" style="vertical-align:#{v_align};width:#{col_px}px;" ><![endif]-->)
+            col_css   = col_attrs["css-class"]
+            outlook_class = col_css ? col_css.split(" ").map { |c| "#{c}-outlook" }.join(" ") : ""
+            col_width_attr = col_attrs["width"]
+            col_px = if col_width_attr && col_width_attr.strip.end_with?("px")
+                       col_width_attr.to_f.round
+                     else
+                       (box_width.to_f * widths[i] / 100.0).round
+                     end
+
+            td_open  = %(<!--[if mso | IE]><td class="#{escape_attr(outlook_class)}" style="vertical-align:#{v_align};width:#{col_px}px;" ><![endif]-->)
             td_close = %(<!--[if mso | IE]></td><![endif]-->)
 
             context[:_column_width_pct] = widths[i]
@@ -530,6 +542,8 @@ module MjmlRb
         end
 
         ([open_table, open_tr] + col_parts + [close_tr, close_table]).join("\n")
+      ensure
+        context[:container_width] = previous_container_width
       end
 
       # ── mj-wrapper ─────────────────────────────────────────────────────────

data/lib/mjml-rb/dependencies.rb

@@ -1,5 +1,21 @@
+require "set"
+
 module MjmlRb
   module Dependencies
+    # Components whose content is treated as raw HTML in NPM (endingTag = true).
+    # The parser preserves their inner markup as-is; the validator skips child
+    # element checks because REXML structurally parses what NPM treats as text.
+    ENDING_TAGS = Set.new(%w[
+      mj-accordion-text
+      mj-accordion-title
+      mj-button
+      mj-carousel-image
+      mj-navbar-link
+      mj-raw
+      mj-table
+      mj-text
+    ]).freeze
+
     RULES = {
       "mjml" => ["mj-body", "mj-head", "mj-raw"],
       "mj-accordion" => ["mj-accordion-element", "mj-raw"],
@@ -53,14 +69,14 @@ module MjmlRb
       ],
       "mj-image" => [],
       "mj-navbar" => ["mj-navbar-link", "mj-raw"],
-      "mj-raw" => [/^(?!mj-).+/],
+      "mj-raw" => [],
       "mj-section" => ["mj-column", "mj-group", "mj-raw"],
       "mj-selector" => ["mj-html-attribute"],
       "mj-social" => ["mj-social-element", "mj-raw"],
       "mj-social-element" => [],
       "mj-spacer" => [],
-      "mj-table" => [/^(?!mj-).+/],
-      "mj-text" => [/^(?!mj-).+/],
+      "mj-table" => [],
+      "mj-text" => [],
       "mj-wrapper" => ["mj-hero", "mj-raw", "mj-section"]
     }.freeze
   end

data/lib/mjml-rb/renderer.rb

@@ -235,14 +235,14 @@ module MjmlRb
       widths = column_widths || {}
       return "" if widths.empty?
 
-      base_rules = widths.map do |suffix, pct|
-        ".mj-column-per-#{suffix} { width:#{pct}% !important; max-width: #{pct}%; }"
+      base_rules = widths.map do |class_name, width_str|
+        ".#{class_name} { width:#{width_str} !important; max-width: #{width_str}; }"
       end
-      moz_rules = widths.map do |suffix, pct|
-        ".moz-text-html .mj-column-per-#{suffix} { width:#{pct}% !important; max-width: #{pct}%; }"
+      moz_rules = widths.map do |class_name, width_str|
+        ".moz-text-html .#{class_name} { width:#{width_str} !important; max-width: #{width_str}; }"
       end
-      owa_rules = widths.map do |suffix, pct|
-        "[owa] .mj-column-per-#{suffix} { width:#{pct}% !important; max-width: #{pct}%; }"
+      owa_rules = widths.map do |class_name, width_str|
+        "[owa] .#{class_name} { width:#{width_str} !important; max-width: #{width_str}; }"
       end
 
       bp = breakpoint.to_s.strip

data/lib/mjml-rb/validator.rb

@@ -52,6 +52,10 @@ module MjmlRb
     end
 
     def validate_allowed_children(node, errors)
+      # Ending-tag components treat content as raw HTML; REXML still parses
+      # children structurally, so skip child validation for those tags.
+      return if Dependencies::ENDING_TAGS.include?(node.tag_name)
+
       allowed = Dependencies::RULES[node.tag_name]
       return unless allowed
 

data/lib/mjml-rb/version.rb

@@ -1,3 +1,3 @@
 module MjmlRb
-  VERSION = "0.2.29".freeze
+  VERSION = "0.2.31".freeze
 end

metadata

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