mjml-rb 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d1dc49d39635e3f4530f642a8699646f3bff8e545213387f91d95bb461ea67d
-  data.tar.gz: 15139737ec96a78601bd7d0e0a992b8743060d4923664eea05462a76e70dc7d3
+  metadata.gz: 990083fd9e656cfe50b74937926c14f37ea359adf49530e5ffbacf17ef0ea00a
+  data.tar.gz: a03cc468ddcdb25fdde896f3d53bbd8febaad32db0b3aae3ccad69725f11920c
 SHA512:
-  metadata.gz: 486e95fb106f03ebb1ae929ec548996f9d53868b360fcff23cfd0aa28d9e4240e3a3181f611b3270837c9012e523c32f3089c0ebe3a82e9bd6e067735a955bec
-  data.tar.gz: 5bf0eb72f669aed9eb59dc1b8fbe16563082392bbc8d05e2f8d4ce4098a492606303cea65692757fdf5b8eed2c0fc2be7080daeac73f6f242b0a1dfc1c0d5551
+  metadata.gz: ee2bff6d7a36be6fe4f95b19eefd60e9ff295d62d681cd7e3131ff9e298859b66fea7f5d6887ae3f984d9f13fc6aeda4f3f58b8ee6e6cfd9b603d804cb0305a2
+  data.tar.gz: fdd623a60697cb966591bfcad9fc973e71586ffc3776f6f3de5944fc63c2ea413324b3b6ca288303117b58fbfc12c8e2b13aca174b657a5e8c4a33eb73138e97

data/lib/mjml-rb/renderer.rb

@@ -344,25 +344,32 @@ module MjmlRb
         property, value = entry.split(":", 2).map { |part| part&.strip }
         next if property.nil? || property.empty? || value.nil? || value.empty?
 
-        memo[property] = value.sub(/\s*!important\s*\z/, "").strip
+        important = value.match?(/\s*!important\s*\z/)
+        memo[property] = {
+          value: value.sub(/\s*!important\s*\z/, "").strip,
+          important: important
+        }
       end
     end
 
     def merge_inline_style!(node, declarations)
       existing = parse_css_declarations(node["style"].to_s)
       declarations.each do |property, value|
-        existing[property] = value
+        existing[property] = merge_css_declaration(existing[property], value)
       end
       normalize_background_fallbacks!(node, existing)
-      node["style"] = existing.map { |property, value| "#{property}: #{value}" }.join("; ")
+      node["style"] = serialize_css_declarations(existing)
     end
 
     def normalize_background_fallbacks!(node, declarations)
-      background_color = declarations["background-color"]
+      background_color = declaration_value(declarations["background-color"])
       return if background_color.nil? || background_color.empty?
 
-      if syncable_background?(declarations["background"])
-        declarations["background"] = background_color
+      if syncable_background?(declaration_value(declarations["background"]))
+        declarations["background"] = {
+          value: background_color,
+          important: declarations.fetch("background-color", {}).fetch(:important, false)
+        }
       end
 
       return unless node.name == "td"
@@ -390,6 +397,25 @@ module MjmlRb
         !normalized.include?(" right")
     end
 
+    def merge_css_declaration(existing, incoming)
+      return incoming if existing.nil?
+      return existing if existing[:important] && !incoming[:important]
+
+      incoming
+    end
+
+    def declaration_value(declaration)
+      declaration && declaration[:value]
+    end
+
+    def serialize_css_declarations(declarations)
+      declarations.map do |property, declaration|
+        value = declaration[:value]
+        value = "#{value} !important" if declaration[:important]
+        "#{property}: #{value}"
+      end.join("; ")
+    end
+
     def append_component_head_styles(document, context)
       component_registry.each_value.uniq.each do |component|
         next unless component.respond_to?(:head_style)

data/lib/mjml-rb/version.rb

@@ -1,3 +1,3 @@
 module MjmlRb
-  VERSION = "0.2.14".freeze
+  VERSION = "0.2.15".freeze
 end

metadata

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