mjml-rb 0.5.2 → 0.6.0

data/docs/releases/v0.6.0.md

@@ -0,0 +1,63 @@
+# mjml-rb 0.6.0 — 2026-10-16
+
+`mjml-rb` 0.6.0 targets MJML 5.4.1. The gem version is independent of the
+upstream MJML version. Compilation remains synchronous and pure Ruby;
+Node.js/npm is used only for development reference checks.
+
+Requires Ruby >= 3.3, `css_parser` >= 1.17 and < 4, and Nokogiri >= 1.13.
+The CI matrix covers `css_parser` 1.21, 2.x and 3.x across Ruby 3.3, 3.4 and 4.0,
+plus a pinned `mjml@5.4.1` reference job.
+
+## Upgrade changes
+
+- `mj-include` is disabled by default, including in strict validation. Enable
+  it with `ignore_includes: false` and a `file_path` for the template's directory,
+  or use CLI `--config.allowIncludes`. Only the canonical template root and
+  explicit `include_path` roots are readable; escapes and absolute paths are denied.
+- `mj-body` owns HTML `<body>`, including `id`, `css-class`, background styling
+  and the preview. Update CSS selectors that expected the class on the inner
+  article. Background painting below short emails can change in browser previews.
+- `minify` wins over `beautify`. Source comments can be removed while preserving
+  Outlook conditionals, and raw content and significant whitespace are protected.
+  Formatting and entity spelling can differ from previous releases.
+- Options accept snake_case and upstream camelCase aliases; conflicting aliases
+  raise errors. JSON config options require `use_mjml_config_options: true`.
+
+## Improvements
+
+- Responsive section gutters, social icon borders, string border radii, and
+  v5 hero and accordion behavior.
+- Correct mixed column widths, raw siblings, social HTML, numeric image width,
+  CSS include ordering, and shared component registration metadata.
+- CLI validation without rendering or output files; watch mode follows enabled
+  recursive includes, including deletion, recreation and graph changes.
+- Support for `css_parser` 3.x, with usage, migration and compatibility documents
+  included in the packaged gem.
+
+## Validation and scope
+
+Maintainer-reported downstream validation covered eight booking-mailer actions,
+eleven representative scenarios, nine locales and desktop/mobile widths. All
+198 exact Chrome screenshot comparisons at commit `90f646e` with `css_parser`
+3.3.0 matched the prior 0.6.0 / `css_parser` 2.2.0 run at `313ad6a`. All 198 master
+control captures also matched their previous run.
+
+Against the downstream application's 0.5.2 baseline, 185 comparisons were
+pixel-identical, eleven differed only in the background below short desktop
+emails, and two restored a missing space in the Turkish KYC email. A white
+HTML-root background applied only in the browser harness eliminated all eleven
+background differences exactly; no footer markup change was needed. There were
+no rendering errors, missing images or unstable captures. All 198 generated HTML
+documents had balanced tags, and all 32 focused downstream specs passed.
+
+These are representative Chrome renders, not email-client certification.
+Customer screenshots remain private and public examples use synthetic content.
+The strict XML parser, conservative formatter and custom CSS inliner retain
+documented differences from upstream. Unsupported minifier and Juice options
+fail explicitly; JavaScript config and component packages are unsupported.
+
+The packaged `docs/MIGRATING_TO_V5.md` and `docs/PARITY_AUDIT.md` contain the full
+migration details and compatibility limits.
+
+Changes: [PR #24](https://github.com/faraquet/mjml-rb/pull/24).
+Upstream reference: [MJML 5.4.1](https://github.com/mjmlio/mjml/releases/tag/v5.4.1).

data/lib/mjml-rb/cli.rb

@@ -24,14 +24,12 @@ module MjmlRb
       parser.parse!(argv)
       options[:positional] = argv
 
-      rc_config = ConfigFile.load
-      if rc_config[:options]
-        options[:config] = rc_config[:options].merge(options[:config])
-      end
-
+      explicit = Options.normalize(options[:config])
+      rc_config = ConfigFile.load(explicit[:mjml_config_path] || Dir.pwd)
+      configured = explicit[:use_mjml_config_options] ? rc_config.fetch(:options, {}) : {}
+      config = Options.merge({beautify: true}, Options.merge(configured, explicit))
       input_mode, input_values = resolve_input(options)
       output_mode = resolve_output(options)
-      config = options[:config]
 
       case input_mode
       when :watch
@@ -56,7 +54,7 @@ module MjmlRb
       @stderr.puts("\nConfiguration error:")
       @stderr.puts(e.message)
       1
-    rescue OptionParser::ParseError => e
+    rescue OptionParser::ParseError, ArgumentError => e
       @stderr.puts(e.message)
       1
     end
@@ -72,10 +70,7 @@ module MjmlRb
         stdout: false,
         output: nil,
         no_stdout_file_comment: false,
-        config: {
-          beautify: true,
-          minify: false
-        }
+        config: {}
       }
     end
 
@@ -91,13 +86,14 @@ module MjmlRb
         opts.on("-o", "--output PATH", "Output file or directory") { |v| options[:output] = v }
         opts.on("-c", "--config KEY=VALUE", "Compiler config key/value") do |entry|
           key, value = parse_key_value(entry)
-          options[:config][normalize_key(key)] = parse_typed_value(value)
+          options[:config][key] = parse_typed_value(value)
         end
+        opts.on("--filePath PATH", "Base path for stdin includes") { |v| options[:config]["filePath"] = v }
         opts.on("--noStdoutFileComment", "Skip file comment header on stdout") do
           options[:no_stdout_file_comment] = true
         end
         opts.on("-V", "--version", "Show version") do
-          @stdout.puts("mjml-ruby #{MjmlRb::VERSION}")
+          @stdout.puts("mjml-ruby #{MjmlRb::VERSION} (MJML #{MjmlRb::MJML_COMPATIBILITY_VERSION})")
           raise SystemExit, 0
         end
         opts.on("-h", "--help", "Show help") do
@@ -106,7 +102,7 @@ module MjmlRb
         end
       end.tap do
         inline_config.each do |key, value|
-          options[:config][normalize_key(key)] = value
+          options[:config][key] = value
         end
       end
     end
@@ -147,10 +143,6 @@ module MjmlRb
       end
     end
 
-    def normalize_key(key)
-      key.to_s.tr("-", "_").to_sym
-    end
-
     def resolve_input(options)
       inputs = {}
       inputs[:read] = options[:read] unless options[:read].empty?
@@ -187,10 +179,17 @@ module MjmlRb
     end
 
     def process_input(input, mode, config)
+      if input[:file]
+        config = config.merge(
+          actual_path: input[:file],
+          file_path: config[:file_path] || File.dirname(input[:file])
+        )
+      end
+
       case mode
       when :validate
         compiler = Compiler.new(config.merge(validation_level: "strict"))
-        { file: input[:file], compiled: compiler.compile(input[:mjml]) }
+        { file: input[:file], compiled: compiler.validate(input[:mjml]) }
       else
         compiler = Compiler.new(config)
         { file: input[:file], compiled: compiler.compile(input[:mjml]) }
@@ -208,6 +207,8 @@ module MjmlRb
         raise CLIError, "Validation failed"
       end
 
+      return 0 if options[:validate].any?
+
       case output_mode
       when :stdout
         print_stdout(processed, !options[:no_stdout_file_comment])
@@ -287,20 +288,29 @@ module MjmlRb
         raise CLIError, "Need an output directory when watching multiple files"
       end
 
-      state = files.each_with_object({}) { |path, memo| memo[path] = file_mtime(path) }
+      state = {}
+      dependencies = {}
+      # Compile initially to discover the include graph; each later successful
+      # parse replaces its dependency set, including missing local files.
+      compile_file = lambda do |file|
+        processed = process_input({file: file, mjml: File.read(file)}, :read, config)
+        discovered = [file] + processed[:compiled].dependencies
+        discovered.concat(dependencies[file] || []) unless processed[:compiled].success?
+        dependencies[file] = discovered.uniq
+        state[file] = dependency_state(dependencies[file])
+        emit_results([processed], :output, output: output_path || "", no_stdout_file_comment: true, validate: [])
+        @stdout.puts("#{file} - Successfully compiled") if processed[:compiled].success?
+      end
+      files.each { |file| compile_file.call(file) }
       @stdout.puts("Watching #{files.size} file(s)...")
 
       loop do
         files.each do |file|
-          current = file_mtime(file)
-          next if current.nil? || current <= state[file]
-
+          current = dependency_state(dependencies[file])
+          next if current == state[file]
           state[file] = current
           begin
-            input = { file: file, mjml: File.read(file) }
-            processed = process_input(input, :read, config)
-            emit_results([processed], :output, output: output_path, no_stdout_file_comment: true, validate: [])
-            @stdout.puts("#{file} - Successfully compiled")
+            compile_file.call(file)
           rescue StandardError => e
             @stderr.puts("#{file} - Error while compiling file: #{e.message}")
           end
@@ -309,10 +319,12 @@ module MjmlRb
       end
     end
 
-    def file_mtime(path)
-      File.mtime(path)
-    rescue StandardError
-      nil
+    def dependency_state(paths)
+      paths.to_h do |path|
+        stat = File.stat(path) rescue nil
+        [path, stat && [stat.mtime, stat.size, stat.ino]]
+      end
     end
+
   end
 end

data/lib/mjml-rb/column_gutter.rb

@@ -0,0 +1,81 @@
+module MjmlRb
+  # Port of mjml-column's v5 gutter arithmetic. One immutable layout value is
+  # passed to both the normal column and its Outlook cell.
+  class ColumnGutter
+    def initialize(width:, container_width:, gutter:, count:, index:, direction: "ltr", grouped: false)
+      @unit = width.to_s.end_with?("px") ? "px" : "%"
+      @width = width.to_f
+      @container = container_width.to_f
+      @gutter = gutter.to_s
+      @count, @index, @rtl, @grouped = count, index, direction == "rtl", grouped
+    end
+
+    def desktop_width
+      reduced = [(@width - normalized_gutter(@unit) * (@count - 1) / @count).round(6), 0].max
+      return reduced if @unit == "%"
+
+      floor = reduced.floor
+      extras = [[(@count * (reduced - floor)).round, 0].max, @count].min
+      floor + (@index < extras ? 1 : 0)
+    end
+
+    def width
+      "#{number(desktop_width)}#{@unit}"
+    end
+
+    def width_class
+      "mj-column-#{@unit == '%' ? 'per' : 'px'}-#{number(desktop_width).tr('.', '-')}"
+    end
+
+    def padding_class
+      gutter = normalized_gutter(@unit)
+      gutter = gutter.round if @unit == "px"
+      "mj-column-gutter-#{@count}-#{@index + 1}-#{@unit == '%' ? 'per' : 'px'}-#{number(gutter).tr('.', '-')}#{@rtl ? '-rtl' : ''}"
+    end
+
+    def desktop_padding(unit = @unit)
+      gutter = normalized_gutter(unit)
+      gutter = gutter.round if unit == "px"
+      leading = unit == "px" ? (gutter / 2.0).ceil : gutter / 2.0
+      trailing = unit == "px" ? (gutter / 2.0).floor : gutter / 2.0
+      first, last = @index.zero?, @index == @count - 1
+      right = @rtl ? (first ? 0 : trailing) : (last ? 0 : leading)
+      left = @rtl ? (last ? 0 : leading) : (first ? 0 : trailing)
+      padding([0, right, 0, left], unit)
+    end
+
+    def mobile_padding
+      return desktop_padding if @grouped
+      half = normalized_gutter("%") / 2.0
+      padding([@index.zero? ? 0 : half, 0, @index == @count - 1 ? 0 : half, 0], "%")
+    end
+
+    def mobile_width
+      return "100%" unless @grouped
+      percentage = @unit == "%" ? desktop_width : desktop_width / @container * 100
+      "#{number(percentage)}%"
+    end
+
+    def grouped?
+      @grouped
+    end
+
+    private
+
+    def normalized_gutter(unit)
+      value = @gutter.to_f
+      source_unit = @gutter.end_with?("%") ? "%" : "px"
+      return value if unit == source_unit
+      return 0 if @container.zero?
+      unit == "%" ? value / @container * 100 : @container * value / 100
+    end
+
+    def padding(values, unit)
+      values.map { |value| "#{number(unit == 'px' ? value.round : value)}#{unit}" }.join(" ")
+    end
+
+    def number(value)
+      value.round(6).to_s.sub(/\.0+$/, "")
+    end
+  end
+end

data/lib/mjml-rb/compiler.rb

@@ -1,36 +1,19 @@
 require_relative "result"
+require_relative "options"
+require_relative "config_file"
+require_relative "formatter"
 require_relative "validator"
 require_relative "parser"
 require_relative "renderer"
 
 module MjmlRb
   class Compiler
-    DEFAULT_OPTIONS = {
-      beautify: false,
-      minify: false,
-      keep_comments: true,
-      ignore_includes: false,
-      printer_support: false,
-      preprocessors: [],
-      validation_level: "soft",
-      file_path: ".",
-      actual_path: "."
-    }.freeze
-
-    # Additional option keys accepted by the renderer but not in DEFAULT_OPTIONS.
-    EXTRA_VALID_KEYS = %i[lang dir fonts printerSupport].freeze
-
-    VALID_OPTION_KEYS = (DEFAULT_OPTIONS.keys + EXTRA_VALID_KEYS).freeze
-
+    DEFAULT_OPTIONS = Options::DEFAULTS
+    VALID_OPTION_KEYS = Options::KEYS
     VALID_VALIDATION_LEVELS = %w[soft strict skip].freeze
 
     def initialize(options = {})
-      normalized = symbolize_keys(options)
-      validate_options!(normalized)
-      @options = DEFAULT_OPTIONS.merge(normalized)
-      @parser = Parser.new
-      @validator = Validator.new(parser: @parser)
-      @renderer = Renderer.new
+      @options = Options.normalize(options)
     end
 
     def mjml2html(mjml, options = {})
@@ -38,125 +21,52 @@ module MjmlRb
     end
 
     def compile(mjml, options = {})
-      normalized = symbolize_keys(options)
-      validate_options!(normalized)
-      merged = @options.merge(normalized)
+      do_compile(mjml, effective_options(options))
+    end
 
-      do_compile(mjml, merged)
+    # Validation shares parsing and include diagnostics but never invokes a renderer.
+    def validate(mjml, options = {})
+      merged = effective_options(options)
+      parsed = Parser.new.parse_result(mjml, merged)
+      validation = Validator.new.validate(parsed, merged)
+      Result.new(**validation, dependencies: parsed.dependencies)
+    rescue Parser::ParseError => e
+      Result.new(errors: [format_error(e.message, line: e.line, file: e.file)], dependencies: e.dependencies)
     end
 
     private
 
-    def do_compile(mjml, merged)
-      ast = @parser.parse(
-        mjml,
-        keep_comments: merged[:keep_comments],
-        preprocessors: Array(merged[:preprocessors]),
-        ignore_includes: merged[:ignore_includes],
-        file_path: merged[:file_path],
-        actual_path: merged[:actual_path]
-      )
-
-      include_issues = format_include_errors(@parser.include_errors)
-      validation = validate_if_needed(ast, merged)
-      include_validation = classify_include_issues(include_issues, merged)
-
-      all_errors = validation[:errors] + include_validation[:errors]
-      all_warnings = validation[:warnings] + include_validation[:warnings]
+    def effective_options(options)
+      explicit = Options.merge(@options, Options.normalize(options))
+      config = ConfigFile.load(explicit[:mjml_config_path] || Dir.pwd)
+      configured = explicit[:use_mjml_config_options] ? config.fetch(:options, {}) : {}
+      Options.merge(DEFAULT_OPTIONS, Options.merge(configured, explicit))
+    end
 
-      return Result.new(errors: all_errors, warnings: all_warnings) if strict_validation_failed?(merged, all_errors)
+    def do_compile(mjml, merged)
+      parsed = Parser.new.parse_result(mjml, merged)
+      validation = Validator.new.validate(parsed, merged)
+      return Result.new(**validation, dependencies: parsed.dependencies) if strict_validation_failed?(merged, validation[:errors])
 
-      html = @renderer.render(ast, merged)
-      Result.new(
-        html: post_process(html, merged),
-        errors: all_errors,
-        warnings: all_warnings
-      )
+      html = Renderer.new.render(parsed.ast, merged)
+      Result.new(html: Formatter.new(merged).format(html), **validation, dependencies: parsed.dependencies)
     rescue Parser::ParseError => e
-      Result.new(errors: [format_error(e.message, line: e.line)])
+      Result.new(errors: [format_error(e.message, line: e.line, file: e.file)], dependencies: e.dependencies)
     rescue StandardError => e
-      Result.new(errors: [format_error(e.message)])
-    end
-
-    def validate_options!(options)
-      unknown = options.keys - VALID_OPTION_KEYS
-      unless unknown.empty?
-        raise ArgumentError, "Unknown option(s): #{unknown.join(', ')}. Valid options are: #{VALID_OPTION_KEYS.join(', ')}"
-      end
-
-      if options.key?(:validation_level)
-        level = options[:validation_level].to_s
-        unless VALID_VALIDATION_LEVELS.include?(level)
-          raise ArgumentError, "Invalid validation_level: #{level.inspect}. Must be one of: #{VALID_VALIDATION_LEVELS.join(', ')}"
-        end
-      end
-    end
-
-    def validate_if_needed(ast, options)
-      return { errors: [], warnings: [] } if options[:validation_level].to_s == "skip"
-      @validator.validate(ast, options)
+      Result.new(errors: [format_error(e.message)], dependencies: parsed&.dependencies || [])
     end
 
     def strict_validation_failed?(options, validation_errors)
       options[:validation_level].to_s == "strict" && !validation_errors.empty?
     end
 
-    def post_process(html, options)
-      output = html.to_s.dup
-      output = strip_comments(output) unless options[:keep_comments]
-      output = beautify(output) if truthy?(options[:beautify])
-      output = minify(output) if truthy?(options[:minify])
-      output
-    end
-
-    def strip_comments(html)
-      html.gsub(/<!--.*?-->/m, "")
-    end
-
-    def beautify(html)
-      # Keep it deterministic without external formatters.
-      html.gsub(/>\s*</, ">\n<")
-    end
-
-    def minify(html)
-      html.gsub(/>\s+</, "><").gsub(/\s{2,}/, " ").strip
-    end
-
-    def truthy?(value)
-      return value if value == true || value == false
-      !(%w[false 0 no off].include?(value.to_s.strip.downcase))
-    end
-
-    def symbolize_keys(hash)
-      hash.each_with_object({}) do |(k, v), memo|
-        memo[k.to_s.tr("-", "_").to_sym] = v
-      end
-    end
-
-    def format_include_errors(include_errors)
-      Array(include_errors).map do |ie|
-        format_error(ie[:message], line: ie[:line])
-      end
-    end
-
-    def classify_include_issues(issues, options)
-      return { errors: [], warnings: [] } if issues.empty?
-
-      level = options[:validation_level].to_s
-      if level == "strict"
-        { errors: issues, warnings: [] }
-      else
-        { errors: [], warnings: issues }
-      end
-    end
-
-    def format_error(message, line: nil)
+    def format_error(message, line: nil, file: nil)
       {
         line: line,
         message: message.to_s,
         tag_name: nil,
         formatted_message: message.to_s
-      }
+      }.tap { |error| error[:file] = file if file }
     end
   end
 end

data/lib/mjml-rb/component_registry.rb

@@ -2,9 +2,10 @@ require "set"
 
 module MjmlRb
   class ComponentRegistry
-    attr_reader :custom_components, :custom_dependencies, :custom_ending_tags
+    attr_reader :custom_components, :custom_dependencies, :custom_ending_tags, :revision
 
     def initialize
+      @revision = 0
       @custom_components = []
       @custom_dependencies = {}
       @custom_ending_tags = Set.new
@@ -12,6 +13,10 @@ module MjmlRb
 
     def register(klass, dependencies: {}, ending_tags: [])
       validate_component!(klass)
+      klass.tags.each do |tag|
+        existing = component_class_for_tag(tag)
+        raise ArgumentError, "Component tag already registered: #{tag}" if existing && existing != klass
+      end
       @custom_components << klass unless @custom_components.include?(klass)
       dependencies.each do |parent, children|
         @custom_dependencies[parent] = ((@custom_dependencies[parent] || []) + Array(children)).uniq
@@ -46,9 +51,14 @@ module MjmlRb
       invalidate_caches!
     end
 
+    def components
+      tag_class_cache.dup
+    end
+
     private
 
     def invalidate_caches!
+      @revision += 1
       @tag_class_cache = nil
       @dependency_rules_cache = nil
       @ending_tags_cache = nil

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

@@ -91,17 +91,18 @@ module MjmlRb
         noinput.mj-accordion-checkbox { display:block!important; }
         @media yahoo, only screen and (min-width:0) {
           .mj-accordion-element { display:block; }
-          input.mj-accordion-checkbox, .mj-accordion-less { display:none!important; }
-          input.mj-accordion-checkbox + * .mj-accordion-title { cursor:pointer; touch-action:manipulation; -webkit-user-select:none; -moz-user-select:none; user-select:none; }
-          input.mj-accordion-checkbox + * .mj-accordion-content { overflow:hidden; display:none; }
-          input.mj-accordion-checkbox + * .mj-accordion-more { display:block!important; }
-          input.mj-accordion-checkbox:checked + * .mj-accordion-content { display:block; }
-          input.mj-accordion-checkbox:checked + * .mj-accordion-more { display:none!important; }
-          input.mj-accordion-checkbox:checked + * .mj-accordion-less { display:block!important; }
+          .mj-accordion-checkbox[type="checkbox"], .mj-accordion-less { display:none!important; }
+          .mj-accordion-checkbox[type="checkbox"] + * .mj-accordion-title { cursor:pointer; touch-action:manipulation; -webkit-user-select:none; -moz-user-select:none; user-select:none; }
+          .mj-accordion-checkbox[type="checkbox"] + * .mj-accordion-content { overflow:hidden; display:none; }
+          .mj-accordion-checkbox[type="checkbox"] + * .mj-accordion-more { display:block!important; }
+          .mj-accordion-checkbox:checked + * .mj-accordion-content { display:block; }
+          .mj-accordion-checkbox:checked + * .mj-accordion-more { display:none!important; }
+          .mj-accordion-checkbox:checked + * .mj-accordion-less { display:block!important; }
         }
         .moz-text-html input.mj-accordion-checkbox + * .mj-accordion-title { cursor:auto; touch-action:auto; -webkit-user-select:auto; -moz-user-select:auto; user-select:auto; }
         .moz-text-html input.mj-accordion-checkbox + * .mj-accordion-content { overflow:hidden; display:block; }
         .moz-text-html input.mj-accordion-checkbox + * .mj-accordion-ico { display:none; }
+        @goodbye { @gmail }
       CSS
 
       DEFAULT_ATTRIBUTES = {
@@ -217,7 +218,7 @@ module MjmlRb
         content << render_accordion_text(nil, attrs) unless has_text
 
         css_class = attrs["css-class"] ? %( class="#{escape_attr(attrs["css-class"])}") : ""
-        %(<tr#{css_class}><td style="#{td_style}"><label class="mj-accordion-element" style="#{label_style}"><input class="mj-accordion-checkbox" type="checkbox" style="display:none;" /><div>#{content.join("\n")}</div></label></td></tr>)
+        %(<tr#{css_class}><td style="#{td_style}"><label class="mj-accordion-element" style="#{label_style}"><!--[if !mso | IE]><!--><input class="mj-accordion-checkbox" type="checkbox" style="display:none;" /><!--<![endif]--><div>#{content.join("\n")}</div></label></td></tr>)
       end
 
       def render_accordion_title(node, attrs)
@@ -250,8 +251,9 @@ module MjmlRb
           "border-bottom" => title_attrs["border"] || DEFAULTS["border"]
         )
         title_content = node ? raw_inner_for_body(node) : ""
-        title_cell = %(<td style="#{td_style}">#{title_content}</td>)
+        title_cell = %(<td#{html_attrs("class" => title_attrs["css-class"])} style="#{td_style}">#{title_content}</td>)
         icon_cell = %(<td class="mj-accordion-ico" style="#{td2_style}"><img src="#{escape_attr(title_attrs["icon-wrapped-url"] || DEFAULTS["icon-wrapped-url"])}" alt="#{escape_attr(title_attrs["icon-wrapped-alt"] || DEFAULTS["icon-wrapped-alt"])}" class="mj-accordion-more" style="#{icon_style}" /><img src="#{escape_attr(title_attrs["icon-unwrapped-url"] || DEFAULTS["icon-unwrapped-url"])}" alt="#{escape_attr(title_attrs["icon-unwrapped-alt"] || DEFAULTS["icon-unwrapped-alt"])}" class="mj-accordion-less" style="#{icon_style}" /></td>)
+        icon_cell = "<!--[if !mso | IE]><!-->#{icon_cell}<!--<![endif]-->"
         cells = title_attrs["icon-position"] == "left" ? "#{icon_cell}#{title_cell}" : "#{title_cell}#{icon_cell}"
 
         %(<div class="mj-accordion-title"><table role="presentation" width="100%" cellspacing="0" cellpadding="0" style="#{table_style}"><tbody><tr>#{cells}</tr></tbody></table></div>)

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

@@ -51,7 +51,7 @@ module MjmlRb
       end
 
       def raw_inner_for_body(node)
-        renderer.send(:annotate_raw_html, raw_inner(node))
+        renderer.send(:protect_raw_html, renderer.send(:annotate_raw_html, raw_inner(node)))
       end
 
       # Like raw_inner but HTML-escapes text nodes. Use for components such as

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

@@ -7,6 +7,7 @@ module MjmlRb
 
       ALLOWED_ATTRIBUTES = {
         "width" => "unit(px)",
+        "id" => "string",
         "background-color" => "color"
       }.freeze
 
@@ -27,15 +28,17 @@ module MjmlRb
         div_attributes = {
           "aria-label" => context[:title].to_s.empty? ? nil : context[:title],
           "aria-roledescription" => "email",
-          "class" => body_attrs["css-class"],
           "role" => "article",
           "lang" => context[:lang],
           "dir" => context[:dir],
-          "style" => style_join("background-color" => background_color)
+          "style" => style_join("word-spacing" => "normal", "background-color" => background_color)
         }
         children = render_children(node, context, parent: "mj-body")
 
-        %(<div#{html_attrs(div_attributes)}>#{children}</div>)
+        body_attributes = {"id" => body_attrs["id"], "class" => body_attrs["css-class"], "style" => div_attributes["style"]}
+        preview = context[:preview].to_s
+        preview_block = preview.empty? ? "" : %(<div style="display:none;font-size:1px;color:#ffffff;line-height:1px;max-height:0px;max-width:0px;opacity:0;overflow:hidden;">#{escape_html(preview)}</div>)
+        %(<body#{html_attrs(body_attributes)}>\n    #{preview_block}\n    <div#{html_attrs(div_attributes)}>#{children}</div>\n  </body>)
       end
     end
   end

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

@@ -9,7 +9,7 @@ module MjmlRb
 
       ALLOWED_ATTRIBUTES = {
         "align" => "enum(left,center,right)",
-        "border-radius" => "unit(px,%){1,4}",
+        "border-radius" => "string",
         "container-background-color" => "color",
         "icon-width" => "unit(px,%)",
         "left-icon" => "string",
@@ -21,7 +21,7 @@ module MjmlRb
         "right-icon" => "string",
         "thumbnails" => "enum(visible,hidden,supported)",
         "tb-border" => "string",
-        "tb-border-radius" => "unit(px,%)",
+        "tb-border-radius" => "string",
         "tb-hover-border-color" => "color",
         "tb-selected-border-color" => "color",
         "tb-width" => "unit(px,%)"

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

@@ -13,9 +13,9 @@ module MjmlRb
         "title" => "string",
         "src" => "string",
         "thumbnails-src" => "string",
-        "border-radius" => "unit(px,%){1,4}",
+        "border-radius" => "string",
         "tb-border" => "string",
-        "tb-border-radius" => "unit(px,%){1,4}"
+        "tb-border-radius" => "string"
       }.freeze
 
       DEFAULT_ATTRIBUTES = {