mjml-rb 0.2.7 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6422177e2bbfc66cd23bdd9a88d8621fff3a8194059eba47e5934054d03e88ed
-  data.tar.gz: 312008cba1935cce89440bba65c6b9a78145357c2f13291bdeaeec741f7d831c
+  metadata.gz: eda55f6bd0a60b7dda864d5602f5840ef4d9e971f72250f4a9617a39a922d1cc
+  data.tar.gz: 96502df7049ccf73728219d6fa1c20f1674f42f13d210688eca3cd5f238802b1
 SHA512:
-  metadata.gz: 72e7039838d3f29a4d50bf47206e9022f14ad0c433b654909699e3d804e7eae7cfb737c97a140420477eade8457b094826d15f227693c046847c67cd481c59d8
-  data.tar.gz: 6030143fd5f9d10fe16249397150815d8d842079cf925e7059deb805b94f866df2c4605c681e004e88ec9af4c27ab34ca6ac6107bd00ebd52d6e0df051cecd6a
+  metadata.gz: e89bc6aba6bce27d9054d54fe0d7c4f869d8e96af642d0a922392362b1a8b7022c29a1f48dfc1d8f1e1e6011cdbdb494d71222859acf0177702149ee5bc23578
+  data.tar.gz: f0b2d84a9730658bbf60e9de11f1b2f8e896537eef8a4dd915e4472058e5852d1cde2aeee36876c02726496ae2ccedfd9dc795d781587309d8aa945fcc5dfb2c

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

@@ -46,8 +46,11 @@ module MjmlRb
           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"
+          if node.attributes["inline"] == "inline"
+            context[:inline_styles] << css
+          else
+            context[:head_styles] << css
+          end
         when "mj-font"
           name = node.attributes["name"]
           href = node.attributes["href"]

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

@@ -15,19 +15,19 @@ module MjmlRb
         "font-size" => "13px"
       }.freeze
 
-      HEAD_STYLE = <<~CSS.freeze
-        @media only screen and (max-width:480px) {
-          table.mj-full-width-mobile { width: 100% !important; }
-          td.mj-full-width-mobile { width: auto !important; }
-        }
-      CSS
-
       def tags
         TAGS
       end
 
-      def head_style
-        HEAD_STYLE
+      def head_style(breakpoint)
+        lower_breakpoint = make_lower_breakpoint(breakpoint)
+
+        <<~CSS
+          @media only screen and (max-width:#{lower_breakpoint}) {
+            table.mj-full-width-mobile { width: 100% !important; }
+            td.mj-full-width-mobile { width: auto !important; }
+          }
+        CSS
       end
 
       def head_style_tags
@@ -178,6 +178,13 @@ module MjmlRb
         else "0"
         end
       end
+
+      def make_lower_breakpoint(breakpoint)
+        matched = breakpoint.to_s.match(/[0-9]+/)
+        return breakpoint if matched.nil?
+
+        "#{matched[0].to_i - 1}px"
+      end
     end
   end
 end

data/lib/mjml-rb/renderer.rb

@@ -85,7 +85,7 @@ module MjmlRb
       head_styles = ([DOCUMENT_RESET_CSS] + unique_strings(context[:head_styles])).join("\n")
       head_raw = Array(context[:head_raw]).join("\n")
       before_doctype = context[:before_doctype].to_s
-      font_links = context[:fonts].values.uniq.map { |href| %(<link href="#{escape_attr(href)}" rel="stylesheet" type="text/css">) }.join("\n")
+      font_tags = build_font_tags(content, context[:inline_styles], context[:fonts])
       preview_block = preview.empty? ? "" : %(<div style="display:none;max-height:0;overflow:hidden;opacity:0;">#{escape_html(preview)}</div>)
       html_attributes = { "lang" => context[:lang], "dir" => context[:dir] }
       body_style = style_join(
@@ -101,7 +101,7 @@ module MjmlRb
             <meta charset="utf-8">
             <meta name="viewport" content="width=device-width, initial-scale=1">
             <title>#{escape_html(title)}</title>
-            #{font_links}
+            #{font_tags}
             <style type="text/css">#{head_styles}</style>
             #{head_raw}
           </head>
@@ -117,6 +117,36 @@ module MjmlRb
       before_doctype.empty? ? html : "#{before_doctype}\n#{html}"
     end
 
+    def build_font_tags(content, inline_styles, fonts)
+      used_urls = Array(fonts).filter_map do |name, url|
+        next if name.nil? || name.empty? || url.nil? || url.empty?
+        next unless font_used?(content, inline_styles, name)
+
+        url
+      end.uniq
+      return "" if used_urls.empty?
+
+      links = used_urls.map { |url| %(<link href="#{escape_attr(url)}" rel="stylesheet" type="text/css">) }.join("\n")
+      imports = used_urls.map { |url| "@import url(#{url});" }.join("\n")
+
+      <<~HTML.chomp
+        <!--[if !mso]><!-->
+        #{links}
+        <style type="text/css">
+        #{imports}
+        </style>
+        <!--<![endif]-->
+      HTML
+    end
+
+    def font_used?(content, inline_styles, font_name)
+      escaped_name = Regexp.escape(font_name)
+      content_regex = /"[^"]*font-family:[^"]*#{escaped_name}[^"]*"/mi
+      inline_regex = /font-family:[^;}]*#{escaped_name}/mi
+
+      content.to_s.match?(content_regex) || Array(inline_styles).any? { |style| style.to_s.match?(inline_regex) }
+    end
+
     def render_children(node, context, parent:)
       with_inherited_mj_class(context, node) do
         node.children.map { |child| render_node(child, context, parent: parent) }.join("\n")

data/lib/mjml-rb/version.rb

@@ -1,3 +1,3 @@
 module MjmlRb
-  VERSION = "0.2.7".freeze
+  VERSION = "0.2.10".freeze
 end

metadata

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